Changeset 22463

Timestamp:

02/23/18 14:56:45 (7 years ago)

Author:

seroussi

Message:

ADD: new enum

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (7 diffs)

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

@@ -377 +377 @@
         TimesteppingTimeStepEnum,
         TimesteppingInterpForcingsEnum,
+        TimesteppingCouplingTimeEnum,
         TransientIssmbEnum,
         TransientIscouplerEnum,

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

@@ -383 +383 @@
                 case TimesteppingTimeStepEnum : return "TimesteppingTimeStep";
                 case TimesteppingInterpForcingsEnum : return "TimesteppingInterpForcings";
+                case TimesteppingCouplingTimeEnum : return "TimesteppingCouplingTime";
                 case TransientIssmbEnum : return "TransientIssmb";
                 case TransientIscouplerEnum : return "TransientIscoupler";

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

@@ -392 +392 @@
               else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
               else if (strcmp(name,"TimesteppingInterpForcings")==0) return TimesteppingInterpForcingsEnum;
+              else if (strcmp(name,"TimesteppingCouplingTime")==0) return TimesteppingCouplingTimeEnum;
               else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum;
               else if (strcmp(name,"TransientIscoupler")==0) return TransientIscouplerEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SmbSealev")==0) return SmbSealevEnum;
               else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum;
-              else if (strcmp(name,"SmbDpermil")==0) return SmbDpermilEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SmbF")==0) return SmbFEnum;
+              if (strcmp(name,"SmbDpermil")==0) return SmbDpermilEnum;
+              else if (strcmp(name,"SmbF")==0) return SmbFEnum;
               else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum;
               else if (strcmp(name,"SmbMonthlytemperatures")==0) return SmbMonthlytemperaturesEnum;
@@ -628 +629 @@
               else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
               else if (strcmp(name,"GiaW")==0) return GiaWEnum;
-              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
+              if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
+              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
@@ -751 +752 @@
               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 stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
+              if (strcmp(name,"Numberedcostfunction")==0) return NumberedcostfunctionEnum;
+              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
               else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
               else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
@@ -874 +875 @@
               else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
               else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
-              else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
+              if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum;
+              else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
               else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
               else if (strcmp(name,"EsaXmotion")==0) return EsaXmotionEnum;
@@ -997 +998 @@
               else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
               else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
-              else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
+              if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
+              else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
               else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
               else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"Water")==0) return WaterEnum;
               else if (strcmp(name,"DataSet")==0) return DataSetEnum;
-              else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"Loads")==0) return LoadsEnum;
+              if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
+              else if (strcmp(name,"Loads")==0) return LoadsEnum;
               else if (strcmp(name,"Materials")==0) return MaterialsEnum;
               else if (strcmp(name,"Nodes")==0) return NodesEnum;