/[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 3171 by jfenwick, Fri Sep 10 00:31:11 2010 UTC revision 3172 by jfenwick, Fri Sep 10 01:38:04 2010 UTC
# Line 110  Dudley_ElementFile_Jacobeans* Dudley_Ele Line 110  Dudley_ElementFile_Jacobeans* Dudley_Ele
110               if (refElement->numLocalDim==0) {               if (refElement->numLocalDim==0) {
111                   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.");
112               } else if (refElement->numLocalDim==1) {               } else if (refElement->numLocalDim==1) {
113                    if (out->BasisFunctions->Type->numDim==2) {            if (out->BasisFunctions->Type->numDim==1) {
114                            Assemble_jacobeans_2D_M1D_E1D(nodes->Coordinates, out->numQuadTotal, self->numElements, numNodes,self->Nodes, out->DSDX,out->volume,self->Id);
                         Assemble_jacobeans_2D_M1D_E2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,  
                                                       shape->Type->numShapes,self->numElements,numNodes,self->Nodes,  
                                                       shape->dSdv,basis->Type->numShapes,dBdv,  
                                                       out->DSDX,out->volume,self->Id);  
                   }  else if (out->BasisFunctions->Type->numDim==1) {  
   
                         Assemble_jacobeans_2D_M1D_E1D(nodes->Coordinates, out->numQuadTotal, self->numElements, numNodes,self->Nodes,  
                                                       out->DSDX,out->volume,self->Id);  
115                    } else {                    } else {
116                      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.");
117                    }                    }
118               } else if (refElement->numLocalDim==2) {               } else if (refElement->numLocalDim==2) {
119                       Assemble_jacobeans_2D(nodes->Coordinates,out->numQuadTotal, self->numElements,numNodes,self->Nodes,                       Assemble_jacobeans_2D(nodes->Coordinates,out->numQuadTotal, self->numElements,numNodes,self->Nodes,
# Line 148  Dudley_ElementFile_Jacobeans* Dudley_Ele Line 140  Dudley_ElementFile_Jacobeans* Dudley_Ele
140                      Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: element dimension for local dimenion 2 in a 3D domain has to be 3 or 2.");                      Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: element dimension for local dimenion 2 in a 3D domain has to be 3 or 2.");
141                    }                    }
142               } else if (refElement->numLocalDim==3) {               } else if (refElement->numLocalDim==3) {
143                       Assemble_jacobeans_3D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,                       Assemble_jacobeans_3D(nodes->Coordinates,out->numQuadTotal,self->numElements,numNodes,self->Nodes,
                                            shape->Type->numShapes,self->numElements,numNodes,self->Nodes,  
                                            shape->dSdv,basis->Type->numShapes,dBdv,  
144                                             out->DSDX,out->volume,self->Id);                                             out->DSDX,out->volume,self->Id);
145               } else {               } else {
146                 Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: local dimenion in a 3D domain has to be 2 or 3.");                 Dudley_setError(SYSTEM_ERROR,"Dudley_ElementFile_borrowJacobeans: local dimenion in a 3D domain has to be 2 or 3.");

Legend:
Removed from v.3171  
changed lines
  Added in v.3172

  ViewVC Help
Powered by ViewVC 1.1.26