Changeset 27347 for issm/trunk/src/c/shared/Enum/EnumToStringx.cpp

Timestamp:

10/27/22 11:39:37 (2 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27344

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (27 diffs)

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

@@ -69 +69 @@
                 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
                 case BarystaticContributionsEnum : return "BarystaticContributions";
-                case BasalforcingsAutoregressionInitialTimeEnum : return "BasalforcingsAutoregressionInitialTime";
-                case BasalforcingsAutoregressionTimestepEnum : return "BasalforcingsAutoregressionTimestep";
-                case BasalforcingsAutoregressiveOrderEnum : return "BasalforcingsAutoregressiveOrder";
-                case BasalforcingsBeta0Enum : return "BasalforcingsBeta0";
-                case BasalforcingsBeta1Enum : return "BasalforcingsBeta1";
+                case BasalforcingsARMATimestepEnum : return "BasalforcingsARMATimestep";
+                case BasalforcingsARMAarOrderEnum : return "BasalforcingsARMAarOrder";
+                case BasalforcingsARMAmaOrderEnum : return "BasalforcingsARMAmaOrder";
                 case BasalforcingsBottomplumedepthEnum : return "BasalforcingsBottomplumedepth";
                 case BasalforcingsCrustthicknessEnum : return "BasalforcingsCrustthickness";
@@ -88 +86 @@
                 case BasalforcingsIsmip6TfDepthsEnum : return "BasalforcingsIsmip6TfDepths";
                 case BasalforcingsLinearNumBasinsEnum : return "BasalforcingsLinearNumBasins";
-                case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat";
+                case BasalforcingsLinearNumBreaksEnum : return "BasalforcingsLinearNumBreaks";
+                case BasalforcingsLinearNumParamsEnum : return "BasalforcingsLinearNumParams";
                 case BasalforcingsMantleconductivityEnum : return "BasalforcingsMantleconductivity";
                 case BasalforcingsNusseltEnum : return "BasalforcingsNusselt";
-                case BasalforcingsPhiEnum : return "BasalforcingsPhi";
+                case BasalforcingsARMAarlagcoefsEnum : return "BasalforcingsARMAarlagcoefs";
+                case BasalforcingsARMAdatebreaksEnum : return "BasalforcingsARMAdatebreaks";
+                case BasalforcingsARMAmalagcoefsEnum : return "BasalforcingsARMAmalagcoefs";
+                case BasalforcingsARMApolyparamsEnum : return "BasalforcingsARMApolyparams";
+                case BasalforcingsIsThermalForcingEnum : return "BasalforcingsIsThermalForcing";
+                case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat";
                 case BasalforcingsPicoAverageOverturningEnum : return "BasalforcingsPicoAverageOverturning";
                 case BasalforcingsPicoAverageSalinityEnum : return "BasalforcingsPicoAverageSalinity";
@@ -125 +129 @@
                 case CalvingYoffsetEnum : return "CalvingYoffset";
                 case CalvingVelLowerboundEnum : return "CalvingVelLowerbound";
+                case CalvingVelMaxEnum : return "CalvingVelMax";
+                case CalvingVelThresholdEnum : return "CalvingVelThreshold";
                 case CalvingVelUpperboundEnum : return "CalvingVelUpperbound";
+                case CalvingRcEnum : return "CalvingRc";
                 case ConfigurationTypeEnum : return "ConfigurationType";
                 case ConstantsGEnum : return "ConstantsG";
@@ -158 +165 @@
                 case DamageStressThresholdEnum : return "DamageStressThreshold";
                 case DamageStressUBoundEnum : return "DamageStressUBound";
+                case DebrisMinThicknessEnum : return "DebrisMinThickness";
+                case DebrisNumRequestedOutputsEnum : return "DebrisNumRequestedOutputs";
+                case DebrisPenaltyFactorEnum : return "DebrisPenaltyFactor";
+                case DebrisRequestedOutputsEnum : return "DebrisRequestedOutputs";
+                case DebrisStabilizationEnum : return "DebrisStabilization";
+                case DebrisRemovalmodelEnum : return "DebrisRemovalmodel";
+                case DebrisDisplacementmodelEnum : return "DebrisDisplacementmodel";
+                case DebrisRemovalSlopeThresholdEnum : return "DebrisRemovalSlopeThreshold";
+                case DebrisRemovalStressThresholdEnum : return "DebrisRemovalStressThreshold";
+                case DebrisPackingFractionEnum : return "DebrisPackingFraction";
                 case DebugProfilingEnum : return "DebugProfiling";
                 case DomainDimensionEnum : return "DomainDimension";
@@ -198 +215 @@
                 case FrictionVoidRatioEnum : return "FrictionVoidRatio";
                 case FrontalForcingsBasinIcefrontAreaEnum : return "FrontalForcingsBasinIcefrontArea";
-                case FrontalForcingsAutoregressionInitialTimeEnum : return "FrontalForcingsAutoregressionInitialTime";
-                case FrontalForcingsAutoregressionTimestepEnum : return "FrontalForcingsAutoregressionTimestep";
-                case FrontalForcingsAutoregressiveOrderEnum : return "FrontalForcingsAutoregressiveOrder";
-                case FrontalForcingsBeta0Enum : return "FrontalForcingsBeta0";
-                case FrontalForcingsBeta1Enum : return "FrontalForcingsBeta1";
+                case FrontalForcingsARMATimestepEnum : return "FrontalForcingsARMATimestep";
+                case FrontalForcingsARMAarOrderEnum : return "FrontalForcingsARMAarOrder";
+                case FrontalForcingsARMAmaOrderEnum : return "FrontalForcingsARMAmaOrder";
+                case FrontalForcingsARMAdatebreaksEnum : return "FrontalForcingsARMAdatebreaks";
+                case FrontalForcingsARMAmonthdatebreaksEnum : return "FrontalForcingsARMAmonthdatebreaks";
+                case FrontalForcingsARMAmonthinterceptsEnum : return "FrontalForcingsARMAmonthintercepts";
+                case FrontalForcingsARMAmonthtrendsEnum : return "FrontalForcingsARMAmonthtrends";
+                case FrontalForcingsARMApolyparamsEnum : return "FrontalForcingsARMApolyparams";
                 case FrontalForcingsNumberofBasinsEnum : return "FrontalForcingsNumberofBasins";
+                case FrontalForcingsNumberofBreaksEnum : return "FrontalForcingsNumberofBreaks";
+                case FrontalForcingsNumberofMonthBreaksEnum : return "FrontalForcingsNumberofMonthBreaks";
+                case FrontalForcingsNumberofParamsEnum : return "FrontalForcingsNumberofParams";
                 case FrontalForcingsParamEnum : return "FrontalForcingsParam";
-                case FrontalForcingsPhiEnum : return "FrontalForcingsPhi";
+                case FrontalForcingsARMAarlagcoefsEnum : return "FrontalForcingsARMAarlagcoefs";
+                case FrontalForcingsARMAmalagcoefsEnum : return "FrontalForcingsARMAmalagcoefs";
                 case GrdModelEnum : return "GrdModel";
                 case GroundinglineFrictionInterpolationEnum : return "GroundinglineFrictionInterpolation";
@@ -301 +325 @@
                 case LoveMinIntegrationStepsEnum : return "LoveMinIntegrationSteps";
                 case LoveMaxIntegrationdrEnum : return "LoveMaxIntegrationdr";
+                case LoveIntegrationSchemeEnum : return "LoveIntegrationScheme";
                 case LoveKernelsEnum : return "LoveKernels";
                 case LoveMu0Enum : return "LoveMu0";
@@ -476 +501 @@
                 case SmbAccurefEnum : return "SmbAccuref";
                 case SmbAdThreshEnum : return "SmbAdThresh";
-                case SmbAutoregressionInitialTimeEnum : return "SmbAutoregressionInitialTime";
-                case SmbAutoregressionTimestepEnum : return "SmbAutoregressionTimestep";
-                case SmbAutoregressiveOrderEnum : return "SmbAutoregressiveOrder";
+                case SmbARMATimestepEnum : return "SmbARMATimestep";
+                case SmbARMAarOrderEnum : return "SmbARMAarOrder";
+                case SmbARMAmaOrderEnum : return "SmbARMAmaOrder";
                 case SmbAveragingEnum : return "SmbAveraging";
-                case SmbBeta0Enum : return "SmbBeta0";
-                case SmbBeta1Enum : return "SmbBeta1";
                 case SmbDesfacEnum : return "SmbDesfac";
                 case SmbDpermilEnum : return "SmbDpermil";
@@ -515 +538 @@
                 case SmbLapseRatesEnum : return "SmbLapseRates";
                 case SmbNumBasinsEnum : return "SmbNumBasins";
+                case SmbNumBreaksEnum : return "SmbNumBreaks";
                 case SmbNumElevationBinsEnum : return "SmbNumElevationBins";
+                case SmbNumParamsEnum : return "SmbNumParams";
                 case SmbNumRequestedOutputsEnum : return "SmbNumRequestedOutputs";
                 case SmbPfacEnum : return "SmbPfac";
-                case SmbPhiEnum : return "SmbPhi";
+                case SmbARMAarlagcoefsEnum : return "SmbARMAarlagcoefs";
+                case SmbARMAdatebreaksEnum : return "SmbARMAdatebreaks";
+                case SmbARMAmalagcoefsEnum : return "SmbARMAmalagcoefs";
+                case SmbARMApolyparamsEnum : return "SmbARMApolyparams";
                 case SmbRdlEnum : return "SmbRdl";
                 case SmbRefElevationEnum : return "SmbRefElevation";
@@ -557 +585 @@
                 case StressbalanceRiftPenaltyThresholdEnum : return "StressbalanceRiftPenaltyThreshold";
                 case StressbalanceShelfDampeningEnum : return "StressbalanceShelfDampening";
+                case ThermalForcingMonthlyEffectsEnum : return "ThermalForcingMonthlyEffects";
                 case ThermalIsdrainicecolumnEnum : return "ThermalIsdrainicecolumn";
                 case ThermalIsdynamicbasalspcEnum : return "ThermalIsdynamicbasalspc";
@@ -589 +618 @@
                 case TransientIsageEnum : return "TransientIsage";
                 case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution";
+                case TransientIsdebrisEnum : return "TransientIsdebris";
                 case TransientIsesaEnum : return "TransientIsesa";
                 case TransientIsgiaEnum : return "TransientIsgia";
@@ -633 +663 @@
                 case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
                 case BasalCrevasseEnum : return "BasalCrevasse";
-                case BasalforcingsDeepwaterMeltingRateAutoregressionEnum : return "BasalforcingsDeepwaterMeltingRateAutoregression";
+                case BasalforcingsDeepwaterMeltingRatearmaEnum : return "BasalforcingsDeepwaterMeltingRatearma";
                 case BasalforcingsDeepwaterMeltingRateNoiseEnum : return "BasalforcingsDeepwaterMeltingRateNoise";
                 case BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum : return "BasalforcingsDeepwaterMeltingRateValuesAutoregression";
+                case BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum : return "BasalforcingsDeepwaterMeltingRateValuesMovingaverage";
                 case BasalforcingsFloatingiceMeltingRateEnum : return "BasalforcingsFloatingiceMeltingRate";
                 case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
@@ -698 +729 @@
                 case DamageDbarOldEnum : return "DamageDbarOld";
                 case DamageFEnum : return "DamageF";
+                case DebrisThicknessEnum : return "DebrisThickness";
                 case DegreeOfChannelizationEnum : return "DegreeOfChannelization";
                 case DepthBelowSurfaceEnum : return "DepthBelowSurface";
@@ -768 +800 @@
                 case FrontalForcingsBasinIdEnum : return "FrontalForcingsBasinId";
                 case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge";
-                case FrontalForcingsThermalForcingEnum : return "FrontalForcingsThermalForcing";
                 case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
                 case NGiaEnum : return "NGia";
@@ -812 +843 @@
                 case HydrologyWaterVxEnum : return "HydrologyWaterVx";
                 case HydrologyWaterVyEnum : return "HydrologyWaterVy";
+                case HydrologyMaskNodeActivationEnum : return "HydrologyMaskNodeActivation";
                 case IceEnum : return "Ice";
                 case IceMaskNodeActivationEnum : return "IceMaskNodeActivation";
@@ -917 +949 @@
                 case SealevelUNorthEsaEnum : return "SealevelUNorthEsa";
                 case SealevelchangeIndicesEnum : return "SealevelchangeIndices";
+                case SealevelchangeConvolutionVerticesEnum : return "SealevelchangeConvolutionVertices";
                 case SealevelchangeAlphaIndexEnum : return "SealevelchangeAlphaIndex";
                 case SealevelchangeAzimuthIndexEnum : return "SealevelchangeAzimuthIndex";
@@ -935 +968 @@
                 case SealevelchangeViscousNEnum : return "SealevelchangeViscousN";
                 case SealevelchangeViscousEEnum : return "SealevelchangeViscousE";
+                case CouplingTransferCountEnum : return "CouplingTransferCount";
                 case SedimentHeadEnum : return "SedimentHead";
                 case SedimentHeadOldEnum : return "SedimentHeadOld";
@@ -956 +990 @@
                 case SmbAdiffiniEnum : return "SmbAdiffini";
                 case SmbAiniEnum : return "SmbAini";
-                case SmbAutoregressionNoiseEnum : return "SmbAutoregressionNoise";
+                case SmbARMANoiseEnum : return "SmbARMANoise";
                 case SmbBasinsIdEnum : return "SmbBasinsId";
                 case SmbBMaxEnum : return "SmbBMax";
@@ -1045 +1079 @@
                 case SmbTzEnum : return "SmbTz";
                 case SmbValuesAutoregressionEnum : return "SmbValuesAutoregression";
+                case SmbValuesMovingaverageEnum : return "SmbValuesMovingaverage";
                 case SmbVEnum : return "SmbV";
                 case SmbVmeanEnum : return "SmbVmean";
@@ -1095 +1130 @@
                 case TemperaturePicardEnum : return "TemperaturePicard";
                 case TemperatureSEMICEnum : return "TemperatureSEMIC";
-                case ThermalforcingAutoregressionNoiseEnum : return "ThermalforcingAutoregressionNoise";
+                case ThermalforcingARMANoiseEnum : return "ThermalforcingARMANoise";
+                case ThermalForcingEnum : return "ThermalForcing";
                 case ThermalforcingValuesAutoregressionEnum : return "ThermalforcingValuesAutoregression";
+                case ThermalforcingValuesMovingaverageEnum : return "ThermalforcingValuesMovingaverage";
                 case ThermalSpctemperatureEnum : return "ThermalSpctemperature";
                 case ThicknessAbsGradientEnum : return "ThicknessAbsGradient";
@@ -1110 +1147 @@
                 case VxAverageEnum : return "VxAverage";
                 case VxBaseEnum : return "VxBase";
+                case VxDebrisEnum : return "VxDebris";
                 case VxEnum : return "Vx";
                 case VxMeshEnum : return "VxMesh";
@@ -1117 +1155 @@
                 case VyAverageEnum : return "VyAverage";
                 case VyBaseEnum : return "VyBase";
+                case VyDebrisEnum : return "VyDebris";
                 case VyEnum : return "Vy";
                 case VyMeshEnum : return "VyMesh";
@@ -1251 +1290 @@
                 case ArrheniusEnum : return "Arrhenius";
                 case AutodiffJacobianEnum : return "AutodiffJacobian";
-                case AutoregressionLinearFloatingMeltRateEnum : return "AutoregressionLinearFloatingMeltRate";
                 case Balancethickness2AnalysisEnum : return "Balancethickness2Analysis";
                 case Balancethickness2SolutionEnum : return "Balancethickness2Solution";
@@ -1278 +1316 @@
                 case CalvingParameterizationEnum : return "CalvingParameterization";
                 case CalvingVonmisesEnum : return "CalvingVonmises";
+                case CalvingPollardEnum : return "CalvingPollard";
                 case CfdragcoeffabsgradEnum : return "Cfdragcoeffabsgrad";
                 case CfsurfacelogvelEnum : return "Cfsurfacelogvel";
@@ -1305 +1344 @@
                 case DataSetParamEnum : return "DataSetParam";
                 case DatasetInputEnum : return "DatasetInput";
+                case DebrisAnalysisEnum : return "DebrisAnalysis";
+                case DebrisSolutionEnum : return "DebrisSolution";
                 case DefaultAnalysisEnum : return "DefaultAnalysis";
                 case DefaultCalvingEnum : return "DefaultCalving";
@@ -1348 +1389 @@
                 case FrontalForcingsDefaultEnum : return "FrontalForcingsDefault";
                 case FrontalForcingsRignotEnum : return "FrontalForcingsRignot";
-                case FrontalForcingsRignotAutoregressionEnum : return "FrontalForcingsRignotAutoregression";
+                case FrontalForcingsRignotarmaEnum : return "FrontalForcingsRignotarma";
                 case FsetEnum : return "Fset";
                 case FullMeltOnPartiallyFloatingEnum : return "FullMeltOnPartiallyFloating";
@@ -1417 +1458 @@
                 case LevelsetfunctionPicardEnum : return "LevelsetfunctionPicard";
                 case LinearFloatingMeltRateEnum : return "LinearFloatingMeltRate";
+                case LinearFloatingMeltRatearmaEnum : return "LinearFloatingMeltRatearma";
                 case LliboutryDuvalEnum : return "LliboutryDuval";
                 case LoadsEnum : return "Loads";
@@ -1526 +1568 @@
                 case SamplingSolutionEnum : return "SamplingSolution";
                 case SIAApproximationEnum : return "SIAApproximation";
-                case SMBautoregressionEnum : return "SMBautoregression";
+                case SMBarmaEnum : return "SMBarma";
                 case SMBcomponentsEnum : return "SMBcomponents";
+                case SMBdebrisMLEnum : return "SMBdebrisML";
                 case SMBd18opddEnum : return "SMBd18opdd";
                 case SMBforcingEnum : return "SMBforcing";