Changeset 17750

Timestamp:

04/16/14 10:31:31 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing indices of tetra base that need to be direct

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tetra.cpp (modified) (1 diff)
• gauss/GaussTetra.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp

@@ -107 +107 @@
 
         IssmDouble values[NUMVERTICES];
-        //int        indices[4][3] = {{0,1,2},{0,1,3},{1,2,3},{2,0,3}};
-        int        indices[4][3] = {{0,1,2},{3,1,0},{3,2,1},{3,0,2}};
+        int        indices[4][3] = {{0,1,2},{0,3,1},{1,3,2},{0,2,3}};
 
         /*Retrieve all inputs and parameters*/

issm/trunk-jpl/src/c/classes/gauss/GaussTetra.cpp

@@ -53 +53 @@
                 for(int i=0;i<numgauss;i++) coords4[i]=0.;
         }
-        else if(index1==0 && index2==1 && index3==3){
+        else if(index1==0 && index2==3 && index3==1){
                 GaussLegendreTria(&numgauss,&coords1,&coords2,&coords4,&weights,order);
                 coords3=xNew<IssmDouble>(numgauss);
                 for(int i=0;i<numgauss;i++) coords3[i]=0.;
         }
-        else if(index1==1 && index2==2 && index3==3){
+        else if(index1==1 && index2==3 && index3==2){
                 GaussLegendreTria(&numgauss,&coords2,&coords3,&coords4,&weights,order);
                 coords1=xNew<IssmDouble>(numgauss);
                 for(int i=0;i<numgauss;i++) coords1[i]=0.;
         }
-        else if(index1==2 && index2==0 && index3==3){
+        else if(index1==0 && index2==2 && index3==3){
                 GaussLegendreTria(&numgauss,&coords1,&coords3,&coords4,&weights,order);
                 coords2=xNew<IssmDouble>(numgauss);