Changeset 26118

Timestamp:

03/19/21 11:58:40 (4 years ago)

Author:

Eric.Larour

Message:

CHG: moving some enums from inputs to params.

Location:

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

Files:

• Enum.vim (modified) (2 diffs)
• EnumDefinitions.h (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (10 diffs)

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

@@ -63 +63 @@
 syn keyword cConstant AutodiffXpEnum
 syn keyword cConstant BalancethicknessStabilizationEnum
+syn keyword cConstant BarystaticContributionsEnum
 syn keyword cConstant BasalforcingsBottomplumedepthEnum
 syn keyword cConstant BasalforcingsCrustthicknessEnum
@@ -1072 +1073 @@
 syn keyword cConstant BasalforcingsIsmip6Enum
 syn keyword cConstant BasalforcingsPicoEnum
-syn keyword cConstant BarystaticContributionsEnum
 syn keyword cConstant BeckmannGoosseFloatingMeltRateEnum
 syn keyword cConstant BedSlopeSolutionEnum

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

@@ -57 +57 @@
         AutodiffXpEnum,
         BalancethicknessStabilizationEnum,
+        BarystaticContributionsEnum,
         BasalforcingsBottomplumedepthEnum,
         BasalforcingsCrustthicknessEnum,
@@ -1071 +1072 @@
         BasalforcingsIsmip6Enum,
         BasalforcingsPicoEnum,
-        BarystaticContributionsEnum,
         BeckmannGoosseFloatingMeltRateEnum,
         BedSlopeSolutionEnum,

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

@@ -65 +65 @@
                 case AutodiffXpEnum : return "AutodiffXp";
                 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
+                case BarystaticContributionsEnum : return "BarystaticContributions";
                 case BasalforcingsBottomplumedepthEnum : return "BasalforcingsBottomplumedepth";
                 case BasalforcingsCrustthicknessEnum : return "BasalforcingsCrustthickness";
@@ -1074 +1075 @@
                 case BasalforcingsIsmip6Enum : return "BasalforcingsIsmip6";
                 case BasalforcingsPicoEnum : return "BasalforcingsPico";
-                case BarystaticContributionsEnum : return "BarystaticContributions";
                 case BeckmannGoosseFloatingMeltRateEnum : return "BeckmannGoosseFloatingMeltRate";
                 case BedSlopeSolutionEnum : return "BedSlopeSolution";

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

@@ -65 +65 @@
               else if (strcmp(name,"AutodiffXp")==0) return AutodiffXpEnum;
               else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
+              else if (strcmp(name,"BarystaticContributions")==0) return BarystaticContributionsEnum;
               else if (strcmp(name,"BasalforcingsBottomplumedepth")==0) return BasalforcingsBottomplumedepthEnum;
               else if (strcmp(name,"BasalforcingsCrustthickness")==0) return BasalforcingsCrustthicknessEnum;
@@ -136 +137 @@
               else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum;
               else if (strcmp(name,"DamageStressUBound")==0) return DamageStressUBoundEnum;
-              else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
+              if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
+              else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
               else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
               else if (strcmp(name,"DslModel")==0) return DslModelEnum;
@@ -259 +260 @@
               else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
               else if (strcmp(name,"LoveAllowLayerDeletion")==0) return LoveAllowLayerDeletionEnum;
-              else if (strcmp(name,"LoveForcingType")==0) return LoveForcingTypeEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"LoveFrequencies")==0) return LoveFrequenciesEnum;
+              if (strcmp(name,"LoveForcingType")==0) return LoveForcingTypeEnum;
+              else if (strcmp(name,"LoveFrequencies")==0) return LoveFrequenciesEnum;
               else if (strcmp(name,"LoveG0")==0) return LoveG0Enum;
               else if (strcmp(name,"LoveKernels")==0) return LoveKernelsEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SealevelchangeRequestedOutputs")==0) return SealevelchangeRequestedOutputsEnum;
               else if (strcmp(name,"SolidearthSettingsRigid")==0) return SolidearthSettingsRigidEnum;
-              else if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SealevelchangeRunCount")==0) return SealevelchangeRunCountEnum;
+              if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum;
+              else if (strcmp(name,"SealevelchangeRunCount")==0) return SealevelchangeRunCountEnum;
               else if (strcmp(name,"SealevelchangeTransitions")==0) return SealevelchangeTransitionsEnum;
               else if (strcmp(name,"SealevelchangeUElastic")==0) return SealevelchangeUElasticEnum;
@@ -505 +506 @@
               else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum;
               else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
-              else if (strcmp(name,"TransientIsoceantransport")==0) return TransientIsoceantransportEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
+              if (strcmp(name,"TransientIsoceantransport")==0) return TransientIsoceantransportEnum;
+              else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
               else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
               else if (strcmp(name,"TransientIssampling")==0) return TransientIssamplingEnum;
@@ -628 +629 @@
               else if (strcmp(name,"EplHeadSubstep")==0) return EplHeadSubstepEnum;
               else if (strcmp(name,"EplHeadTransient")==0) return EplHeadTransientEnum;
-              else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
+              if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
+              else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
               else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
               else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
@@ -751 +752 @@
               else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
               else if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
-              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Sample")==0) return SampleEnum;
+              if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
+              else if (strcmp(name,"Sample")==0) return SampleEnum;
               else if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum;
               else if (strcmp(name,"SamplingKappa")==0) return SamplingKappaEnum;
@@ -874 +875 @@
               else if (strcmp(name,"SmbSmbCorr")==0) return SmbSmbCorrEnum;
               else if (strcmp(name,"SmbSmbref")==0) return SmbSmbrefEnum;
-              else if (strcmp(name,"SmbSzaValue")==0) return SmbSzaValueEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"SmbT")==0) return SmbTEnum;
+              if (strcmp(name,"SmbSzaValue")==0) return SmbSzaValueEnum;
+              else if (strcmp(name,"SmbT")==0) return SmbTEnum;
               else if (strcmp(name,"SmbTa")==0) return SmbTaEnum;
               else if (strcmp(name,"SmbTeValue")==0) return SmbTeValueEnum;
@@ -997 +998 @@
               else if (strcmp(name,"Outputdefinition31")==0) return Outputdefinition31Enum;
               else if (strcmp(name,"Outputdefinition32")==0) return Outputdefinition32Enum;
-              else if (strcmp(name,"Outputdefinition33")==0) return Outputdefinition33Enum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"Outputdefinition34")==0) return Outputdefinition34Enum;
+              if (strcmp(name,"Outputdefinition33")==0) return Outputdefinition33Enum;
+              else if (strcmp(name,"Outputdefinition34")==0) return Outputdefinition34Enum;
               else if (strcmp(name,"Outputdefinition35")==0) return Outputdefinition35Enum;
               else if (strcmp(name,"Outputdefinition36")==0) return Outputdefinition36Enum;
@@ -1098 +1099 @@
               else if (strcmp(name,"BasalforcingsIsmip6")==0) return BasalforcingsIsmip6Enum;
               else if (strcmp(name,"BasalforcingsPico")==0) return BasalforcingsPicoEnum;
-              else if (strcmp(name,"BarystaticContributions")==0) return BarystaticContributionsEnum;
               else if (strcmp(name,"BeckmannGoosseFloatingMeltRate")==0) return BeckmannGoosseFloatingMeltRateEnum;
               else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;