/[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 2855 by gross, Tue Nov 17 07:32:59 2009 UTC revision 2856 by gross, Mon Jan 18 04:14:37 2010 UTC
# Line 58  Finley_Mesh* Finley_Mesh_merge(dim_t num Line 58  Finley_Mesh* Finley_Mesh_merge(dim_t num
58                return NULL;                return NULL;
59           }           }
60      }      }
61      order=msh[0]->order;      order=msh[0]->integrationOrder;
62      reduced_order=msh[0]->reduced_order;      reduced_order=msh[0]->reducedIntegrationOrder;
63      numDim=msh[0]->Nodes->numDim;      numDim=msh[0]->Nodes->numDim;
64      mpi_info=msh[0]->MPIInfo;      mpi_info=msh[0]->MPIInfo;
65      strcpy(newName,"");      strcpy(newName,"");
66      for (i=0;i<numMsh;i++) {      for (i=0;i<numMsh;i++) {
67         /* check if all mesh have the same type and dimensions */         /* check if all mesh have the same type and dimensions */
68         order=MAX(order,msh[i]->order);         order=MAX(order,msh[i]->integrationOrder);
69         reduced_order=MIN(reduced_order,msh[i]->reduced_order);         reduced_order=MIN(reduced_order,msh[i]->reducedIntegrationOrder);
70         numNodes+=msh[i]->Nodes->numNodes;         numNodes+=msh[i]->Nodes->numNodes;
71         if (mpi_info->comm!=msh[i]->MPIInfo->comm) {         if (mpi_info->comm!=msh[i]->MPIInfo->comm) {
72            Finley_setError(TYPE_ERROR,"Finley_Mesh_merge: MPI communicators of meshes don't match.");            Finley_setError(TYPE_ERROR,"Finley_Mesh_merge: MPI communicators of meshes don't match.");
# Line 129  Finley_Mesh* Finley_Mesh_merge(dim_t num Line 129  Finley_Mesh* Finley_Mesh_merge(dim_t num
129      /* allocate */      /* allocate */
130    
131      if (Finley_noError()) {      if (Finley_noError()) {
132        out=Finley_Mesh_alloc(newName,numDim,order,reduced_order,mpi_info);        out=Finley_Mesh_alloc(newName,numDim,mpi_info);
133      }      }
134      if (Finley_noError()) {      if (Finley_noError()) {
135          refElements= Finley_ReferenceElementSet_alloc(elementTypeId,order,reduced_order);          refElements= Finley_ReferenceElementSet_alloc(elementTypeId,order,reduced_order);

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

  ViewVC Help
Powered by ViewVC 1.1.26