/[escript]/branches/domexper/dudley/src/ElementFile_jacobeans.c
ViewVC logotype

Diff of /branches/domexper/dudley/src/ElementFile_jacobeans.c

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

revision 3169 by jfenwick, Mon Sep 6 05:10:18 2010 UTC revision 3170 by jfenwick, Thu Sep 9 05:40:25 2010 UTC
# Line 62  Dudley_ElementFile_Jacobeans* Dudley_Ele Line 62  Dudley_ElementFile_Jacobeans* Dudley_Ele
62        
63    dim_t numNodes=self->numNodes;    dim_t numNodes=self->numNodes;
64        
65    if (reducedShapefunction) {    if (reducedIntegrationOrder)
66         if (reducedIntegrationOrder) {    {
67             out=self->jacobeans_reducedQ;      out=self->jacobeans_reducedQ;
        } else {  
            out=self->jacobeans;  
        }  
   } else {  
        if (reducedIntegrationOrder) {  
            out=self->jacobeans_reducedQ;  
        } else {  
            out=self->jacobeans;  
        }  
68    }    }
69    if (out->status < nodes->status) {    else
70          {
71        out=self->jacobeans;
72      }
73      if (out->status < nodes->status)
74      {
75       basis=out->BasisFunctions;       basis=out->BasisFunctions;
76       shape=Dudley_ReferenceElementSet_borrowParametrization(self->referenceElementSet, reducedIntegrationOrder);       shape=Dudley_ReferenceElementSet_borrowParametrization(self->referenceElementSet, reducedIntegrationOrder);
77       refElement= Dudley_ReferenceElementSet_borrowReferenceElement(self->referenceElementSet, reducedIntegrationOrder);       refElement= Dudley_ReferenceElementSet_borrowReferenceElement(self->referenceElementSet, reducedIntegrationOrder);
# Line 125  Dudley_ElementFile_Jacobeans* Dudley_Ele Line 120  Dudley_ElementFile_Jacobeans* Dudley_Ele
120                   Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: 2D does not support local dimension 0.");                   Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: 2D does not support local dimension 0.");
121               } else if (refElement->numLocalDim==1) {               } else if (refElement->numLocalDim==1) {
122                    if (out->BasisFunctions->Type->numDim==2) {                    if (out->BasisFunctions->Type->numDim==2) {
123    
124                          Assemble_jacobeans_2D_M1D_E2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,                          Assemble_jacobeans_2D_M1D_E2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
125                                                        shape->Type->numShapes,self->numElements,numNodes,self->Nodes,                                                        shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
126                                                        shape->dSdv,basis->Type->numShapes,dBdv,                                                        shape->dSdv,basis->Type->numShapes,dBdv,
# Line 138  Dudley_ElementFile_Jacobeans* Dudley_Ele Line 134  Dudley_ElementFile_Jacobeans* Dudley_Ele
134                      Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: element dimension for local dimenion 1 in a 2D domain has to be 1 or 2.");                      Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: element dimension for local dimenion 1 in a 2D domain has to be 1 or 2.");
135                    }                    }
136               } else if (refElement->numLocalDim==2) {               } else if (refElement->numLocalDim==2) {
137                       Assemble_jacobeans_2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,                       Assemble_jacobeans_2D(nodes->Coordinates,out->numQuadTotal, self->numElements,numNodes,self->Nodes,
138                                             shape->Type->numShapes,self->numElements,numNodes,self->Nodes,                                             out->DSDX, out->volume, self->Id);
                                            shape->dSdv,basis->Type->numShapes,dBdv,  
                                            out->DSDX,out->volume,self->Id);  
139               } else {               } else {
140                 Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: local dimenion in a 2D domain has to be  1 or 2.");                 Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: local dimenion in a 2D domain has to be  1 or 2.");
141               }               }

Legend:
Removed from v.3169  
changed lines
  Added in v.3170

  ViewVC Help
Powered by ViewVC 1.1.26