Changeset 17572

Timestamp:

03/27/14 13:53:31 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: new GL migration option for FS based on contact mechanics

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

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

@@ -627 +627 @@
         /*}}}*/
         /*Grounding Line{{{*/
+        NoneEnum,
         AgressiveMigrationEnum,
-        NoneEnum,
         SoftMigrationEnum,
         SubelementMigrationEnum,
         SubelementMigration2Enum,
+        ContactEnum,
         MaskGroundediceLevelsetEnum,
         QmuMaskGroundediceLevelsetEnum,

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

@@ -604 +604 @@
                 case IncrementalEnum : return "Incremental";
                 case AugmentedLagrangianREnum : return "AugmentedLagrangianR";
+                case NoneEnum : return "None";
                 case AgressiveMigrationEnum : return "AgressiveMigration";
-                case NoneEnum : return "None";
                 case SoftMigrationEnum : return "SoftMigration";
                 case SubelementMigrationEnum : return "SubelementMigration";
                 case SubelementMigration2Enum : return "SubelementMigration2";
+                case ContactEnum : return "Contact";
                 case MaskGroundediceLevelsetEnum : return "MaskGroundediceLevelset";
                 case QmuMaskGroundediceLevelsetEnum : return "QmuMaskGroundediceLevelset";

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,"None")==0) return NoneEnum;
               else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
-              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,"SubelementMigration2")==0) return SubelementMigration2Enum;
+              else if (strcmp(name,"Contact")==0) return ContactEnum;
               else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum;
               else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum;
@@ -628 +629 @@
               else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
               else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
-              else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Colinear")==0) return ColinearEnum;
+              if (strcmp(name,"Adjoint")==0) return AdjointEnum;
+              else if (strcmp(name,"Colinear")==0) return ColinearEnum;
               else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
               else if (strcmp(name,"Fset")==0) return FsetEnum;

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

@@ -596 +596 @@
 def IncrementalEnum(): return StringToEnum("Incremental")[0]
 def AugmentedLagrangianREnum(): return StringToEnum("AugmentedLagrangianR")[0]
+def NoneEnum(): return StringToEnum("None")[0]
 def AgressiveMigrationEnum(): return StringToEnum("AgressiveMigration")[0]
-def NoneEnum(): return StringToEnum("None")[0]
 def SoftMigrationEnum(): return StringToEnum("SoftMigration")[0]
 def SubelementMigrationEnum(): return StringToEnum("SubelementMigration")[0]
 def SubelementMigration2Enum(): return StringToEnum("SubelementMigration2")[0]
+def ContactEnum(): return StringToEnum("Contact")[0]
 def MaskGroundediceLevelsetEnum(): return StringToEnum("MaskGroundediceLevelset")[0]
 def QmuMaskGroundediceLevelsetEnum(): return StringToEnum("QmuMaskGroundediceLevelset")[0]