Changeset 15530

Timestamp:

07/22/13 09:19:21 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added one new enum: MINIcondensedEnum.m

Location:

issm/trunk-jpl/src

Files:

• 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) (2 diffs)
• m/enum/MINIcondensedEnum.m (added)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

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

@@ -503 +503 @@
         P2xP1Enum,
         MINIEnum,
+        MINIcondensedEnum,
         TaylorHoodEnum,
         /*}}}*/

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

@@ -495 +495 @@
                 case P2xP1Enum : return "P2xP1";
                 case MINIEnum : return "MINI";
+                case MINIcondensedEnum : return "MINIcondensed";
                 case TaylorHoodEnum : return "TaylorHood";
                 case SaveResultsEnum : return "SaveResults";

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

@@ -504 +504 @@
               else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
               else if (strcmp(name,"MINI")==0) return MINIEnum;
+              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
-              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
+              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;

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

@@ -6701 +6701 @@
         return StringToEnum('MINI')[0]
 
+def MINIcondensedEnum():
+        """
+        MINICONDENSEDENUM - Enum of MINIcondensed
+
+        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=MINIcondensedEnum()
+        """
+
+        return StringToEnum('MINIcondensed')[0]
+
 def TaylorHoodEnum():
         """
@@ -7917 +7931 @@
         """
 
-        return 564
-
+        return 565
+

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

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=564;
+macro=565;