Changeset 27392

Timestamp:

11/15/22 08:34:35 (2 years ago)

Author:

sehrenfe

Message:

CHG: channel conductivity from param to input

Location:

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

Files:

• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (7 diffs)

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

@@ -249 +249 @@
                 case HydrologyAveragingEnum : return "HydrologyAveraging";
                 case HydrologyCavitySpacingEnum : return "HydrologyCavitySpacing";
-                case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity";
                 case HydrologyChannelSheetWidthEnum : return "HydrologyChannelSheetWidth";
                 case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio";
@@ -825 +824 @@
                 case HydrologyBumpHeightEnum : return "HydrologyBumpHeight";
                 case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing";
+                case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity";
                 case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput";
                 case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";

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

@@ -252 +252 @@
               else if (strcmp(name,"HydrologyAveraging")==0) return HydrologyAveragingEnum;
               else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum;
-              else if (strcmp(name,"HydrologyChannelConductivity")==0) return HydrologyChannelConductivityEnum;
               else if (strcmp(name,"HydrologyChannelSheetWidth")==0) return HydrologyChannelSheetWidthEnum;
               else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum;
@@ -260 +259 @@
               else if (strcmp(name,"HydrologyNumRequestedOutputs")==0) return HydrologyNumRequestedOutputsEnum;
               else if (strcmp(name,"HydrologyPressureMeltCoefficient")==0) return HydrologyPressureMeltCoefficientEnum;
+              else if (strcmp(name,"HydrologyRelaxation")==0) return HydrologyRelaxationEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"HydrologyRelaxation")==0) return HydrologyRelaxationEnum;
-              else if (strcmp(name,"HydrologyRequestedOutputs")==0) return HydrologyRequestedOutputsEnum;
+              if (strcmp(name,"HydrologyRequestedOutputs")==0) return HydrologyRequestedOutputsEnum;
               else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
               else if (strcmp(name,"HydrologyStepsPerStep")==0) return HydrologyStepsPerStepEnum;
@@ -383 +382 @@
               else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
               else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
+              else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
-              else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
+              if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
               else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
@@ -506 +505 @@
               else if (strcmp(name,"SolidearthSettingsSelfAttraction")==0) return SolidearthSettingsSelfAttractionEnum;
               else if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum;
+              else if (strcmp(name,"SolidearthSettingsMaxSHCoeff")==0) return SolidearthSettingsMaxSHCoeffEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SolidearthSettingsMaxSHCoeff")==0) return SolidearthSettingsMaxSHCoeffEnum;
-              else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
+              if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
               else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum;
               else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
@@ -629 +628 @@
               else if (strcmp(name,"TimesteppingInterpForcing")==0) return TimesteppingInterpForcingEnum;
               else if (strcmp(name,"TimesteppingCycleForcing")==0) return TimesteppingCycleForcingEnum;
+              else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
-              else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
+              if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
               else if (strcmp(name,"TimesteppingTimeStepMax")==0) return TimesteppingTimeStepMaxEnum;
               else if (strcmp(name,"TimesteppingTimeStepMin")==0) return TimesteppingTimeStepMinEnum;
@@ -752 +751 @@
               else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum;
               else if (strcmp(name,"DamageD")==0) return DamageDEnum;
+              else if (strcmp(name,"DamageDOld")==0) return DamageDOldEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"DamageDOld")==0) return DamageDOldEnum;
-              else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
+              if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
               else if (strcmp(name,"DamageDbarOld")==0) return DamageDbarOldEnum;
               else if (strcmp(name,"DamageF")==0) return DamageFEnum;
@@ -843 +842 @@
               else if (strcmp(name,"HydrologyBumpHeight")==0) return HydrologyBumpHeightEnum;
               else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum;
+              else if (strcmp(name,"HydrologyChannelConductivity")==0) return HydrologyChannelConductivityEnum;
               else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
               else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;