/[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 3151 by jfenwick, Wed Sep 1 00:37:53 2010 UTC revision 3152 by jfenwick, Fri Sep 3 05:48:31 2010 UTC
# Line 138  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[4];
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    
# Line 171  void Mesh_setOrders(Dudley_Mesh *in) Line 169  void Mesh_setOrders(Dudley_Mesh *in)
169         in->reducedIntegrationOrder=(globals[3] < order_max ? globals[3] : -1 );         in->reducedIntegrationOrder=(globals[3] < order_max ? globals[3] : -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.3151  
changed lines
  Added in v.3152

  ViewVC Help
Powered by ViewVC 1.1.26