Changeset 17651

Timestamp:

04/04/14 15:50:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added new enum

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

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

@@ -625 +625 @@
         IncrementalEnum,
         AugmentedLagrangianREnum,
+        AugmentedLagrangianThetaEnum,
         /*}}}*/
         /*Grounding Line{{{*/

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

@@ -604 +604 @@
                 case IncrementalEnum : return "Incremental";
                 case AugmentedLagrangianREnum : return "AugmentedLagrangianR";
+                case AugmentedLagrangianThetaEnum : return "AugmentedLagrangianTheta";
                 case NoneEnum : return "None";
                 case AgressiveMigrationEnum : return "AgressiveMigration";

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

@@ -616 +616 @@
               else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
               else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
+              else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
               else if (strcmp(name,"None")==0) return NoneEnum;
               else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
@@ -628 +629 @@
               else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
               else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
-              else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Adjoint")==0) return AdjointEnum;
+              if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
+              else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
               else if (strcmp(name,"Colinear")==0) return ColinearEnum;
               else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;

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

@@ -596 +596 @@
 def IncrementalEnum(): return StringToEnum("Incremental")[0]
 def AugmentedLagrangianREnum(): return StringToEnum("AugmentedLagrangianR")[0]
+def AugmentedLagrangianThetaEnum(): return StringToEnum("AugmentedLagrangianTheta")[0]
 def NoneEnum(): return StringToEnum("None")[0]
 def AgressiveMigrationEnum(): return StringToEnum("AgressiveMigration")[0]