← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to finley/src/ElementFile_jacobeans.c

  • Committer: jfenwick
  • Date: 2010-10-11 01:48:14 UTC
  • Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259
Merging dudley and scons updates from branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
finley/src/ElementFile_jacobeans.c
120
120
                  Finley_setError(SYSTEM_ERROR,"Finley_ElementFile_borrowJacobeans: 1D does not support local dimension 0.");
121
121
             } else if (refElement->numLocalDim==1) {
122
122
                  if (out->numSides==2) {
123
 
                                       Assemble_jacobeans_1D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
123
                                       Finley_Assemble_jacobeans_1D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
124
124
                                            shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
125
125
                                            shape->dSdv,basis->Type->numShapes,dBdv, out->DSDX,out->volume,self->Id);
126
126
 
137
137
             } else if (refElement->numLocalDim==1) {
138
138
                  if (out->BasisFunctions->Type->numDim==2) {
139
139
                     if (out->numSides==1) {
140
 
                        Assemble_jacobeans_2D_M1D_E2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
140
                        Finley_Assemble_jacobeans_2D_M1D_E2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
141
141
                                                      shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
142
142
                                                      shape->dSdv,basis->Type->numShapes,dBdv,
143
143
                                                      out->DSDX,out->volume,self->Id);
144
144
                     } else if (out->numSides==2) {
145
 
                        Assemble_jacobeans_2D_M1D_E2D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
145
                        Finley_Assemble_jacobeans_2D_M1D_E2D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
146
146
                                                        shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
147
147
                                                        shape->dSdv,basis->Type->numShapes,dBdv,
148
148
                                                        out->DSDX,out->volume,self->Id);
151
151
                      }
152
152
                  }  else if (out->BasisFunctions->Type->numDim==1) {
153
153
                     if (out->numSides==1) {
154
 
                        Assemble_jacobeans_2D_M1D_E1D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
154
                        Finley_Assemble_jacobeans_2D_M1D_E1D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
155
155
                                                      shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
156
156
                                                      shape->dSdv,basis->Type->numShapes,dBdv,
157
157
                                                      out->DSDX,out->volume,self->Id);
158
158
                     } else if (out->numSides==2) {
159
 
                        Assemble_jacobeans_2D_M1D_E1D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
159
                        Finley_Assemble_jacobeans_2D_M1D_E1D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
160
160
                                                        shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
161
161
                                                        shape->dSdv,basis->Type->numShapes,dBdv,
162
162
                                                        out->DSDX,out->volume,self->Id);
168
168
                  }
169
169
             } else if (refElement->numLocalDim==2) {
170
170
                  if (out->numSides==1) {
171
 
                     Assemble_jacobeans_2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
171
                     Finley_Assemble_jacobeans_2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
172
172
                                           shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
173
173
                                           shape->dSdv,basis->Type->numShapes,dBdv,
174
174
                                           out->DSDX,out->volume,self->Id);
186
186
             } else if (refElement->numLocalDim==2) {
187
187
                  if (out->BasisFunctions->Type->numDim==3) {
188
188
                     if (out->numSides==1) {
189
 
                        Assemble_jacobeans_3D_M2D_E3D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
189
                        Finley_Assemble_jacobeans_3D_M2D_E3D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
190
190
                                                      shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
191
191
                                                      shape->dSdv,basis->Type->numShapes,dBdv,
192
192
                                                      out->DSDX,out->volume,self->Id);
193
193
                     } else if (out->numSides==2) {
194
 
                        Assemble_jacobeans_3D_M2D_E3D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
194
                        Finley_Assemble_jacobeans_3D_M2D_E3D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
195
195
                                                        shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
196
196
                                                        shape->dSdv,basis->Type->numShapes,dBdv,
197
197
                                                        out->DSDX,out->volume,self->Id);
200
200
                      }
201
201
                  }  else if (out->BasisFunctions->Type->numDim==2) {
202
202
                     if (out->numSides==1) {
203
 
                        Assemble_jacobeans_3D_M2D_E2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
203
                        Finley_Assemble_jacobeans_3D_M2D_E2D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
204
204
                                                      shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
205
205
                                                      shape->dSdv,basis->Type->numShapes,dBdv,
206
206
                                                      out->DSDX,out->volume,self->Id);
207
207
                     } else if (out->numSides==2) {
208
 
                        Assemble_jacobeans_3D_M2D_E2D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
208
                        Finley_Assemble_jacobeans_3D_M2D_E2D_C(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
209
209
                                                        shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
210
210
                                                        shape->dSdv,basis->Type->numShapes,dBdv,
211
211
                                                        out->DSDX,out->volume,self->Id);
217
217
                  }
218
218
             } else if (refElement->numLocalDim==3) {
219
219
                  if (out->numSides==1) {
220
 
                     Assemble_jacobeans_3D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
 
220
                     Finley_Assemble_jacobeans_3D(nodes->Coordinates,out->numQuadTotal,shape->QuadWeights,
221
221
                                           shape->Type->numShapes,self->numElements,numNodes,self->Nodes,
222
222
                                           shape->dSdv,basis->Type->numShapes,dBdv,
223
223
                                           out->DSDX,out->volume,self->Id);