/[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 122 by jgs, Tue Oct 26 06:53:54 2004 UTC revision 123 by jgs, Fri Jul 8 04:08:13 2005 UTC
# Line 21  Line 21 
21    
22  static double  Finley_Mesh_lockingGridSize=0;  static double  Finley_Mesh_lockingGridSize=0;
23    
24  Finley_Mesh* Finley_Mesh_merge(int numMsh, Finley_Mesh** msh) {  Finley_Mesh* Finley_Mesh_merge(dim_t numMsh, Finley_Mesh** msh) {
25    Finley_Mesh* out=NULL;    Finley_Mesh* out=NULL;
26    int i;    dim_t i;
27    char newName[LenString_MAX];    char newName[LenString_MAX];
28    if (numMsh==0) {    if (numMsh==0) {
29       Finley_ErrorCode=VALUE_ERROR;       Finley_ErrorCode=VALUE_ERROR;
30       sprintf(Finley_ErrorMsg,"Empty mesh list");       sprintf(Finley_ErrorMsg,"Empty mesh list");
31    } else {    } else {
32      int order=msh[0]->order;      index_t order=msh[0]->order;
33      int numDim=msh[0]->Nodes->numDim;      dim_t numDim=msh[0]->Nodes->numDim;
34      ElementTypeId elementTypeId=NoType;      ElementTypeId elementTypeId=NoType;
35      ElementTypeId faceElementTypeId=NoType;      ElementTypeId faceElementTypeId=NoType;
36      ElementTypeId pointTypeId=NoType;      ElementTypeId pointTypeId=NoType;
37      ElementTypeId contactTypeId=NoType;      ElementTypeId contactTypeId=NoType;
38      strcpy(newName,"");      strcpy(newName,"");
39      int numNodes=0;      dim_t numNodes=0;
40      int numElements=0;      dim_t numElements=0;
41      int numFaceElements=0;      dim_t numFaceElements=0;
42      int numContactElements=0;      dim_t numContactElements=0;
43      int numPoints=0;      dim_t numPoints=0;
44      for (i=0;i<numMsh;i++) {      for (i=0;i<numMsh;i++) {
45         /* check if all mesh have the same type and dimensions */         /* check if all mesh have the same type and dimensions */
46         order=MAX(order,msh[i]->order);         order=MAX(order,msh[i]->order);
# Line 125  Finley_Mesh* Finley_Mesh_merge(int numMs Line 125  Finley_Mesh* Finley_Mesh_merge(int numMs
125    
126      if (Finley_ErrorCode == NO_ERROR) {      if (Finley_ErrorCode == NO_ERROR) {
127    
128          int numNodes=0;          dim_t numNodes=0;
129          int numElements=0;          dim_t numElements=0;
130          int numFaceElements=0;          dim_t numFaceElements=0;
131          int numContactElements=0;          dim_t numContactElements=0;
132          int numPoints=0;          dim_t numPoints=0;
133          int maxNodeID=0;          index_t maxNodeID=0;
134          int maxDOF=0;          index_t maxDOF=0;
135          int maxElementID=0;          index_t maxElementID=0;
136          int maxElementID2=0;          index_t maxElementID2=0;
137    
138          for (i=0;i<numMsh;i++) {          for (i=0;i<numMsh;i++) {
139    
# Line 180  Finley_Mesh* Finley_Mesh_merge(int numMs Line 180  Finley_Mesh* Finley_Mesh_merge(int numMs
180    
181  /*  /*
182  * $Log$  * $Log$
183  * Revision 1.1  2004/10/26 06:53:57  jgs  * Revision 1.2  2005/07/08 04:07:53  jgs
184  * Initial revision  * Merge of development branch back to main trunk on 2005-07-08
185    *
186    * Revision 1.1.1.1.2.1  2005/06/29 02:34:52  gross
187    * some changes towards 64 integers in finley
188    *
189    * Revision 1.1.1.1  2004/10/26 06:53:57  jgs
190    * initial import of project esys2
191  *  *
192  * Revision 1.2  2004/07/30 04:37:06  gross  * Revision 1.2  2004/07/30 04:37:06  gross
193  * escript and finley are linking now and RecMeshTest.py has been passed  * escript and finley are linking now and RecMeshTest.py has been passed

Legend:
Removed from v.122  
changed lines
  Added in v.123

  ViewVC Help
Powered by ViewVC 1.1.26