/[escript]/branches/doubleplusgood/finley/src/Mesh_read.cpp
ViewVC logotype

Diff of /branches/doubleplusgood/finley/src/Mesh_read.cpp

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

revision 2756 by gross, Thu Nov 19 00:40:02 2009 UTC revision 2856 by gross, Mon Jan 18 04:14:37 2010 UTC
# Line 80  Finley_Mesh* Finley_Mesh_read(char* fnam Line 80  Finley_Mesh* Finley_Mesh_read(char* fnam
80      #endif      #endif
81    
82      /* allocate mesh */      /* allocate mesh */
83      mesh_p = Finley_Mesh_alloc(name,numDim,order,reduced_order,mpi_info);      mesh_p = Finley_Mesh_alloc(name,numDim,mpi_info);
84            
85      if (Finley_noError()) {      if (Finley_noError()) {
86          /* Each CPU will get at most chunkSize nodes so the message has to be sufficiently large */          /* Each CPU will get at most chunkSize nodes so the message has to be sufficiently large */
# Line 204  Finley_Mesh* Finley_Mesh_read(char* fnam Line 204  Finley_Mesh* Finley_Mesh_read(char* fnam
204    
205      /* Allocate the ElementFile */      /* Allocate the ElementFile */
206      if (Finley_noError()) {      if (Finley_noError()) {
207          refElements= Finley_ReferenceElementSet_alloc(typeID,mesh_p->order, mesh_p->reduced_order);          refElements= Finley_ReferenceElementSet_alloc(typeID,order, reduced_order);
208          mesh_p->Elements=Finley_ElementFile_alloc(refElements, mpi_info);          mesh_p->Elements=Finley_ElementFile_alloc(refElements, mpi_info);
209          numNodes = mesh_p->Elements->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */          numNodes = mesh_p->Elements->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */
210      }      }
# Line 305  Finley_Mesh* Finley_Mesh_read(char* fnam Line 305  Finley_Mesh* Finley_Mesh_read(char* fnam
305          }          }
306          if (Finley_noError()) {          if (Finley_noError()) {
307              /* Allocate the ElementFile */              /* Allocate the ElementFile */
308              refFaceElements= Finley_ReferenceElementSet_alloc(typeID,mesh_p->order, mesh_p->reduced_order);              refFaceElements= Finley_ReferenceElementSet_alloc(typeID,order, reduced_order);
309              mesh_p->FaceElements=Finley_ElementFile_alloc(refFaceElements, mpi_info);              mesh_p->FaceElements=Finley_ElementFile_alloc(refFaceElements, mpi_info);
310              numNodes = mesh_p->FaceElements->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */              numNodes = mesh_p->FaceElements->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */
311          }          }
# Line 409  Finley_Mesh* Finley_Mesh_read(char* fnam Line 409  Finley_Mesh* Finley_Mesh_read(char* fnam
409    
410      if (Finley_noError()) {      if (Finley_noError()) {
411          /* Allocate the ElementFile */          /* Allocate the ElementFile */
412          refContactElements= Finley_ReferenceElementSet_alloc(typeID,mesh_p->order, mesh_p->reduced_order);          refContactElements= Finley_ReferenceElementSet_alloc(typeID,order, reduced_order);
413          mesh_p->ContactElements=Finley_ElementFile_alloc(refContactElements, mpi_info);          mesh_p->ContactElements=Finley_ElementFile_alloc(refContactElements, mpi_info);
414          numNodes = mesh_p->ContactElements->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */          numNodes = mesh_p->ContactElements->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */
415      }      }
# Line 506  Finley_Mesh* Finley_Mesh_read(char* fnam Line 506  Finley_Mesh* Finley_Mesh_read(char* fnam
506    
507      if (Finley_noError()) {      if (Finley_noError()) {
508          /* Allocate the ElementFile */          /* Allocate the ElementFile */
509          refPoints= Finley_ReferenceElementSet_alloc(typeID,mesh_p->order, mesh_p->reduced_order);          refPoints= Finley_ReferenceElementSet_alloc(typeID,order, reduced_order);
510          mesh_p->Points=Finley_ElementFile_alloc(refPoints, mpi_info);          mesh_p->Points=Finley_ElementFile_alloc(refPoints, mpi_info);
511          numNodes = mesh_p->Points->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */          numNodes = mesh_p->Points->referenceElementSet->numNodes; /* New meaning for numNodes: num nodes per element */
512      }      }

Legend:
Removed from v.2756  
changed lines
  Added in v.2856

  ViewVC Help
Powered by ViewVC 1.1.26