Changeset 15491

Timestamp:

07/15/13 16:26:13 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added some enums for higher order finite elements

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/PentaRef.cpp (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) (1 diff)
• m/enum/EnumDefinitions.py (modified) (4 diffs)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• m/enum/P1P2Enum.m (added)
• m/enum/TaylorHoodEnum.m (added)

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

@@ -1102 +1102 @@
                         basis[5]=gauss->coord3*(1.+gauss->coord4)/2.;
                         return;
+                case P1xP2Enum:
                 case MINIEnum:
                         basis[0]=gauss->coord1*(1.-gauss->coord4)/2.;

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

@@ -497 +497 @@
         P0Enum,
         P1Enum,
+        P2Enum,
         P1DGEnum,
+        P1P2Enum,
         MINIEnum,
-        P2Enum,
+        TaylorHoodEnum,
         /*}}}*/
         /*Results{{{*/

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

@@ -489 +489 @@
                 case P0Enum : return "P0";
                 case P1Enum : return "P1";
+                case P2Enum : return "P2";
                 case P1DGEnum : return "P1DG";
+                case P1P2Enum : return "P1P2";
                 case MINIEnum : return "MINI";
-                case P2Enum : return "P2";
+                case TaylorHoodEnum : return "TaylorHood";
                 case SaveResultsEnum : return "SaveResults";
                 case BoolElementResultEnum : return "BoolElementResult";

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

@@ -498 +498 @@
               else if (strcmp(name,"P0")==0) return P0Enum;
               else if (strcmp(name,"P1")==0) return P1Enum;
+              else if (strcmp(name,"P2")==0) return P2Enum;
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;
+              else if (strcmp(name,"P1P2")==0) return P1P2Enum;
               else if (strcmp(name,"MINI")==0) return MINIEnum;
-              else if (strcmp(name,"P2")==0) return P2Enum;
+              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
-              else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
-              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
+              if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
+              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
               else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
               else if (strcmp(name,"J")==0) return JEnum;

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

@@ -6617 +6617 @@
         return StringToEnum('P1')[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 P1DGEnum():
         """
@@ -6631 +6645 @@
         return StringToEnum('P1DG')[0]
 
+def P1P2Enum():
+        """
+        P1P2ENUM - Enum of P1P2
+
+        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=P1P2Enum()
+        """
+
+        return StringToEnum('P1P2')[0]
+
 def MINIEnum():
         """
@@ -6645 +6673 @@
         return StringToEnum('MINI')[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 TaylorHoodEnum():
+        """
+        TAYLORHOODENUM - Enum of TaylorHood
+
+        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=TaylorHoodEnum()
+        """
+
+        return StringToEnum('TaylorHood')[0]
 
 def SaveResultsEnum():
@@ -7861 +7889 @@
         """
 
-        return 560
-
+        return 562
+

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

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=560;
+macro=562;