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

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

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

revision 616 by elspeth, Wed Mar 22 02:46:56 2006 UTC revision 730 by bcumming, Mon May 15 04:03:49 2006 UTC
# Line 108  Finley_Mesh* Finley_Mesh_merge(dim_t num Line 108  Finley_Mesh* Finley_Mesh_merge(dim_t num
108    
109      /* allocate */      /* allocate */
110    
111      if (Finley_noError()) out=Finley_Mesh_alloc(newName,numDim,order);  #ifndef PASO_MPI
112        if (Finley_noError())
113          out=Finley_Mesh_alloc(newName,numDim,order);
114    
115      out->Elements=Finley_ElementFile_alloc(elementTypeId,out->order);      out->Elements=Finley_ElementFile_alloc(elementTypeId,out->order);
116      out->FaceElements=Finley_ElementFile_alloc(faceElementTypeId,out->order);      out->FaceElements=Finley_ElementFile_alloc(faceElementTypeId,out->order);
# Line 117  Finley_Mesh* Finley_Mesh_merge(dim_t num Line 119  Finley_Mesh* Finley_Mesh_merge(dim_t num
119    
120      /* allocate new tables */      /* allocate new tables */
121    
122      if (Finley_noError()) {      if (Finley_noError())
123        {
124          Finley_NodeFile_allocTable(out->Nodes,numNodes);          Finley_NodeFile_allocTable(out->Nodes,numNodes);
125          Finley_ElementFile_allocTable(out->Elements,numElements);          Finley_ElementFile_allocTable(out->Elements,numElements);
126          Finley_ElementFile_allocTable(out->FaceElements,numFaceElements);          Finley_ElementFile_allocTable(out->FaceElements,numFaceElements);
127          Finley_ElementFile_allocTable(out->ContactElements,numContactElements);          Finley_ElementFile_allocTable(out->ContactElements,numContactElements);
128          Finley_ElementFile_allocTable(out->Points,numPoints);          Finley_ElementFile_allocTable(out->Points,numPoints);
129      }      }
130    #else
131    /* TODO */
132    #endif
133    
134      /* copy tables :*/      /* copy tables :*/
135    

Legend:
Removed from v.616  
changed lines
  Added in v.730

  ViewVC Help
Powered by ViewVC 1.1.26