Changeset 14357

Timestamp:

02/20/13 10:13:04 (12 years ago)

Author:

seroussi

Message:

CHG: minor added enum

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• m/enum/SubelementMigrationEnum.m (added)

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

@@ -489 +489 @@
         NoneEnum,
         SoftMigrationEnum,
+        SubelementMigrationEnum,
         /*}}}*/
         /*Solver{{{1*/

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -470 +470 @@
                 case NoneEnum : return "None";
                 case SoftMigrationEnum : return "SoftMigration";
+                case SubelementMigrationEnum : return "SubelementMigration";
                 case StokesSolverEnum : return "StokesSolver";
                 case AdjointEnum : return "Adjoint";

issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -27 +27 @@
 
         if(migration_style==NoneEnum) return;
-        if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error_(EnumToStringx(migration_style) << " not supported yet!");
+        if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum && migration_style!=SubelementMigrationEnum) _error_(EnumToStringx(migration_style) << " not supported yet!");
 
         if(migration_style==SoftMigrationEnum){

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -480 +480 @@
               else if (strcmp(name,"None")==0) return NoneEnum;
               else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
+              else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
               else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum;
               else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
@@ -506 +507 @@
               else if (strcmp(name,"Regular")==0) return RegularEnum;
               else if (strcmp(name,"Scaled")==0) return ScaledEnum;
-              else if (strcmp(name,"Separate")==0) return SeparateEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Sset")==0) return SsetEnum;
+              if (strcmp(name,"Separate")==0) return SeparateEnum;
+              else if (strcmp(name,"Sset")==0) return SsetEnum;
               else if (strcmp(name,"Verbose")==0) return VerboseEnum;
               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;

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

@@ -4539 +4539 @@
         return StringToEnum('SoftMigration')[0]
 
+def SubelementMigrationEnum():
+        """
+        SUBELEMENTMIGRATIONENUM - Enum of SubelementMigration
+
+           Usage:
+              macro=SubelementMigrationEnum()
+        """
+
+        return StringToEnum('SubelementMigration')[0]
+
 def StokesSolverEnum():
         """
@@ -4977 +4987 @@
         """
 
-        return 496
-
+        return 497
+

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

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=496;
+macro=497;