Changeset 15324

Timestamp:

06/22/13 13:42:23 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added one more enum

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/TriaRef.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) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/MINIEnum.m (added)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• m/enum/TriaP1InputEnum.m (deleted)

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

@@ -60 +60 @@
          * where N is the interpolation function for node i.
          *
-         * We assume B has been allocated already, of size: 3x(NDOF2*NUMNODESP1)
+         * We assume B has been allocated already, of size: 3x(NDOF2*numnodes)
          */
 

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

@@ -494 +494 @@
         P1Enum,
         P1DGEnum,
+        MINIEnum,
         P2Enum,
         /*}}}*/

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

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

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,"MINI")==0) return MINIEnum;
               else if (strcmp(name,"P2")==0) return P2Enum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
@@ -505 +506 @@
               else if (strcmp(name,"J")==0) return JEnum;
               else if (strcmp(name,"Patch")==0) return PatchEnum;
-              else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
+              if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
+              else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
               else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
               else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;

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

@@ -6575 +6575 @@
         return StringToEnum('P1DG')[0]
 
+def MINIEnum():
+        """
+        MINIENUM - Enum of MINI
+
+        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=MINIEnum()
+        """
+
+        return StringToEnum('MINI')[0]
+
 def P2Enum():
         """
@@ -7791 +7805 @@
         """
 
-        return 555
-
+        return 556
+

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

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