Changeset 17729

Timestamp:

04/14/14 16:50:29 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed spawn for gmesh tetras

Location:

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

Files:

• Tetra.cpp (modified) (2 diffs)
• Tetra.h (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},{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}};
 
         /*Retrieve all inputs and parameters*/
@@ -219 +220 @@
 
 }/*}}}*/
+/*FUNCTION Tetra::GetXcoord {{{*/
+IssmDouble Tetra::GetXcoord(Gauss* gauss){
+
+        int    i;
+        IssmDouble z;
+        IssmDouble xyz_list[NUMVERTICES][3];
+        IssmDouble z_list[NUMVERTICES];
+
+        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
+        for(i=0;i<NUMVERTICES;i++) z_list[i]=xyz_list[i][0];
+        TetraRef::GetInputValue(&z,&z_list[0],(GaussTetra*)gauss,P1Enum);
+
+        return z;
+}
+/*}}}*/
+/*FUNCTION Tetra::GetYcoord {{{*/
+IssmDouble Tetra::GetYcoord(Gauss* gauss){
+
+        int    i;
+        IssmDouble z;
+        IssmDouble xyz_list[NUMVERTICES][3];
+        IssmDouble z_list[NUMVERTICES];
+
+        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
+        for(i=0;i<NUMVERTICES;i++) z_list[i]=xyz_list[i][1];
+        TetraRef::GetInputValue(&z,&z_list[0],(GaussTetra*)gauss,P1Enum);
+
+        return z;
+}
+/*}}}*/
 /*FUNCTION Tetra::GetZcoord {{{*/
 IssmDouble Tetra::GetZcoord(Gauss* gauss){

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

@@ -112 +112 @@
                 void        GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");};
                 Node*       GetNode(int node_number){_error_("Not implemented");};
-                IssmDouble  GetXcoord(Gauss* gauss){_error_("Not implemented");};
-                IssmDouble  GetYcoord(Gauss* gauss){_error_("Not implemented");};
+                IssmDouble  GetXcoord(Gauss* gauss);
+                IssmDouble  GetYcoord(Gauss* gauss);
                 IssmDouble  GetZcoord(Gauss* gauss);
                 int         GetElementType(void);