Changeset 22406

Timestamp:

02/08/18 09:01:30 (7 years ago)

Author:

erobo

Message:

CHG: adding enum

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

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

@@ -743 +743 @@
               else if (strcmp(name,"VxObs")==0) return VxObsEnum;
               else if (strcmp(name,"VyObs")==0) return VyObsEnum;
+              else if (strcmp(name,"Numberedcostfunction")==0) return NumberedcostfunctionEnum;
               else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
               else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
@@ -751 +752 @@
               else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
               else if (strcmp(name,"None")==0) return NoneEnum;
-              else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
+              if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
+              else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
               else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
               else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
@@ -874 +875 @@
               else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
               else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum;
-              else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"EsaDeltathickness")==0) return EsaDeltathicknessEnum;
+              if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
+              else if (strcmp(name,"EsaDeltathickness")==0) return EsaDeltathicknessEnum;
               else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
               else if (strcmp(name,"EsaHElastic")==0) return EsaHElasticEnum;
@@ -997 +998 @@
               else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
               else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
-              else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
+              if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
+              else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
               else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;