Changeset 22598

Timestamp:

03/21/18 20:53:16 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving an enum to the parameter set

Location:

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

Files:

• EnumDefinitions.h (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (8 diffs)

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

@@ -236 +236 @@
         SealevelriseUElasticEnum,
         SettingsIoGatherEnum,
+        SettingsLowmemEnum,
         SettingsOutputFrequencyEnum,
         SettingsRecordingFrequencyEnum,
@@ -925 +926 @@
         SeparateEnum,
         SeqEnum,
-        SettingsLowmemEnum,
         SIAApproximationEnum,
         SigmaVMEnum,

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

@@ -244 +244 @@
                 case SealevelriseUElasticEnum : return "SealevelriseUElastic";
                 case SettingsIoGatherEnum : return "SettingsIoGather";
+                case SettingsLowmemEnum : return "SettingsLowmem";
                 case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency";
                 case SettingsRecordingFrequencyEnum : return "SettingsRecordingFrequency";
@@ -929 +930 @@
                 case SeparateEnum : return "Separate";
                 case SeqEnum : return "Seq";
-                case SettingsLowmemEnum : return "SettingsLowmem";
                 case SIAApproximationEnum : return "SIAApproximation";
                 case SigmaVMEnum : return "SigmaVM";

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

@@ -247 +247 @@
               else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum;
               else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
+              else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
               else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
               else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsRecordingFrequencyEnum;
@@ -259 +260 @@
               else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
               else if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum;
-              else if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"SmbDt")==0) return SmbDtEnum;
+              if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum;
+              else if (strcmp(name,"SmbDt")==0) return SmbDtEnum;
               else if (strcmp(name,"Smb")==0) return SmbEnum;
               else if (strcmp(name,"SmbF")==0) return SmbFEnum;
@@ -382 +383 @@
               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
               else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
-              else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Converged")==0) return ConvergedEnum;
+              if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;
+              else if (strcmp(name,"Converged")==0) return ConvergedEnum;
               else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum;
               else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
               else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
-              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
+              if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
+              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
               else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
               else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
@@ -628 +629 @@
               else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
               else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
-              else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
+              if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
+              else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
               else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum;
               else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
@@ -751 +752 @@
               else if (strcmp(name,"Gset")==0) return GsetEnum;
               else if (strcmp(name,"Gsl")==0) return GslEnum;
-              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
+              if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
+              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
               else if (strcmp(name,"Hook")==0) return HookEnum;
               else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
@@ -874 +875 @@
               else if (strcmp(name,"MINI")==0) return MINIEnum;
               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
-              else if (strcmp(name,"MinVx")==0) return MinVxEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"MinVy")==0) return MinVyEnum;
+              if (strcmp(name,"MinVx")==0) return MinVxEnum;
+              else if (strcmp(name,"MinVy")==0) return MinVyEnum;
               else if (strcmp(name,"MinVz")==0) return MinVzEnum;
               else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum;
@@ -950 +951 @@
               else if (strcmp(name,"Separate")==0) return SeparateEnum;
               else if (strcmp(name,"Seq")==0) return SeqEnum;
-              else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
               else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
               else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum;