Changeset 15282

Timestamp:

06/19/13 08:18:12 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing for P2 interpolation

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/TriaRef.cpp (modified) (1 diff)
• c/classes/Elements/TriaRef.h (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• m/enum/P2Enum.m (added)

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

@@ -550 +550 @@
 }
 /*}}}*/
+/*FUNCTION TriaRef::NumberofNodes{{{*/
+int TriaRef::NumberofNodes(void){
+
+        switch(this->element_type){
+                case P1Enum:   return NUMNODESP1;
+                case P1DGEnum: return NUMNODESP1;
+                case P2Enum:   return NUMNODESP2;
+                default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
+        }
+
+        return -1;
+}
+/*}}}*/

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

@@ -46 +46 @@
                 void GetInputDerivativeValue(IssmDouble* pp, IssmDouble* plist,IssmDouble* xyz_list, GaussTria* gauss);
 
+                int  NumberofNodes(void);
+
 };
 #endif

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -494 +494 @@
         P1Enum,
         P1DGEnum,
+        P2Enum,
         /*}}}*/
         /*Results{{{*/

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -486 +486 @@
                 case P1Enum : return "P1";
                 case P1DGEnum : return "P1DG";
+                case P2Enum : return "P2";
                 case SaveResultsEnum : return "SaveResults";
                 case BoolElementResultEnum : return "BoolElementResult";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -495 +495 @@
               else if (strcmp(name,"P1")==0) return P1Enum;
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;
+              else if (strcmp(name,"P2")==0) return P2Enum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
@@ -505 +506 @@
               else if (strcmp(name,"Patch")==0) return PatchEnum;
               else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
-              else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
+              if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
+              else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
               else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
               else if (strcmp(name,"Step")==0) return StepEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -6575 +6575 @@
         return StringToEnum('P1DG')[0]
 
+def P2Enum():
+        """
+        P2ENUM - Enum of P2
+
+        WARNING: DO NOT MODIFY THIS FILE
+                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+                                Please read src/c/shared/Enum/README for more information
+
+           Usage:
+              macro=P2Enum()
+        """
+
+        return StringToEnum('P2')[0]
+
 def SaveResultsEnum():
         """
@@ -7777 +7791 @@
         """
 
-        return 554
-
+        return 555
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=554;
+macro=555;