/[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 1027 by bcumming, Mon May 15 04:03:49 2006 UTC revision 1028 by gross, Wed Mar 14 00:15:24 2007 UTC
# Line 33  static double  Finley_Mesh_lockingGridSi Line 33  static double  Finley_Mesh_lockingGridSi
33    
34  Finley_Mesh* Finley_Mesh_merge(dim_t numMsh, Finley_Mesh** msh) {  Finley_Mesh* Finley_Mesh_merge(dim_t numMsh, Finley_Mesh** msh) {
35    Finley_Mesh* out=NULL;    Finley_Mesh* out=NULL;
36      dim_t numNodes=0;
37      dim_t numElements=0;
38      dim_t numFaceElements=0;
39      dim_t numContactElements=0;
40      dim_t numPoints=0;
41    dim_t i;    dim_t i;
42      index_t order;
43      dim_t numDim;
44      ElementTypeId elementTypeId=NoType;
45      ElementTypeId faceElementTypeId=NoType;
46      ElementTypeId pointTypeId=NoType;
47      ElementTypeId contactTypeId=NoType;
48      index_t maxNodeID=0;
49      index_t maxDOF=0;
50      index_t maxElementID=0;
51      index_t maxElementID2=0;
52    char newName[LenString_MAX];    char newName[LenString_MAX];
53    if (numMsh==0) {    if (numMsh==0) {
54       Finley_setError(VALUE_ERROR,"__FILE__: Empty mesh list");       Finley_setError(VALUE_ERROR,"__FILE__: Empty mesh list");
55    } else {    } else {
56      index_t order=msh[0]->order;      order=msh[0]->order;
57      dim_t numDim=msh[0]->Nodes->numDim;      numDim=msh[0]->Nodes->numDim;
     ElementTypeId elementTypeId=NoType;  
     ElementTypeId faceElementTypeId=NoType;  
     ElementTypeId pointTypeId=NoType;  
     ElementTypeId contactTypeId=NoType;  
58      strcpy(newName,"");      strcpy(newName,"");
     dim_t numNodes=0;  
     dim_t numElements=0;  
     dim_t numFaceElements=0;  
     dim_t numContactElements=0;  
     dim_t numPoints=0;  
59      for (i=0;i<numMsh;i++) {      for (i=0;i<numMsh;i++) {
60         /* check if all mesh have the same type and dimensions */         /* check if all mesh have the same type and dimensions */
61         order=MAX(order,msh[i]->order);         order=MAX(order,msh[i]->order);
# Line 134  Finley_Mesh* Finley_Mesh_merge(dim_t num Line 140  Finley_Mesh* Finley_Mesh_merge(dim_t num
140      /* copy tables :*/      /* copy tables :*/
141    
142      if (Finley_noError()) {      if (Finley_noError()) {
143           numNodes=0;
144          dim_t numNodes=0;         numElements=0;
145          dim_t numElements=0;         numFaceElements=0;
146          dim_t numFaceElements=0;         numContactElements=0;
147          dim_t numContactElements=0;         numPoints=0;
         dim_t numPoints=0;  
         index_t maxNodeID=0;  
         index_t maxDOF=0;  
         index_t maxElementID=0;  
         index_t maxElementID2=0;  
148    
149          for (i=0;i<numMsh;i++) {          for (i=0;i<numMsh;i++) {
150    

Legend:
Removed from v.1027  
changed lines
  Added in v.1028

  ViewVC Help
Powered by ViewVC 1.1.26