Ignore:
Timestamp:
06/20/18 16:03:35 (7 years ago)
Author:
schlegel
Message:

CHG: add options for del018 pdd to take in reconstructed climate

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r22798 r22852  
    293293              else if (strcmp(name,"SmbIsshortwave")==0) return SmbIsshortwaveEnum;
    294294              else if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum;
     295              else if (strcmp(name,"SmbIsprecipscaled")==0) return SmbIsprecipscaledEnum;
    295296              else if (strcmp(name,"SmbIsthermal")==0) return SmbIsthermalEnum;
    296297              else if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum;
    … …  
    382383              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
    383384              else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
    384               else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
     388              if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
     389              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
    389390              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    390391              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
    … …  
    505506              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    506507              else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
    507               else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
     511              if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
     512              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    512513              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
    513514              else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum;
    … …  
    551552              else if (strcmp(name,"SmbPrecipitationsLgm")==0) return SmbPrecipitationsLgmEnum;
    552553              else if (strcmp(name,"SmbPrecipitationsPresentday")==0) return SmbPrecipitationsPresentdayEnum;
     554              else if (strcmp(name,"SmbPrecipitationsReconstructed")==0) return SmbPrecipitationsReconstructedEnum;
    553555              else if (strcmp(name,"SmbRe")==0) return SmbReEnum;
    554556              else if (strcmp(name,"SmbRefreeze")==0) return SmbRefreezeEnum;
    … …  
    562564              else if (strcmp(name,"SmbTemperaturesLgm")==0) return SmbTemperaturesLgmEnum;
    563565              else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum;
     566              else if (strcmp(name,"SmbTemperaturesReconstructed")==0) return SmbTemperaturesReconstructedEnum;
    564567              else if (strcmp(name,"SmbT")==0) return SmbTEnum;
    565568              else if (strcmp(name,"SmbTeValue")==0) return SmbTeValueEnum;
    … …  
    626629              else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
    627630              else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
    628               else if (strcmp(name,"WaterfractionDrainage")==0) return WaterfractionDrainageEnum;
    629               else if (strcmp(name,"WaterfractionDrainageIntegrated")==0) return WaterfractionDrainageIntegratedEnum;
    630               else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"Waterheight")==0) return WaterheightEnum;
     634              if (strcmp(name,"WaterfractionDrainage")==0) return WaterfractionDrainageEnum;
     635              else if (strcmp(name,"WaterfractionDrainageIntegrated")==0) return WaterfractionDrainageIntegratedEnum;
     636              else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
     637              else if (strcmp(name,"Waterheight")==0) return WaterheightEnum;
    635638              else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
    636639              else if (strcmp(name,"InputsEND")==0) return InputsENDEnum;
    … …  
    749752              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
    750753              else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
    751               else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    752               else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
    753               else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
     757              if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
     758              else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
     759              else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
     760              else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
    758761              else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
    759762              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
    … …  
    872875              else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    873876              else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
    874               else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
    875               else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    876               else if (strcmp(name,"Melange")==0) return MelangeEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
     880              if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
     881              else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
     882              else if (strcmp(name,"Melange")==0) return MelangeEnum;
     883              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
    881884              else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    882885              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    … …  
    995998              else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
    996999              else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
    997               else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
    998               else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
    999               else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
     1003              if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
     1004              else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
     1005              else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
     1006              else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
    10041007              else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
    10051008              else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
    … …  
    11181121              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    11191122              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
    1120               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
    1121               else if (strcmp(name,"Tria")==0) return TriaEnum;
    1122               else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
     1126              if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
     1127              else if (strcmp(name,"Tria")==0) return TriaEnum;
     1128              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
     1129              else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
    11271130              else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
    11281131              else if (strcmp(name,"Vertex")==0) return VertexEnum;
Note: See TracChangeset for help on using the changeset viewer.