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

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

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

revision 3201 by jfenwick, Thu Sep 16 02:57:17 2010 UTC revision 3202 by jfenwick, Thu Sep 23 23:24:09 2010 UTC
# Line 65  void Dudley_Assemble_PDE_Single2_2D(Asse Line 65  void Dudley_Assemble_PDE_Single2_2D(Asse
65      bool_t extendedX = isExpanded(X);      bool_t extendedX = isExpanded(X);
66      bool_t extendedY = isExpanded(Y);      bool_t extendedY = isExpanded(Y);
67      double *F_p = (requireWrite(F), getSampleDataRW(F, 0)); /* use comma, to get around the mixed code and declarations thing */      double *F_p = (requireWrite(F), getSampleDataRW(F, 0)); /* use comma, to get around the mixed code and declarations thing */
68      double *S = p.row_jac->BasisFunctions->S;      const double *S = p.shapeFns;
69      dim_t len_EM_S = p.row_numShapesTotal * p.col_numShapesTotal;      dim_t len_EM_S = p.row_numShapesTotal * p.col_numShapesTotal;
70      dim_t len_EM_F = p.row_numShapesTotal;      dim_t len_EM_F = p.row_numShapesTotal;
71    
# Line 94  void Dudley_Assemble_PDE_Single2_2D(Asse Line 94  void Dudley_Assemble_PDE_Single2_2D(Asse
94              X_p = getSampleDataRO(X, e);              X_p = getSampleDataRO(X, e);
95              Y_p = getSampleDataRO(Y, e);              Y_p = getSampleDataRO(Y, e);
96    
 //                     Vol=&(p.row_jac->volume[INDEX3(0,0,e, p.numQuadTotal,1)]);  
97              double vol = p.row_jac->absD[e] * p.row_jac->quadweight;              double vol = p.row_jac->absD[e] * p.row_jac->quadweight;
98    
99              DSDX = &(p.row_jac->DSDX[INDEX5(0, 0, 0, 0, e, p.row_numShapesTotal, DIM, p.numQuadTotal, 1)]);              DSDX = &(p.row_jac->DSDX[INDEX5(0, 0, 0, 0, e, p.row_numShapesTotal, DIM, p.numQuadTotal, 1)]);
# Line 120  void Dudley_Assemble_PDE_Single2_2D(Asse Line 119  void Dudley_Assemble_PDE_Single2_2D(Asse
119                      rtmp = 0;                      rtmp = 0;
120                      for (q = 0; q < p.numQuadTotal; q++)                      for (q = 0; q < p.numQuadTotal; q++)
121                      {                      {
 /*  
                                    rtmp+=Vol[q]*(DTDV_2D[s][0]*A_q[INDEX3(0,0,q,DIM,DIM)]*DTDV_2D[r][0]  
                                                + DTDV_2D[s][0]*A_q[INDEX3(0,1,q,DIM,DIM)]*DTDV_2D[r][1]  
                                                + DTDV_2D[s][1]*A_q[INDEX3(1,0,q,DIM,DIM)]*DTDV_2D[r][0]  
                                                + DSDX[INDEX3(s,1,q,p.row_numShapesTotal,DIM)]*A_q[INDEX3(1,1,q,DIM,DIM)]*DSDX[INDEX3(r,1,q,p.row_numShapesTotal,DIM)] );  
 */  
   
                         if (0 /*s==0 */ )  
                         {  
                         fprintf(stderr, "\nVVV=%d T=%f M=%f\n",  
                             INDEX3(s, 0, q, p.row_numShapesTotal, DIM),  
                             DSDX[INDEX3(s, 0, q, p.row_numShapesTotal, DIM)],  
                             DTDV_2D[s][0]);  
   
                         }  
   
122                          rtmp +=                          rtmp +=
123                          vol * (DSDX[INDEX3(s, 0, q, p.row_numShapesTotal, DIM)] *                          vol * (DSDX[INDEX3(s, 0, q, p.row_numShapesTotal, DIM)] *
124                                 A_q[INDEX3(0, 0, q, DIM, DIM)] *                                 A_q[INDEX3(0, 0, q, DIM, DIM)] *

Legend:
Removed from v.3201  
changed lines
  Added in v.3202

  ViewVC Help
Powered by ViewVC 1.1.26