Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 28144) +++ /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 28145) @@ -48,5 +48,5 @@ IoConstant::IoConstant(bool value,const char* name_in){/*{{{*/ this->isindependent = false; - this->constant = new BoolParam(0,value); + this->constant = new BoolParam(IoConstantEnum,value); _assert_(name_in); @@ -58,5 +58,5 @@ IoConstant::IoConstant(int value,const char* name_in){/*{{{*/ this->isindependent = false; - this->constant = new IntParam(0,value); + this->constant = new IntParam(IoConstantEnum, value); _assert_(name_in); @@ -68,5 +68,5 @@ IoConstant::IoConstant(IssmDouble value,const char* name_in){/*{{{*/ this->isindependent = false; - this->constant = new DoubleParam(0,value); + this->constant = new DoubleParam(IoConstantEnum, value); _assert_(name_in); @@ -78,5 +78,5 @@ IoConstant::IoConstant(char* value,const char* name_in){/*{{{*/ this->isindependent = false; - this->constant = new StringParam(0,value); + this->constant = new StringParam(IoConstantEnum, value); _assert_(name_in); @@ -88,5 +88,5 @@ IoConstant::IoConstant(char** value,int numstrings,const char* name_in){/*{{{*/ this->isindependent = false; - this->constant = new StringArrayParam(0,value,numstrings); + this->constant = new StringArrayParam(IoConstantEnum, value, numstrings); _assert_(name_in); @@ -406,7 +406,7 @@ _printf0_(" Marshalled file is corrupted \n"); _printf0_(" \n"); - _printf0_(" * Last record found is : \n"); - _printf0_(" the corresponding model field has probably been marshalled \n"); - _printf0_(" incorrectly \n"); + _printf0_(" Last record found is: \n"); + _printf0_(" the corresponding model field has probably been marshalled \n"); + _printf0_(" incorrectly \n"); _printf0_(" \n"); _printf0_("=========================================================================\n"); @@ -2737,4 +2737,16 @@ if(strcmp(ioconstant->name,constant_name)==0){ + if(ioconstant->constant->ObjectEnum()!=BoolParamEnum){ + _printf0_("=========================================================================\n"); + _printf0_(" Marshalled file is not consistent with compiled code \n"); + _printf0_(" \n"); + _printf0_(" This problem typically happens when two different versions of ISSM \n"); + _printf0_(" are being used. Make sure that you are running the same version: \n"); + _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); + _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); + _printf0_(" \n"); + _printf0_("=========================================================================\n\n"); + _error_("\""<< constant_name <<"\" cannot return a bool, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); + } ioconstant->constant->GetParameterValue(pvalue); return; @@ -2755,4 +2767,16 @@ if(strcmp(ioconstant->name,constant_name)==0){ + if(ioconstant->constant->ObjectEnum()!=IntParamEnum){ + _printf0_("=========================================================================\n"); + _printf0_(" Marshalled file is not consistent with compiled code \n"); + _printf0_(" \n"); + _printf0_(" This problem typically happens when two different versions of ISSM \n"); + _printf0_(" are being used. Make sure that you are running the same version: \n"); + _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); + _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); + _printf0_(" \n"); + _printf0_("=========================================================================\n\n"); + _error_("\""<< constant_name <<"\" cannot return an int, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); + } ioconstant->constant->GetParameterValue(pvalue); return; @@ -2772,4 +2796,16 @@ if(strcmp(ioconstant->name,constant_name)==0){ + if(ioconstant->constant->ObjectEnum()!=DoubleParamEnum){ + _printf0_("=========================================================================\n"); + _printf0_(" Marshalled file is not consistent with compiled code \n"); + _printf0_(" \n"); + _printf0_(" This problem typically happens when two different versions of ISSM \n"); + _printf0_(" are being used. Make sure that you are running the same version: \n"); + _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); + _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); + _printf0_(" \n"); + _printf0_("=========================================================================\n\n"); + _error_("\""<< constant_name <<"\" cannot return a double, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); + } ioconstant->constant->GetParameterValue(pvalue); return; @@ -2789,4 +2825,16 @@ if(strcmp(ioconstant->name,constant_name)==0){ + if(ioconstant->constant->ObjectEnum()!=StringParamEnum){ + _printf0_("=========================================================================\n"); + _printf0_(" Marshalled file is not consistent with compiled code \n"); + _printf0_(" \n"); + _printf0_(" This problem typically happens when two different versions of ISSM \n"); + _printf0_(" are being used. Make sure that you are running the same version: \n"); + _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); + _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); + _printf0_(" \n"); + _printf0_("=========================================================================\n\n"); + _error_("\""<< constant_name <<"\" cannot return a string, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); + } ioconstant->constant->GetParameterValue(pvalue); return; @@ -2806,4 +2854,16 @@ if(strcmp(ioconstant->name,constant_name)==0){ + if(ioconstant->constant->ObjectEnum()!=StringArrayParamEnum){ + _printf0_("=========================================================================\n"); + _printf0_(" Marshalled file is not consistent with compiled code \n"); + _printf0_(" \n"); + _printf0_(" This problem typically happens when two different versions of ISSM \n"); + _printf0_(" are being used. Make sure that you are running the same version: \n"); + _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); + _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); + _printf0_(" \n"); + _printf0_("=========================================================================\n\n"); + _error_("\""<< constant_name <<"\" cannot return a string array, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); + } ioconstant->constant->GetParameterValue(pvalue,psize); return; Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 28144) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 28145) @@ -246,4 +246,5 @@ syn keyword cConstant GrdModelEnum syn keyword cConstant GroundinglineFrictionInterpolationEnum +syn keyword cConstant GroundinglineIntrusionDistanceEnum syn keyword cConstant GroundinglineMeltInterpolationEnum syn keyword cConstant GroundinglineMigrationEnum @@ -337,4 +338,5 @@ syn keyword cConstant InversionStopFlagEnum syn keyword cConstant InversionTypeEnum +syn keyword cConstant IoConstantEnum syn keyword cConstant IvinsEnum syn keyword cConstant IsSlcCouplingEnum @@ -868,5 +870,4 @@ syn keyword cConstant FrontalForcingsSubglacialDischargeEnum syn keyword cConstant GeometryHydrostaticRatioEnum -syn keyword cConstant GroundinglineIntrusionDistanceEnum syn keyword cConstant NGiaEnum syn keyword cConstant NGiaRateEnum @@ -926,5 +927,4 @@ syn keyword cConstant InversionVxObsEnum syn keyword cConstant InversionVyObsEnum -syn keyword cConstant IntrusionMeltEnum syn keyword cConstant LevelsetfunctionSlopeXEnum syn keyword cConstant LevelsetfunctionSlopeYEnum @@ -1742,4 +1742,5 @@ syn keyword cConstant SubelementFriction1Enum syn keyword cConstant SubelementFriction2Enum +syn keyword cConstant IntrusionMeltEnum syn keyword cConstant SubelementMelt1Enum syn keyword cConstant SubelementMelt2Enum @@ -1927,4 +1928,5 @@ syn keyword cType Tria syn keyword cType TriaInput +syn keyword cType Tria_MICI syn keyword cType TriaRef syn keyword cType Variogram Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 28144) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 28145) @@ -332,4 +332,5 @@ InversionStopFlagEnum, InversionTypeEnum, + IoConstantEnum, IvinsEnum, IsSlcCouplingEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 28144) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 28145) @@ -248,4 +248,5 @@ case GrdModelEnum : return "GrdModel"; case GroundinglineFrictionInterpolationEnum : return "GroundinglineFrictionInterpolation"; + case GroundinglineIntrusionDistanceEnum : return "GroundinglineIntrusionDistance"; case GroundinglineMeltInterpolationEnum : return "GroundinglineMeltInterpolation"; case GroundinglineMigrationEnum : return "GroundinglineMigration"; @@ -339,4 +340,5 @@ case InversionStopFlagEnum : return "InversionStopFlag"; case InversionTypeEnum : return "InversionType"; + case IoConstantEnum : return "IoConstant"; case IvinsEnum : return "Ivins"; case IsSlcCouplingEnum : return "IsSlcCoupling"; @@ -870,5 +872,4 @@ case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge"; case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio"; - case GroundinglineIntrusionDistanceEnum : return "GroundinglineIntrusionDistance"; case NGiaEnum : return "NGia"; case NGiaRateEnum : return "NGiaRate"; @@ -928,5 +929,4 @@ case InversionVxObsEnum : return "InversionVxObs"; case InversionVyObsEnum : return "InversionVyObs"; - case IntrusionMeltEnum : return "IntrusionMelt"; case LevelsetfunctionSlopeXEnum : return "LevelsetfunctionSlopeX"; case LevelsetfunctionSlopeYEnum : return "LevelsetfunctionSlopeY"; @@ -1744,4 +1744,5 @@ case SubelementFriction1Enum : return "SubelementFriction1"; case SubelementFriction2Enum : return "SubelementFriction2"; + case IntrusionMeltEnum : return "IntrusionMelt"; case SubelementMelt1Enum : return "SubelementMelt1"; case SubelementMelt2Enum : return "SubelementMelt2"; Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 28144) +++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 28145) @@ -239,4 +239,5 @@ syn keyword juliaConstC GrdModelEnum syn keyword juliaConstC GroundinglineFrictionInterpolationEnum +syn keyword juliaConstC GroundinglineIntrusionDistanceEnum syn keyword juliaConstC GroundinglineMeltInterpolationEnum syn keyword juliaConstC GroundinglineMigrationEnum @@ -330,4 +331,5 @@ syn keyword juliaConstC InversionStopFlagEnum syn keyword juliaConstC InversionTypeEnum +syn keyword juliaConstC IoConstantEnum syn keyword juliaConstC IvinsEnum syn keyword juliaConstC IsSlcCouplingEnum @@ -861,5 +863,4 @@ syn keyword juliaConstC FrontalForcingsSubglacialDischargeEnum syn keyword juliaConstC GeometryHydrostaticRatioEnum -syn keyword juliaConstC GroundinglineIntrusionDistanceEnum syn keyword juliaConstC NGiaEnum syn keyword juliaConstC NGiaRateEnum @@ -919,5 +920,4 @@ syn keyword juliaConstC InversionVxObsEnum syn keyword juliaConstC InversionVyObsEnum -syn keyword juliaConstC IntrusionMeltEnum syn keyword juliaConstC LevelsetfunctionSlopeXEnum syn keyword juliaConstC LevelsetfunctionSlopeYEnum @@ -1735,4 +1735,5 @@ syn keyword juliaConstC SubelementFriction1Enum syn keyword juliaConstC SubelementFriction2Enum +syn keyword juliaConstC IntrusionMeltEnum syn keyword juliaConstC SubelementMelt1Enum syn keyword juliaConstC SubelementMelt2Enum Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 28144) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 28145) @@ -251,4 +251,5 @@ else if (strcmp(name,"GrdModel")==0) return GrdModelEnum; else if (strcmp(name,"GroundinglineFrictionInterpolation")==0) return GroundinglineFrictionInterpolationEnum; + else if (strcmp(name,"GroundinglineIntrusionDistance")==0) return GroundinglineIntrusionDistanceEnum; else if (strcmp(name,"GroundinglineMeltInterpolation")==0) return GroundinglineMeltInterpolationEnum; else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; @@ -259,9 +260,9 @@ else if (strcmp(name,"Hydrologyarmadatebreaks")==0) return HydrologyarmadatebreaksEnum; else if (strcmp(name,"Hydrologyarmamalagcoefs")==0) return HydrologyarmamalagcoefsEnum; - else if (strcmp(name,"HydrologyarmamaOrder")==0) return HydrologyarmamaOrderEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"HydrologyarmaMonthlyFactors")==0) return HydrologyarmaMonthlyFactorsEnum; + if (strcmp(name,"HydrologyarmamaOrder")==0) return HydrologyarmamaOrderEnum; + else if (strcmp(name,"HydrologyarmaMonthlyFactors")==0) return HydrologyarmaMonthlyFactorsEnum; else if (strcmp(name,"HydrologyarmaNumBreaks")==0) return HydrologyarmaNumBreaksEnum; else if (strcmp(name,"HydrologyarmaNumParams")==0) return HydrologyarmaNumParamsEnum; @@ -345,4 +346,5 @@ else if (strcmp(name,"InversionStopFlag")==0) return InversionStopFlagEnum; else if (strcmp(name,"InversionType")==0) return InversionTypeEnum; + else if (strcmp(name,"IoConstant")==0) return IoConstantEnum; else if (strcmp(name,"Ivins")==0) return IvinsEnum; else if (strcmp(name,"IsSlcCoupling")==0) return IsSlcCouplingEnum; @@ -381,10 +383,10 @@ else if (strcmp(name,"LoveHypergeomNZ")==0) return LoveHypergeomNZEnum; else if (strcmp(name,"LoveHypergeomNAlpha")==0) return LoveHypergeomNAlphaEnum; - else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum; - else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; + if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum; + else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum; + else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum; else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum; @@ -504,10 +506,10 @@ else if (strcmp(name,"SealevelchangePolarMotionTransferFunctionOrthogonal")==0) return SealevelchangePolarMotionTransferFunctionOrthogonalEnum; else if (strcmp(name,"SealevelchangePolarMotionTransferFunctionZ")==0) return SealevelchangePolarMotionTransferFunctionZEnum; - else if (strcmp(name,"SealevelchangeTidalK2")==0) return SealevelchangeTidalK2Enum; - else if (strcmp(name,"SealevelchangeTidalH2")==0) return SealevelchangeTidalH2Enum; else stage=5; } if(stage==5){ - if (strcmp(name,"SealevelchangeTidalL2")==0) return SealevelchangeTidalL2Enum; + if (strcmp(name,"SealevelchangeTidalK2")==0) return SealevelchangeTidalK2Enum; + else if (strcmp(name,"SealevelchangeTidalH2")==0) return SealevelchangeTidalH2Enum; + else if (strcmp(name,"SealevelchangeTidalL2")==0) return SealevelchangeTidalL2Enum; else if (strcmp(name,"SolidearthSettingsSealevelLoading")==0) return SolidearthSettingsSealevelLoadingEnum; else if (strcmp(name,"SolidearthSettingsGRD")==0) return SolidearthSettingsGRDEnum; @@ -627,10 +629,10 @@ else if (strcmp(name,"SmbSemicTauA")==0) return SmbSemicTauAEnum; else if (strcmp(name,"SmbSemicTauF")==0) return SmbSemicTauFEnum; - else if (strcmp(name,"SmbSemicTmin")==0) return SmbSemicTminEnum; - else if (strcmp(name,"SmbSemicTmid")==0) return SmbSemicTmidEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"SmbSemicTmax")==0) return SmbSemicTmaxEnum; + if (strcmp(name,"SmbSemicTmin")==0) return SmbSemicTminEnum; + else if (strcmp(name,"SmbSemicTmid")==0) return SmbSemicTmidEnum; + else if (strcmp(name,"SmbSemicTmax")==0) return SmbSemicTmaxEnum; else if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum; else if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum; @@ -750,10 +752,10 @@ else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum; - else if (strcmp(name,"BasalforcingsGroundediceMeltingRateObs")==0) return BasalforcingsGroundediceMeltingRateObsEnum; - else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; + if (strcmp(name,"BasalforcingsGroundediceMeltingRateObs")==0) return BasalforcingsGroundediceMeltingRateObsEnum; + else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum; + else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; else if (strcmp(name,"BasalforcingsSpatialDeepwaterElevation")==0) return BasalforcingsSpatialDeepwaterElevationEnum; else if (strcmp(name,"BasalforcingsSpatialDeepwaterMeltingRate")==0) return BasalforcingsSpatialDeepwaterMeltingRateEnum; @@ -873,10 +875,10 @@ else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum; else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum; - else if (strcmp(name,"FrictionK")==0) return FrictionKEnum; - else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"FrictionP")==0) return FrictionPEnum; + if (strcmp(name,"FrictionK")==0) return FrictionKEnum; + else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; + else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum; else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; @@ -891,5 +893,4 @@ else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum; else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; - else if (strcmp(name,"GroundinglineIntrusionDistance")==0) return GroundinglineIntrusionDistanceEnum; else if (strcmp(name,"NGia")==0) return NGiaEnum; else if (strcmp(name,"NGiaRate")==0) return NGiaRateEnum; @@ -949,5 +950,4 @@ else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; - else if (strcmp(name,"IntrusionMelt")==0) return IntrusionMeltEnum; else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum; else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum; @@ -1786,4 +1786,5 @@ else if (strcmp(name,"SubelementFriction1")==0) return SubelementFriction1Enum; else if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum; + else if (strcmp(name,"IntrusionMelt")==0) return IntrusionMeltEnum; else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum; else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum;