Ignore:
Timestamp:
12/18/19 14:04:15 (5 years ago)
Author:
Eric.Larour
Message:

CHG: took out UpdateStericRate and UpdateDynamicRate methods, not needed anymore.
Using new Inputs approach to speed up the retrieval of steric and dynamic sea-level change rates.
The global mean steric change rate is now a transient input (P0) instead of a transient parameter. This
will allow for future dsl class where we have a multi-model ensemble that dakota can play we at run time!

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r24479 r24481  
    131131              else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
    132132              else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
    133               else if (strcmp(name,"DslGlobalAverageThermostericSeaLevelChange")==0) return DslGlobalAverageThermostericSeaLevelChangeEnum;
    134133              else if (strcmp(name,"DslModel")==0) return DslModelEnum;
    135134              else if (strcmp(name,"EarthId")==0) return EarthIdEnum;
    … …  
    137136              else if (strcmp(name,"EsaHElastic")==0) return EsaHElasticEnum;
    138137              else if (strcmp(name,"EsaHemisphere")==0) return EsaHemisphereEnum;
     138              else if (strcmp(name,"EsaRequestedOutputs")==0) return EsaRequestedOutputsEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"EsaRequestedOutputs")==0) return EsaRequestedOutputsEnum;
    143               else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
     142              if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
    144143              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
    145144              else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
    … …  
    260259              else if (strcmp(name,"MaterialsLithosphereShearModulus")==0) return MaterialsLithosphereShearModulusEnum;
    261260              else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum;
     261              else if (strcmp(name,"MaterialsMantleShearModulus")==0) return MaterialsMantleShearModulusEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MaterialsMantleShearModulus")==0) return MaterialsMantleShearModulusEnum;
    266               else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
     265              if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
    267266              else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
    268267              else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
    … …  
    383382              else if (strcmp(name,"SmbRunoffref")==0) return SmbRunoffrefEnum;
    384383              else if (strcmp(name,"SmbSealev")==0) return SmbSealevEnum;
     384              else if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum;
    389               else if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum;
     388              if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum;
    390389              else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum;
    391390              else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum;
    … …  
    506505              else if (strcmp(name,"CalvingFluxLevelset")==0) return CalvingFluxLevelsetEnum;
    507506              else if (strcmp(name,"CalvingMeltingFluxLevelset")==0) return CalvingMeltingFluxLevelsetEnum;
     507              else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"Converged")==0) return ConvergedEnum;
    512               else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum;
     511              if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum;
    513512              else if (strcmp(name,"DamageD")==0) return DamageDEnum;
    514513              else if (strcmp(name,"DamageDOld")==0) return DamageDOldEnum;
    … …  
    535534              else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum;
    536535              else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
     536              else if (strcmp(name,"DslGlobalAverageThermostericSeaLevelChange")==0) return DslGlobalAverageThermostericSeaLevelChangeEnum;
    537537              else if (strcmp(name,"DslSeaSurfaceHeightChangeAboveGeoid")==0) return DslSeaSurfaceHeightChangeAboveGeoidEnum;
    538538              else if (strcmp(name,"DslStericRate")==0) return DslStericRateEnum;
Note: See TracChangeset for help on using the changeset viewer.