/[escript]/branches/doubleplusgood/dudley/src/Mesh.cpp
ViewVC logotype

Diff of /branches/doubleplusgood/dudley/src/Mesh.cpp

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

revision 3086 by jfenwick, Thu Aug 5 05:07:58 2010 UTC revision 3163 by jfenwick, Tue Sep 7 05:30:39 2010 UTC
# Line 37  Dudley_Mesh* Dudley_Mesh_alloc(char* nam Line 37  Dudley_Mesh* Dudley_Mesh_alloc(char* nam
37    out->Elements=NULL;      out->Elements=NULL;  
38    out->FaceElements=NULL;    out->FaceElements=NULL;
39    out->Points=NULL;          out->Points=NULL;      
   out->ContactElements=NULL;        
40    out->TagMap=NULL;          out->TagMap=NULL;      
41    out->reference_counter=0;    out->reference_counter=0;
42    
# Line 73  Dudley_Mesh* Dudley_Mesh_alloc(char* nam Line 72  Dudley_Mesh* Dudley_Mesh_alloc(char* nam
72    out->Elements=NULL;    out->Elements=NULL;
73    out->FaceElements=NULL;    out->FaceElements=NULL;
74    out->Points=NULL;    out->Points=NULL;
   out->ContactElements=NULL;  
75    out->reference_counter++;    out->reference_counter++;
76    return out;    return out;
77  }  }
# Line 95  void Dudley_Mesh_free(Dudley_Mesh* in) { Line 93  void Dudley_Mesh_free(Dudley_Mesh* in) {
93         Dudley_NodeFile_free(in->Nodes);         Dudley_NodeFile_free(in->Nodes);
94         Dudley_ElementFile_free(in->FaceElements);         Dudley_ElementFile_free(in->FaceElements);
95         Dudley_ElementFile_free(in->Elements);           Dudley_ElementFile_free(in->Elements);  
        Dudley_ElementFile_free(in->ContactElements);  
96         Dudley_ElementFile_free(in->Points);         Dudley_ElementFile_free(in->Points);
97         Dudley_TagMap_free(in->TagMap);         Dudley_TagMap_free(in->TagMap);
98         Paso_SystemMatrixPattern_free(in->FullFullPattern);         Paso_SystemMatrixPattern_free(in->FullFullPattern);
# Line 124  void Dudley_Mesh_setFaceElements(Dudley_ Line 121  void Dudley_Mesh_setFaceElements(Dudley_
121      Dudley_ElementFile_free(self->FaceElements);      Dudley_ElementFile_free(self->FaceElements);
122      self->FaceElements=elements;      self->FaceElements=elements;
123  }  }
 void Dudley_Mesh_setContactElements(Dudley_Mesh* self,Dudley_ElementFile *elements) {  
     Dudley_ElementFile_free(self->ContactElements);  
     self->ContactElements=elements;  
 }  
124  void Dudley_Mesh_setPoints(Dudley_Mesh* self,Dudley_ElementFile *elements) {  void Dudley_Mesh_setPoints(Dudley_Mesh* self,Dudley_ElementFile *elements) {
125      Dudley_ElementFile_free(self->Points);      Dudley_ElementFile_free(self->Points);
126      self->Points=elements;      self->Points=elements;
# Line 145  int  Dudley_Mesh_getStatus(Dudley_Mesh* Line 138  int  Dudley_Mesh_getStatus(Dudley_Mesh*
138  void Mesh_setOrders(Dudley_Mesh *in)  void Mesh_setOrders(Dudley_Mesh *in)
139  {  {
140     const dim_t order_max=9999999;     const dim_t order_max=9999999;
141     dim_t locals[4];     dim_t locals[3];
142     #ifdef PASO_MPI     #ifdef PASO_MPI
143         dim_t globals[4];         dim_t globals[3];
144     #endif     #endif
145     locals[0]=order_max; locals[1]=order_max; locals[2]=order_max; locals[3]=order_max;     locals[0]=order_max; locals[1]=order_max; locals[2]=order_max;
146    
147    if ( in->Elements!=NULL) {    if ( in->Elements!=NULL) {
148       if (in->Elements->numElements > 0) {       if (in->Elements->numElements > 0) {
149           locals[0]=MIN(locals[0], in->Elements->referenceElementSet->referenceElement->BasisFunctions->Type->numOrder);           locals[0]=MIN(locals[0], in->Elements->referenceElementSet->referenceElement->BasisFunctions->Type->numOrder);
150           locals[1]=MIN(locals[1], in->Elements->referenceElementSet->referenceElement->LinearBasisFunctions->Type->numOrder);           locals[1]=MIN(locals[1], in->Elements->referenceElementSet->referenceElement->integrationOrder);
151           locals[2]=MIN(locals[2], in->Elements->referenceElementSet->referenceElement->integrationOrder);           locals[2]=MIN(locals[2], in->Elements->referenceElementSet->referenceElementReducedQuadrature->integrationOrder);
          locals[3]=MIN(locals[3], in->Elements->referenceElementSet->referenceElementReducedQuadrature->integrationOrder);  
152       }       }
153    }    }
154    if ( in->FaceElements!=NULL) {    if ( in->FaceElements!=NULL) {
155       if (in->FaceElements->numElements > 0) {       if (in->FaceElements->numElements > 0) {
156           locals[0]=MIN(locals[0], in->FaceElements->referenceElementSet->referenceElement->BasisFunctions->Type->numOrder);           locals[0]=MIN(locals[0], in->FaceElements->referenceElementSet->referenceElement->BasisFunctions->Type->numOrder);
157           locals[1]=MIN(locals[1], in->FaceElements->referenceElementSet->referenceElement->LinearBasisFunctions->Type->numOrder);           locals[1]=MIN(locals[1], in->FaceElements->referenceElementSet->referenceElement->integrationOrder);
158           locals[2]=MIN(locals[2], in->FaceElements->referenceElementSet->referenceElement->integrationOrder);           locals[2]=MIN(locals[2], in->FaceElements->referenceElementSet->referenceElementReducedQuadrature->integrationOrder);
          locals[3]=MIN(locals[3], in->FaceElements->referenceElementSet->referenceElementReducedQuadrature->integrationOrder);  
159       }       }
160    
161    
162    }    }
   if ( in->ContactElements!=NULL) {  
      if (in->ContactElements->numElements > 0) {  
          locals[0]=MIN(locals[0], in->ContactElements->referenceElementSet->referenceElement->BasisFunctions->Type->numOrder);  
          locals[1]=MIN(locals[1], in->ContactElements->referenceElementSet->referenceElement->LinearBasisFunctions->Type->numOrder);  
          locals[2]=MIN(locals[2], in->ContactElements->referenceElementSet->referenceElement->integrationOrder);  
          locals[3]=MIN(locals[3], in->ContactElements->referenceElementSet->referenceElementReducedQuadrature->integrationOrder);  
      }  
   
   }  
163    
164     #ifdef PASO_MPI     #ifdef PASO_MPI
165         MPI_Allreduce( locals, globals, 4, MPI_INT, MPI_MIN, in->MPIInfo->comm );         MPI_Allreduce( locals, globals, 3, MPI_INT, MPI_MIN, in->MPIInfo->comm );
166         in->approximationOrder=(globals[0] < order_max ? globals[0] : -1 );         in->approximationOrder=(globals[0] < order_max ? globals[0] : -1 );
167         in->reducedApproximationOrder=(globals[1] < order_max ? globals[1] : -1 );         in->reducedApproximationOrder=in->approximationOrder;
168         in->integrationOrder=(globals[2] < order_max ? globals[2] : -1 );         in->integrationOrder=(globals[1] < order_max ? globals[1] : -1 );
169         in->reducedIntegrationOrder=(globals[3] < order_max ? globals[3] : -1 );         in->reducedIntegrationOrder=(globals[2] < order_max ? globals[2] : -1 );
170     #else     #else
171         in->approximationOrder=(locals[0] < order_max ? locals[0] : -1 );         in->approximationOrder=(locals[0] < order_max ? locals[0] : -1 );
172         in->reducedApproximationOrder=(locals[1] < order_max ? locals[1] : -1 );         in->reducedApproximationOrder=(locals[0] < order_max ? locals[0] : -1 );
173         in->integrationOrder=(locals[2] < order_max ? locals[2] : -1 );         in->integrationOrder=(locals[1] < order_max ? locals[1] : -1 );
174         in->reducedIntegrationOrder=(locals[3] < order_max ? locals[3] : -1 );         in->reducedIntegrationOrder=(locals[2] < order_max ? locals[2] : -1 );
175     #endif     #endif
176    
177    

Legend:
Removed from v.3086  
changed lines
  Added in v.3163

  ViewVC Help
Powered by ViewVC 1.1.26