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

Timestamp:

11/09/20 11:38:03 (4 years ago)

Author:

Cheng Gong

Message:

CHG: change calving_max to migration_max

File:

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

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

@@ -105 +105 @@
               else if (strcmp(name,"CalvingHeightAboveFloatation")==0) return CalvingHeightAboveFloatationEnum;
               else if (strcmp(name,"CalvingLaw")==0) return CalvingLawEnum;
-              else if (strcmp(name,"CalvingMax")==0) return CalvingMaxEnum;
               else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum;
               else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
@@ -137 +136 @@
               else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
               else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
+              else if (strcmp(name,"DslModel")==0) return DslModelEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"DslModel")==0) return DslModelEnum;
-              else if (strcmp(name,"DslModelid")==0) return DslModelidEnum;
+              if (strcmp(name,"DslModelid")==0) return DslModelidEnum;
               else if (strcmp(name,"DslNummodels")==0) return DslNummodelsEnum;
               else if (strcmp(name,"DslComputeFingerprints")==0) return DslComputeFingerprintsEnum;
@@ -260 +259 @@
               else if (strcmp(name,"LoveNfreq")==0) return LoveNfreqEnum;
               else if (strcmp(name,"LoveR0")==0) return LoveR0Enum;
+              else if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum;
-              else if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum;
+              if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum;
               else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
               else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
@@ -298 +297 @@
               else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
+              else if (strcmp(name,"MigrationMax")==0) return MigrationMaxEnum;
               else if (strcmp(name,"ModelId")==0) return ModelIdEnum;
               else if (strcmp(name,"Nbins")==0) return NbinsEnum;
@@ -369 +369 @@
               else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum;
               else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
-              else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsCheckpointFrequencyEnum;
+              else if (strcmp(name,"SettingsCheckpointFrequency")==0) return SettingsCheckpointFrequencyEnum;
               else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
               else if (strcmp(name,"SettingsSbCouplingFrequency")==0) return SettingsSbCouplingFrequencyEnum;