Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 24547) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 24548) @@ -168,4 +168,5 @@ break; case LinearFloatingMeltRateEnum: + iomodel->FetchDataToInput(inputs2,elements,"md.basalforcings.perturbation_melting_rate",BasalforcingsPerturbationMeltingRateEnum,0.); break; case MismipFloatingMeltRateEnum: Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24547) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24548) @@ -463,4 +463,5 @@ syn keyword cConstant BasalforcingsGeothermalfluxEnum syn keyword cConstant BasalforcingsGroundediceMeltingRateEnum +syn keyword cConstant BasalforcingsPerturbationMeltingRateEnum syn keyword cConstant BasalforcingsIsmip6BasinIdEnum syn keyword cConstant BasalforcingsIsmip6TfEnum @@ -1332,4 +1333,5 @@ syn keyword cType Cfsurfacesquare syn keyword cType Channel +syn keyword cType classes syn keyword cType Constraint syn keyword cType Constraints @@ -1338,6 +1340,6 @@ syn keyword cType ControlInput2 syn keyword cType Covertree +syn keyword cType DatasetInput2 syn keyword cType DataSetParam -syn keyword cType DatasetInput2 syn keyword cType Definition syn keyword cType DependentObject @@ -1351,6 +1353,6 @@ syn keyword cType ElementInput2 syn keyword cType ElementMatrix +syn keyword cType Elements syn keyword cType ElementVector -syn keyword cType Elements syn keyword cType ExponentialVariogram syn keyword cType ExternalResult @@ -1359,9 +1361,10 @@ syn keyword cType Friction syn keyword cType Gauss +syn keyword cType GaussianVariogram +syn keyword cType gaussobjects syn keyword cType GaussPenta syn keyword cType GaussSeg syn keyword cType GaussTetra syn keyword cType GaussTria -syn keyword cType GaussianVariogram syn keyword cType GenericExternalResult syn keyword cType GenericOption @@ -1378,4 +1381,5 @@ syn keyword cType IssmDirectApplicInterface syn keyword cType IssmParallelDirectApplicInterface +syn keyword cType krigingobjects syn keyword cType Load syn keyword cType Loads @@ -1388,4 +1392,5 @@ syn keyword cType Matice syn keyword cType Matlitho +syn keyword cType matrixobjects syn keyword cType MatrixParam syn keyword cType Misfit @@ -1400,6 +1405,6 @@ syn keyword cType Observations syn keyword cType Option +syn keyword cType Options syn keyword cType OptionUtilities -syn keyword cType Options syn keyword cType Param syn keyword cType Parameters @@ -1415,10 +1420,10 @@ syn keyword cType Regionaloutput syn keyword cType Results +syn keyword cType Riftfront syn keyword cType RiftStruct -syn keyword cType Riftfront syn keyword cType Seg syn keyword cType SegInput2 +syn keyword cType Segment syn keyword cType SegRef -syn keyword cType Segment syn keyword cType SpcDynamic syn keyword cType SpcStatic @@ -1439,8 +1444,4 @@ syn keyword cType Vertex syn keyword cType Vertices -syn keyword cType classes -syn keyword cType gaussobjects -syn keyword cType krigingobjects -syn keyword cType matrixobjects syn keyword cType AdjointBalancethickness2Analysis syn keyword cType AdjointBalancethicknessAnalysis @@ -1461,6 +1462,6 @@ syn keyword cType FreeSurfaceBaseAnalysis syn keyword cType FreeSurfaceTopAnalysis +syn keyword cType GiaIvinsAnalysis syn keyword cType GLheightadvectionAnalysis -syn keyword cType GiaIvinsAnalysis syn keyword cType HydrologyDCEfficientAnalysis syn keyword cType HydrologyDCInefficientAnalysis Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24547) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24548) @@ -459,4 +459,5 @@ BasalforcingsGeothermalfluxEnum, BasalforcingsGroundediceMeltingRateEnum, + BasalforcingsPerturbationMeltingRateEnum, BasalforcingsIsmip6BasinIdEnum, BasalforcingsIsmip6TfEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24547) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24548) @@ -465,4 +465,5 @@ case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux"; case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate"; + case BasalforcingsPerturbationMeltingRateEnum : return "BasalforcingsPerturbationMeltingRate"; case BasalforcingsIsmip6BasinIdEnum : return "BasalforcingsIsmip6BasinId"; case BasalforcingsIsmip6TfEnum : return "BasalforcingsIsmip6Tf"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24547) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24548) @@ -474,4 +474,5 @@ else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum; + else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; else if (strcmp(name,"BasalforcingsIsmip6BasinId")==0) return BasalforcingsIsmip6BasinIdEnum; else if (strcmp(name,"BasalforcingsIsmip6Tf")==0) return BasalforcingsIsmip6TfEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum; else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum; - else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"CalvingFluxLevelset")==0) return CalvingFluxLevelsetEnum; + if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum; + else if (strcmp(name,"CalvingFluxLevelset")==0) return CalvingFluxLevelsetEnum; else if (strcmp(name,"CalvingMeltingFluxLevelset")==0) return CalvingMeltingFluxLevelsetEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; @@ -628,9 +629,9 @@ else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum; - else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum; + if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum; + else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum; else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum; else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum; @@ -751,9 +752,9 @@ else if (strcmp(name,"SmbMelt")==0) return SmbMeltEnum; else if (strcmp(name,"SmbMonthlytemperatures")==0) return SmbMonthlytemperaturesEnum; - else if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum; + if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum; + else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum; else if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum; else if (strcmp(name,"SmbP")==0) return SmbPEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"Outputdefinition22")==0) return Outputdefinition22Enum; else if (strcmp(name,"Outputdefinition23")==0) return Outputdefinition23Enum; - else if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum; else stage=8; } if(stage==8){ - if (strcmp(name,"Outputdefinition25")==0) return Outputdefinition25Enum; + if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum; + else if (strcmp(name,"Outputdefinition25")==0) return Outputdefinition25Enum; else if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum; else if (strcmp(name,"Outputdefinition27")==0) return Outputdefinition27Enum; @@ -997,9 +998,9 @@ else if (strcmp(name,"CalvingDev2")==0) return CalvingDev2Enum; else if (strcmp(name,"CalvingHab")==0) return CalvingHabEnum; - else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum; + if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum; + else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum; else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum; else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum; @@ -1120,9 +1121,9 @@ else if (strcmp(name,"IntInput")==0) return IntInputEnum; else if (strcmp(name,"ElementInput2")==0) return ElementInput2Enum; - else if (strcmp(name,"SegInput2")==0) return SegInput2Enum; else stage=10; } if(stage==10){ - if (strcmp(name,"TriaInput2")==0) return TriaInput2Enum; + if (strcmp(name,"SegInput2")==0) return SegInput2Enum; + else if (strcmp(name,"TriaInput2")==0) return TriaInput2Enum; else if (strcmp(name,"PentaInput2")==0) return PentaInput2Enum; else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum; @@ -1243,9 +1244,9 @@ else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum; else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum; - else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum; else stage=11; } if(stage==11){ - if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum; + if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum; + else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum; else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum; else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum;