/[escript]/trunk-mpi-branch/finley/src/Quadrature.c
ViewVC logotype

Diff of /trunk-mpi-branch/finley/src/Quadrature.c

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

revision 1306 by ksteube, Tue Sep 18 05:51:09 2007 UTC revision 1307 by gross, Tue Sep 18 08:53:11 2007 UTC
# Line 90  void Finley_Quad_getNodesTri(int numQuad Line 90  void Finley_Quad_getNodesTri(int numQuad
90  void Finley_Quad_getNodesTet(int numQuadNodes,double* quadNodes,double* quadWeights) {  void Finley_Quad_getNodesTet(int numQuadNodes,double* quadNodes,double* quadWeights) {
91    int i;    int i;
92    double Q1,Q2,Q3,JA11,JA12,JA13,JA21,JA22,JA23,JA31,JA32,JA33,DET;    double Q1,Q2,Q3,JA11,JA12,JA13,JA21,JA22,JA23,JA31,JA32,JA33,DET;
93      double alpha=0.58541020;
94      double beta =0.13819660;
95    #define DIM 3    #define DIM 3
96        
97    /*  the easy cases: */    /*  the easy cases: */
# Line 99  void Finley_Quad_getNodesTet(int numQuad Line 101  void Finley_Quad_getNodesTet(int numQuad
101      QUADNODES(2,0)=0.25;      QUADNODES(2,0)=0.25;
102      QUADWEIGHTS(0)=1./6.;      QUADWEIGHTS(0)=1./6.;
103    } else if (numQuadNodes==4){    } else if (numQuadNodes==4){
     double alpha=0.58541020;  
     double beta =0.13819660;  
104      QUADNODES(0,0)=beta;      QUADNODES(0,0)=beta;
105      QUADNODES(1,0)=beta;      QUADNODES(1,0)=beta;
106      QUADNODES(2,0)=beta;      QUADNODES(2,0)=beta;
# Line 146  void Finley_Quad_getNodesTet(int numQuad Line 146  void Finley_Quad_getNodesTet(int numQuad
146      if (! Finley_noError()) return;      if (! Finley_noError()) return;
147            
148      /*  squeeze it: */      /*  squeeze it: */
       
149      for (i=0;i<numQuadNodes;i++) {      for (i=0;i<numQuadNodes;i++) {
150        Q1=QUADNODES(0,i);        Q1=QUADNODES(0,i);
151        Q2=QUADNODES(1,i);        Q2=QUADNODES(1,i);

Legend:
Removed from v.1306  
changed lines
  Added in v.1307

  ViewVC Help
Powered by ViewVC 1.1.26