Changeset 17232

Timestamp:

02/07/14 10:13:37 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: P1Enum should be provided to GetInputValue when it is not consistent with the element interpolation

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (4 diffs)
• Tria.cpp (modified) (2 diffs)

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

@@ -1219 +1219 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         for(i=0;i<NUMVERTICES;i++) x_list[i]=xyz_list[i][0];
-        PentaRef::GetInputValue(&x,x_list,gauss);
+        PentaRef::GetInputValue(&x,x_list,gauss,P1Enum);
 
         return x;
@@ -1234 +1234 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         for(i=0;i<NUMVERTICES;i++) y_list[i]=xyz_list[i][1];
-        PentaRef::GetInputValue(&y,y_list,gauss);
+        PentaRef::GetInputValue(&y,y_list,gauss,P1Enum);
 
         return y;
@@ -1249 +1249 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         for(i=0;i<NUMVERTICES;i++) z_list[i]=xyz_list[i][2];
-        PentaRef::GetInputValue(&z,z_list,gauss);
+        PentaRef::GetInputValue(&z,z_list,gauss,P1Enum);
 
         return z;
@@ -3102 +3102 @@
 /*FUNCTION Penta::ValueP1OnGauss{{{*/
 void Penta::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){
-        PentaRef::GetInputValue(pvalue,values,gauss);
+        PentaRef::GetInputValue(pvalue,values,gauss,P1Enum);
 }
 /*}}}*/

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

@@ -1218 +1218 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         for(int i=0;i<NUMVERTICES;i++) y_list[i]=xyz_list[i][1];
-        int backup = this->element_type;
-        this->element_type = P1Enum;
-        TriaRef::GetInputValue(&y,y_list,gauss);
-        this->element_type = backup;
+        TriaRef::GetInputValue(&y,y_list,gauss,P1Enum);
 
         return y;
@@ -2563 +2560 @@
 /*FUNCTION Tria::ValueP1OnGauss{{{*/
 void Tria::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){
-        TriaRef::GetInputValue(pvalue,values,gauss);
+        TriaRef::GetInputValue(pvalue,values,gauss,P1Enum);
 }
 /*}}}*/