/[escript]/trunk/finley/src/Mesh_readGmsh.c
ViewVC logotype

Diff of /trunk/finley/src/Mesh_readGmsh.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 935 by gross, Tue Jan 23 09:53:10 2007 UTC revision 997 by gross, Mon Feb 26 06:31:45 2007 UTC
# Line 51  Finley_Mesh* Finley_Mesh_readGmsh(char* Line 51  Finley_Mesh* Finley_Mesh_readGmsh(char*
51    
52  #else  #else
53    /* allocate mesh */    /* allocate mesh */
54    
55    mesh_p = Finley_Mesh_alloc(fname,numDim,order);    mesh_p = Finley_Mesh_alloc(fname,numDim,order);
56    if (! Finley_noError()) return NULL;    if (! Finley_noError()) return NULL;
57    
# Line 231  Finley_Mesh* Finley_Mesh_readGmsh(char* Line 232  Finley_Mesh* Finley_Mesh_readGmsh(char*
232             for(j = 0; j < numNodesPerElement; j++) fscanf(fileHandle_p, "%d", &vertices[INDEX2(j,e,MAX_numNodes_gmsh)]);             for(j = 0; j < numNodesPerElement; j++) fscanf(fileHandle_p, "%d", &vertices[INDEX2(j,e,MAX_numNodes_gmsh)]);
233           }           }
234           /* all elements have been read, now we have to identify the elements for finley */           /* all elements have been read, now we have to identify the elements for finley */
235        
236           if (Finley_noError()) {           if (Finley_noError()) {
237              /* first we have to identify the elements to define Elementis and FaceElements */              /* first we have to identify the elements to define Elementis and FaceElements */
238             mesh_p->Elements=Finley_ElementFile_alloc(final_element_type,mesh_p->order);             mesh_p->Elements=Finley_ElementFile_alloc(final_element_type,mesh_p->order);
# Line 289  Finley_Mesh* Finley_Mesh_readGmsh(char* Line 291  Finley_Mesh* Finley_Mesh_readGmsh(char*
291           Finley_setError(IO_ERROR,error_msg);           Finley_setError(IO_ERROR,error_msg);
292        }        }
293        if (feof(fileHandle_p)) {        if (feof(fileHandle_p)) {
294           sprintf(error_msg,"%s:Unexected end of file in %s",fname);           sprintf(error_msg,"Unexected end of file in %s",fname);
295           Finley_setError(IO_ERROR,error_msg);           Finley_setError(IO_ERROR,error_msg);
296        }        }
297        if (! Finley_noError()) break;        if (! Finley_noError()) break;
# Line 312  Finley_Mesh* Finley_Mesh_readGmsh(char* Line 314  Finley_Mesh* Finley_Mesh_readGmsh(char*
314    printf("timing: reading mesh: %.4e sec\n",Finley_timer()-time0);    printf("timing: reading mesh: %.4e sec\n",Finley_timer()-time0);
315    #endif    #endif
316    #endif    #endif
317      if (Finley_noError()) {
318           if (  ! Finley_Mesh_isPrepared(mesh_p)) {
319              Finley_setError(SYSTEM_ERROR,"Mesh is not prepared for calculation. Contact the programmers.");
320           }
321      }
322    return mesh_p;    return mesh_p;
323  }  }
 /*  
 * $Log$  
 *  
 */  
   
Legend:
Removed from v.935  
changed lines
  Added in v.997
  ViewVC Help
Powered by ViewVC 1.1.26