Changeset 26002


Ignore:
Timestamp:
02/19/21 18:58:08 (4 years ago)
Author:
bulthuis
Message:

CGH: add new enums for sampling capacity

Location:
issm/trunk-jpl/src/c/shared/Enum
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/shared/Enum/Enum.vim

    r25997 r26002  
    332332syn keyword cConstant RootPathEnum
    333333syn keyword cConstant ModelnameEnum
     334syn keyword cConstant SamplingAlphaEnum
     335syn keyword cConstant SamplingPhiEnum
     336syn keyword cConstant SamplingNumRequestedOutputsEnum
     337syn keyword cConstant SamplingRequestedOutputsEnum
     338syn keyword cConstant SamplingRobinEnum
     339syn keyword cConstant SamplingSeedEnum
     340syn keyword cConstant SamplingTauEnum
    334341syn keyword cConstant SaveResultsEnum
    335342syn keyword cConstant SolidearthPartitionIceEnum
     
    488495syn keyword cConstant TransientIsmovingfrontEnum
    489496syn keyword cConstant TransientIsoceancouplingEnum
     497syn keyword cConstant TransientIssamplingEnum
    490498syn keyword cConstant TransientIsslcEnum
    491499syn keyword cConstant TransientIssmbEnum
     
    715723syn keyword cConstant RheologyBInitialguessMisfitEnum
    716724syn keyword cConstant RheologyBbarAbsGradientEnum
     725syn keyword cConstant SampleEnum
     726syn keyword cConstant SamplingBetaEnum
     727syn keyword cConstant SamplingKappaEnum
    717728syn keyword cConstant SealevelEnum
    718729syn keyword cConstant SealevelBarystaticMaskEnum
     
    15621573syn keyword cType MasstransportAnalysis
    15631574syn keyword cType MeltingAnalysis
     1575syn keyword cType SamplingAnalysis
    15641576syn keyword cType SealevelchangeAnalysis
    15651577syn keyword cType SmbAnalysis
  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r25997 r26002  
    326326        RootPathEnum,
    327327        ModelnameEnum,
     328        SamplingAlphaEnum,
     329        SamplingPhiEnum,
     330        SamplingNumRequestedOutputsEnum,
     331        SamplingRequestedOutputsEnum,
     332        SamplingRobinEnum,
     333        SamplingSeedEnum,
     334        SamplingTauEnum,
    328335        SaveResultsEnum,
    329336        SolidearthPartitionIceEnum,
     
    482489        TransientIsmovingfrontEnum,
    483490        TransientIsoceancouplingEnum,
     491        TransientIssamplingEnum,
    484492        TransientIsslcEnum,
    485493        TransientIssmbEnum,
     
    711719        RheologyBInitialguessMisfitEnum,
    712720        RheologyBbarAbsGradientEnum,
     721        SampleEnum,
     722        SamplingBetaEnum,
     723        SamplingKappaEnum,
    713724        SealevelEnum,
    714725        SealevelBarystaticMaskEnum,
  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r25997 r26002  
    334334                case RootPathEnum : return "RootPath";
    335335                case ModelnameEnum : return "Modelname";
     336                case SamplingAlphaEnum : return "SamplingAlpha";
     337                case SamplingPhiEnum : return "SamplingPhi";
     338                case SamplingNumRequestedOutputsEnum : return "SamplingNumRequestedOutputs";
     339                case SamplingRequestedOutputsEnum : return "SamplingRequestedOutputs";
     340                case SamplingRobinEnum : return "SamplingRobin";
     341                case SamplingSeedEnum : return "SamplingSeed";
     342                case SamplingTauEnum : return "SamplingTau";
    336343                case SaveResultsEnum : return "SaveResults";
    337344                case SolidearthPartitionIceEnum : return "SolidearthPartitionIce";
     
    490497                case TransientIsmovingfrontEnum : return "TransientIsmovingfront";
    491498                case TransientIsoceancouplingEnum : return "TransientIsoceancoupling";
     499                case TransientIssamplingEnum : return "TransientIssampling";
    492500                case TransientIsslcEnum : return "TransientIsslc";
    493501                case TransientIssmbEnum : return "TransientIssmb";
     
    717725                case RheologyBInitialguessMisfitEnum : return "RheologyBInitialguessMisfit";
    718726                case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";
     727                case SampleEnum : return "Sample";
     728                case SamplingBetaEnum : return "SamplingBeta";
     729                case SamplingKappaEnum : return "SamplingKappa";
    719730                case SealevelEnum : return "Sealevel";
    720731                case SealevelBarystaticMaskEnum : return "SealevelBarystaticMask";
  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r25997 r26002  
    340340              else if (strcmp(name,"RootPath")==0) return RootPathEnum;
    341341              else if (strcmp(name,"Modelname")==0) return ModelnameEnum;
     342              else if (strcmp(name,"SamplingAlpha")==0) return SamplingAlphaEnum;
     343              else if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum;
     344              else if (strcmp(name,"SamplingNumRequestedOutputs")==0) return SamplingNumRequestedOutputsEnum;
     345              else if (strcmp(name,"SamplingRequestedOutputs")==0) return SamplingRequestedOutputsEnum;
     346              else if (strcmp(name,"SamplingRobin")==0) return SamplingRobinEnum;
     347              else if (strcmp(name,"SamplingSeed")==0) return SamplingSeedEnum;
     348              else if (strcmp(name,"SamplingTau")==0) return SamplingTauEnum;
    342349              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    343350              else if (strcmp(name,"SolidearthPartitionIce")==0) return SolidearthPartitionIceEnum;
     
    376383              else if (strcmp(name,"SealevelchangeRunCount")==0) return SealevelchangeRunCountEnum;
    377384              else if (strcmp(name,"SealevelchangeTransitions")==0) return SealevelchangeTransitionsEnum;
    378               else if (strcmp(name,"SealevelchangeUElastic")==0) return SealevelchangeUElasticEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"SealevelchangeUElastic")==0) return SealevelchangeUElasticEnum;
    379389              else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    380390              else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum;
     
    383393              else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
    384394              else if (strcmp(name,"SettingsSbCouplingFrequency")==0) return SettingsSbCouplingFrequencyEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum;
     395              else if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum;
    389396              else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
    390397              else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum;
     
    499506              else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
    500507              else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"TransientIssampling")==0) return TransientIssamplingEnum;
    501512              else if (strcmp(name,"TransientIsslc")==0) return TransientIsslcEnum;
    502513              else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum;
     
    506517              else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
    507518              else if (strcmp(name,"Velocity")==0) return VelocityEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
     519              else if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
    512520              else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum;
    513521              else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum;
     
    621629              else if (strcmp(name,"EsaXmotion")==0) return EsaXmotionEnum;
    622630              else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum;
    623               else if (strcmp(name,"EtaDiff")==0) return EtaDiffEnum;
     631         else stage=6;
     632   }
     633   if(stage==6){
     634              if (strcmp(name,"EtaDiff")==0) return EtaDiffEnum;
    624635              else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
    625636              else if (strcmp(name,"FrictionAs")==0) return FrictionAsEnum;
     
    629640              else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum;
    630641              else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum;
    631          else stage=6;
    632    }
    633    if(stage==6){
    634               if (strcmp(name,"FrictionM")==0) return FrictionMEnum;
     642              else if (strcmp(name,"FrictionM")==0) return FrictionMEnum;
    635643              else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
    636644              else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum;
     
    732740              else if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
    733741              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
     742              else if (strcmp(name,"Sample")==0) return SampleEnum;
     743              else if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum;
     744              else if (strcmp(name,"SamplingKappa")==0) return SamplingKappaEnum;
    734745              else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
    735746              else if (strcmp(name,"SealevelBarystaticMask")==0) return SealevelBarystaticMaskEnum;
     
    741752              else if (strcmp(name,"BslcIce")==0) return BslcIceEnum;
    742753              else if (strcmp(name,"BslcHydro")==0) return BslcHydroEnum;
    743               else if (strcmp(name,"BslcRate")==0) return BslcRateEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"BslcRate")==0) return BslcRateEnum;
    744758              else if (strcmp(name,"Gmtslc")==0) return GmtslcEnum;
    745759              else if (strcmp(name,"SealevelRSLBarystatic")==0) return SealevelRSLBarystaticEnum;
     
    752766              else if (strcmp(name,"SealevelchangeCumDeltathicknessOld")==0) return SealevelchangeCumDeltathicknessOldEnum;
    753767              else if (strcmp(name,"SurfaceloadRate")==0) return SurfaceloadRateEnum;
    754          else stage=7;
    755    }
    756    if(stage==7){
    757               if (strcmp(name,"SurfaceloadIceThicknessRate")==0) return SurfaceloadIceThicknessRateEnum;
     768              else if (strcmp(name,"SurfaceloadIceThicknessRate")==0) return SurfaceloadIceThicknessRateEnum;
    758769              else if (strcmp(name,"SurfaceloadWaterHeightRate")==0) return SurfaceloadWaterHeightRateEnum;
    759770              else if (strcmp(name,"SurfaceloadOtherRate")==0) return SurfaceloadOtherRateEnum;
     
    864875              else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum;
    865876              else if (strcmp(name,"SmbTemperaturesReconstructed")==0) return SmbTemperaturesReconstructedEnum;
    866               else if (strcmp(name,"SmbTini")==0) return SmbTiniEnum;
     877         else stage=8;
     878   }
     879   if(stage==8){
     880              if (strcmp(name,"SmbTini")==0) return SmbTiniEnum;
    867881              else if (strcmp(name,"SmbTmean")==0) return SmbTmeanEnum;
    868882              else if (strcmp(name,"SmbTz")==0) return SmbTzEnum;
     
    875889              else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum;
    876890              else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum;
    877          else stage=8;
    878    }
    879    if(stage==8){
    880               if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum;
     891              else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum;
    881892              else if (strcmp(name,"SmbZY")==0) return SmbZYEnum;
    882893              else if (strcmp(name,"SolidearthExternalDisplacementEastRate")==0) return SolidearthExternalDisplacementEastRateEnum;
     
    987998              else if (strcmp(name,"Outputdefinition42")==0) return Outputdefinition42Enum;
    988999              else if (strcmp(name,"Outputdefinition43")==0) return Outputdefinition43Enum;
    989               else if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum;
     1000         else stage=9;
     1001   }
     1002   if(stage==9){
     1003              if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum;
    9901004              else if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum;
    9911005              else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum;
     
    9981012              else if (strcmp(name,"Outputdefinition52")==0) return Outputdefinition52Enum;
    9991013              else if (strcmp(name,"Outputdefinition53")==0) return Outputdefinition53Enum;
    1000          else stage=9;
    1001    }
    1002    if(stage==9){
    1003               if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum;
     1014              else if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum;
    10041015              else if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum;
    10051016              else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
     
    11101121              else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
    11111122              else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
    1112               else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
     1123         else stage=10;
     1124   }
     1125   if(stage==10){
     1126              if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
    11131127              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
    11141128              else if (strcmp(name,"DataSet")==0) return DataSetEnum;
     
    11211135              else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum;
    11221136              else if (strcmp(name,"DeviatoricStressErrorEstimator")==0) return DeviatoricStressErrorEstimatorEnum;
    1123          else stage=10;
    1124    }
    1125    if(stage==10){
    1126               if (strcmp(name,"Divergence")==0) return DivergenceEnum;
     1137              else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
    11271138              else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum;
    11281139              else if (strcmp(name,"DoubleArrayInput")==0) return DoubleArrayInputEnum;
     
    12331244              else if (strcmp(name,"LoveHi")==0) return LoveHiEnum;
    12341245              else if (strcmp(name,"LoveHr")==0) return LoveHrEnum;
    1235               else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
     1246         else stage=11;
     1247   }
     1248   if(stage==11){
     1249              if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
    12361250              else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
    12371251              else if (strcmp(name,"LoveKi")==0) return LoveKiEnum;
     
    12441258              else if (strcmp(name,"MantlePlumeGeothermalFlux")==0) return MantlePlumeGeothermalFluxEnum;
    12451259              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    1246          else stage=11;
    1247    }
    1248    if(stage==11){
    1249               if (strcmp(name,"Masscon")==0) return MassconEnum;
     1260              else if (strcmp(name,"Masscon")==0) return MassconEnum;
    12501261              else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
    12511262              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
     
    13561367              else if (strcmp(name,"SealevelchangeSolution")==0) return SealevelchangeSolutionEnum;
    13571368              else if (strcmp(name,"Seg")==0) return SegEnum;
    1358               else if (strcmp(name,"SegInput")==0) return SegInputEnum;
     1369         else stage=12;
     1370   }
     1371   if(stage==12){
     1372              if (strcmp(name,"SegInput")==0) return SegInputEnum;
    13591373              else if (strcmp(name,"Segment")==0) return SegmentEnum;
    13601374              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
     
    13671381              else if (strcmp(name,"SpatialLinearFloatingMeltRate")==0) return SpatialLinearFloatingMeltRateEnum;
    13681382              else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
    1369          else stage=12;
    1370    }
    1371    if(stage==12){
    1372               if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
     1383              else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
    13731384              else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
    13741385              else if (strcmp(name,"Sset")==0) return SsetEnum;
Note: See TracChangeset for help on using the changeset viewer.