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

Timestamp:

01/25/21 16:35:15 (4 years ago)

Author:

Eric.Larour

Message:

CHG: created external forcings for solid earth. Completely reorganized the sealevel change
core (in particular now we have a clean split between the external forcings, the grd core
and the dynamic steric core). Also, we reorganized and renamed the grd components and cores.
From eutatic, we now have: barystatic core, sal core, deformation core. No more diagnostics.
We also allow the external forcings to be mmes. Lots of cosmetic name changes (rise->change
for ex.).

File:

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

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

@@ -140 +140 @@
                 case DslModelidEnum : return "DslModelid";
                 case DslNummodelsEnum : return "DslNummodels";
+                case SolidearthIsExternalEnum : return "SolidearthIsExternal";
+                case SolidearthExternalNatureEnum : return "SolidearthExternalNature";
+                case SolidearthExternalModelidEnum : return "SolidearthExternalModelid";
+                case SolidearthExternalNummodelsEnum : return "SolidearthExternalNummodels";
                 case DslComputeFingerprintsEnum : return "DslComputeFingerprints";
                 case EarthIdEnum : return "EarthId";
@@ -340 +344 @@
                 case RotationalAngularVelocityEnum : return "RotationalAngularVelocity";
                 case SolidearthSettingsElasticEnum : return "SolidearthSettingsElastic";
-                case SealevelriseGeometryDoneEnum : return "SealevelriseGeometryDone";
+                case SealevelchangeGeometryDoneEnum : return "SealevelchangeGeometryDone";
                 case RotationalEquatorialMoiEnum : return "RotationalEquatorialMoi";
                 case TidalLoveHEnum : return "TidalLoveH";
@@ -349 +353 @@
                 case LoadLoveKEnum : return "LoadLoveK";
                 case LoadLoveLEnum : return "LoadLoveL";
-                case SealevelriseGRigidEnum : return "SealevelriseGRigid";
-                case SealevelriseGElasticEnum : return "SealevelriseGElastic";
+                case SealevelchangeGRigidEnum : return "SealevelchangeGRigid";
+                case SealevelchangeGElasticEnum : return "SealevelchangeGElastic";
                 case SolidearthSettingsComputesealevelchangeEnum : return "SolidearthSettingsComputesealevelchange";
                 case SolidearthSettingsGRDEnum : return "SolidearthSettingsGRD";
                 case SolidearthSettingsGlfractionEnum : return "SolidearthSettingsGlfraction";
                 case SolidearthSettingsRunFrequencyEnum : return "SolidearthSettingsRunFrequency";
-                case SealevelriseHElasticEnum : return "SealevelriseHElastic";
+                case SealevelchangeHElasticEnum : return "SealevelchangeHElastic";
                 case SolidearthSettingsHorizEnum : return "SolidearthSettingsHoriz";
                 case SolidearthSettingsMaxiterEnum : return "SolidearthSettingsMaxiter";
@@ -361 +365 @@
                 case RotationalPolarMoiEnum : return "RotationalPolarMoi";
                 case SolidearthSettingsReltolEnum : return "SolidearthSettingsReltol";
-                case SealevelriseRequestedOutputsEnum : return "SealevelriseRequestedOutputs";
+                case SealevelchangeRequestedOutputsEnum : return "SealevelchangeRequestedOutputs";
                 case SolidearthSettingsRigidEnum : return "SolidearthSettingsRigid";
                 case SolidearthSettingsRotationEnum : return "SolidearthSettingsRotation";
-                case SealevelriseRunCountEnum : return "SealevelriseRunCount";
-                case SealevelriseTransitionsEnum : return "SealevelriseTransitions";
-                case SealevelriseUElasticEnum : return "SealevelriseUElastic";
+                case SealevelchangeRunCountEnum : return "SealevelchangeRunCount";
+                case SealevelchangeTransitionsEnum : return "SealevelchangeTransitions";
+                case SealevelchangeUElasticEnum : return "SealevelchangeUElastic";
                 case SettingsIoGatherEnum : return "SettingsIoGather";
                 case SettingsNumResultsOnNodesEnum : return "SettingsNumResultsOnNodes";
@@ -534 +538 @@
                 case BaseSlopeYEnum : return "BaseSlopeY";
                 case BedEnum : return "Bed";
+                case BedEastEnum : return "BedEast";
+                case BedNorthEnum : return "BedNorth";
                 case BedSlopeXEnum : return "BedSlopeX";
                 case BedSlopeYEnum : return "BedSlopeY";
@@ -712 +718 @@
                 case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";
                 case SealevelEnum : return "Sealevel";
-                case SealevelEustaticMaskEnum : return "SealevelEustaticMask";
-                case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask";
+                case SealevelBarystaticMaskEnum : return "SealevelBarystaticMask";
+                case SealevelBarystaticOceanMaskEnum : return "SealevelBarystaticOceanMask";
                 case SealevelNEsaEnum : return "SealevelNEsa";
                 case SealevelNEsaRateEnum : return "SealevelNEsaRate";
@@ -722 +728 @@
                 case BslrRateEnum : return "BslrRate";
                 case GmtslrEnum : return "Gmtslr";
-                case SealevelRSLEustaticEnum : return "SealevelRSLEustatic";
-                case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate";
+                case SealevelRSLBarystaticEnum : return "SealevelRSLBarystatic";
                 case SealevelRSLRateEnum : return "SealevelRSLRate";
                 case SealevelUEastEsaEnum : return "SealevelUEastEsa";
@@ -729 +734 @@
                 case SealevelUEsaRateEnum : return "SealevelUEsaRate";
                 case SealevelUNorthEsaEnum : return "SealevelUNorthEsa";
-                case SealevelriseCumDeltathicknessEnum : return "SealevelriseCumDeltathickness";
-                case SealevelriseCumDeltathicknessOldEnum : return "SealevelriseCumDeltathicknessOld";
+                case SealevelchangeCumDeltathicknessEnum : return "SealevelchangeCumDeltathickness";
+                case SealevelchangeCumDeltathicknessOldEnum : return "SealevelchangeCumDeltathicknessOld";
                 case SurfaceloadOtherEnum : return "SurfaceloadOther";
                 case SurfaceloadIceThicknessChangeEnum : return "SurfaceloadIceThicknessChange";
                 case SurfaceloadWaterHeightChangeEnum : return "SurfaceloadWaterHeightChange";
-                case SealevelriseIndicesEnum : return "SealevelriseIndices";
-                case SealevelriseGEnum : return "SealevelriseG";
-                case SealevelriseGUEnum : return "SealevelriseGU";
-                case SealevelriseGEEnum : return "SealevelriseGE";
-                case SealevelriseGNEnum : return "SealevelriseGN";
+                case SealevelchangeIndicesEnum : return "SealevelchangeIndices";
+                case SealevelchangeGEnum : return "SealevelchangeG";
+                case SealevelchangeGUEnum : return "SealevelchangeGU";
+                case SealevelchangeGEEnum : return "SealevelchangeGE";
+                case SealevelchangeGNEnum : return "SealevelchangeGN";
                 case SedimentHeadEnum : return "SedimentHead";
                 case SedimentHeadOldEnum : return "SedimentHeadOld";
@@ -846 +851 @@
                 case SmbZTopEnum : return "SmbZTop";
                 case SmbZYEnum : return "SmbZY";
+                case SolidearthExternalDisplacementEastRateEnum : return "SolidearthExternalDisplacementEastRate";
+                case SolidearthExternalDisplacementNorthRateEnum : return "SolidearthExternalDisplacementNorthRate";
+                case SolidearthExternalDisplacementUpRateEnum : return "SolidearthExternalDisplacementUpRate";
+                case SolidearthExternalGeoidRateEnum : return "SolidearthExternalGeoidRate";
+                case SolidearthExternalBarystaticSeaLevelRateEnum : return "SolidearthExternalBarystaticSeaLevelRate";
                 case StrainRateeffectiveEnum : return "StrainRateeffective";
                 case StrainRateparallelEnum : return "StrainRateparallel";
@@ -1305 +1315 @@
                 case SealevelNmotionEnum : return "SealevelNmotion";
                 case SealevelUmotionEnum : return "SealevelUmotion";
-                case SealevelriseAnalysisEnum : return "SealevelriseAnalysis";
-                case SealevelriseSolutionEnum : return "SealevelriseSolution";
+                case SealevelchangeAnalysisEnum : return "SealevelchangeAnalysis";
+                case SealevelchangeSolutionEnum : return "SealevelchangeSolution";
                 case SegEnum : return "Seg";
                 case SegInputEnum : return "SegInput";