Ignore:
Timestamp:
04/09/22 06:47:21 (3 years ago)
Author:
vverjans
Message:

CHG: changed use of lapse rate coefficients in SMBautoregression

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r26859 r26947  
    476476              else if (strcmp(name,"SmbDpermil")==0) return SmbDpermilEnum;
    477477              else if (strcmp(name,"SmbDsnowIdx")==0) return SmbDsnowIdxEnum;
     478              else if (strcmp(name,"SmbElevationBins")==0) return SmbElevationBinsEnum;
    478479              else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
    479480              else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
    … …  
    503504              else if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum;
    504505              else if (strcmp(name,"SmbK")==0) return SmbKEnum;
    505               else if (strcmp(name,"SmbLapseRateNeg")==0) return SmbLapseRateNegEnum;
    506               else if (strcmp(name,"SmbLapseRatePos")==0) return SmbLapseRatePosEnum;
     506              else if (strcmp(name,"SmbLapseRates")==0) return SmbLapseRatesEnum;
    507507              else if (strcmp(name,"SmbNumBasins")==0) return SmbNumBasinsEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SmbNumRequestedOutputs")==0) return SmbNumRequestedOutputsEnum;
     511              if (strcmp(name,"SmbNumElevationBins")==0) return SmbNumElevationBinsEnum;
     512              else if (strcmp(name,"SmbNumRequestedOutputs")==0) return SmbNumRequestedOutputsEnum;
    512513              else if (strcmp(name,"SmbPfac")==0) return SmbPfacEnum;
    513514              else if (strcmp(name,"SmbPhi")==0) return SmbPhiEnum;
    … …  
    628629              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    629630              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
    630               else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum;
     634              if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum;
     635              else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum;
    635636              else if (strcmp(name,"BasalforcingsSpatialDeepwaterElevation")==0) return BasalforcingsSpatialDeepwaterElevationEnum;
    636637              else if (strcmp(name,"BasalforcingsSpatialDeepwaterMeltingRate")==0) return BasalforcingsSpatialDeepwaterMeltingRateEnum;
    … …  
    751752              else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
    752753              else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum;
    753               else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum;
     757              if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
     758              else if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum;
    758759              else if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum;
    759760              else if (strcmp(name,"FrictionWaterLayer")==0) return FrictionWaterLayerEnum;
    … …  
    874875              else if (strcmp(name,"SealevelBarystaticIceWeights")==0) return SealevelBarystaticIceWeightsEnum;
    875876              else if (strcmp(name,"SealevelBarystaticIceArea")==0) return SealevelBarystaticIceAreaEnum;
    876               else if (strcmp(name,"SealevelBarystaticIceLatbar")==0) return SealevelBarystaticIceLatbarEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"SealevelBarystaticIceLongbar")==0) return SealevelBarystaticIceLongbarEnum;
     880              if (strcmp(name,"SealevelBarystaticIceLatbar")==0) return SealevelBarystaticIceLatbarEnum;
     881              else if (strcmp(name,"SealevelBarystaticIceLongbar")==0) return SealevelBarystaticIceLongbarEnum;
    881882              else if (strcmp(name,"SealevelBarystaticIceLoad")==0) return SealevelBarystaticIceLoadEnum;
    882883              else if (strcmp(name,"SealevelBarystaticHydroMask")==0) return SealevelBarystaticHydroMaskEnum;
    … …  
    997998              else if (strcmp(name,"SmbGdnini")==0) return SmbGdniniEnum;
    998999              else if (strcmp(name,"SmbGsp")==0) return SmbGspEnum;
    999               else if (strcmp(name,"SmbGspini")==0) return SmbGspiniEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"SmbHref")==0) return SmbHrefEnum;
     1003              if (strcmp(name,"SmbGspini")==0) return SmbGspiniEnum;
     1004              else if (strcmp(name,"SmbHref")==0) return SmbHrefEnum;
    10041005              else if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum;
    10051006              else if (strcmp(name,"SmbMAdd")==0) return SmbMAddEnum;
    … …  
    11121113              else if (strcmp(name,"TransientAccumulatedDeltaIceThickness")==0) return TransientAccumulatedDeltaIceThicknessEnum;
    11131114              else if (strcmp(name,"Vel")==0) return VelEnum;
     1115              else if (strcmp(name,"VVmismipglposinput")==0) return VVmismipglposinputEnum;
    11141116              else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
    11151117              else if (strcmp(name,"VxBase")==0) return VxBaseEnum;
    … …  
    11191121              else if (strcmp(name,"VxShear")==0) return VxShearEnum;
    11201122              else if (strcmp(name,"VxSurface")==0) return VxSurfaceEnum;
    1121               else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    1122               else if (strcmp(name,"VyBase")==0) return VyBaseEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Vy")==0) return VyEnum;
     1126              if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
     1127              else if (strcmp(name,"VyBase")==0) return VyBaseEnum;
     1128              else if (strcmp(name,"Vy")==0) return VyEnum;
    11271129              else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    11281130              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    … …  
    12421244              else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
    12431245              else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
    1244               else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
    1245               else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;
     1249              if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
     1250              else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
     1251              else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;
    12501252              else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum;
    12511253              else if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum;
    … …  
    13651367              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    13661368              else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
    1367               else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
    1368               else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
     1372              if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
     1373              else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
     1374              else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
    13731375              else if (strcmp(name,"GenericExternalResult")==0) return GenericExternalResultEnum;
    13741376              else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
    … …  
    14881490              else if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum;
    14891491              else if (strcmp(name,"Nodal")==0) return NodalEnum;
    1490               else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
    1491               else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
    14921492         else stage=13;
    14931493   }
    14941494   if(stage==13){
    1495               if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
     1495              if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
     1496              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
     1497              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
    14961498              else if (strcmp(name,"None")==0) return NoneEnum;
    14971499              else if (strcmp(name,"Numberedcostfunction")==0) return NumberedcostfunctionEnum;
    … …  
    16111613              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
    16121614              else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
    1613               else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
    1614               else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    16151615         else stage=14;
    16161616   }
    16171617   if(stage==14){
    1618               if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
     1618              if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
     1619              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
     1620              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
    16191621              else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
    16201622              else if (strcmp(name,"Tria")==0) return TriaEnum;
Note: See TracChangeset for help on using the changeset viewer.