![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 28145
- Timestamp:
- 03/14/24 07:39:26 (12 months ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 6 edited
-
classes/IoModel.cpp (modified) (11 diffs)
-
shared/Enum/Enum.vim (modified) (6 diffs)
-
shared/Enum/EnumDefinitions.h (modified) (1 diff)
-
shared/Enum/EnumToStringx.cpp (modified) (5 diffs)
-
shared/Enum/Enumjl.vim (modified) (5 diffs)
-
shared/Enum/StringToEnumx.cpp (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/IoModel.cpp
r27717 r28145 48 48 IoConstant::IoConstant(bool value,const char* name_in){/*{{{*/ 49 49 this->isindependent = false; 50 this->constant = new BoolParam( 0,value);50 this->constant = new BoolParam(IoConstantEnum,value); 51 51 52 52 _assert_(name_in); … … 58 58 IoConstant::IoConstant(int value,const char* name_in){/*{{{*/ 59 59 this->isindependent = false; 60 this->constant = new IntParam( 0,value);60 this->constant = new IntParam(IoConstantEnum, value); 61 61 62 62 _assert_(name_in); … … 68 68 IoConstant::IoConstant(IssmDouble value,const char* name_in){/*{{{*/ 69 69 this->isindependent = false; 70 this->constant = new DoubleParam( 0,value);70 this->constant = new DoubleParam(IoConstantEnum, value); 71 71 72 72 _assert_(name_in); … … 78 78 IoConstant::IoConstant(char* value,const char* name_in){/*{{{*/ 79 79 this->isindependent = false; 80 this->constant = new StringParam( 0,value);80 this->constant = new StringParam(IoConstantEnum, value); 81 81 82 82 _assert_(name_in); … … 88 88 IoConstant::IoConstant(char** value,int numstrings,const char* name_in){/*{{{*/ 89 89 this->isindependent = false; 90 this->constant = new StringArrayParam( 0,value,numstrings);90 this->constant = new StringArrayParam(IoConstantEnum, value, numstrings); 91 91 92 92 _assert_(name_in); … … 406 406 _printf0_(" Marshalled file is corrupted \n"); 407 407 _printf0_(" \n"); 408 _printf0_(" * Last record found is :\n");409 _printf0_(" the corresponding model field has probably been marshalled\n");410 _printf0_(" incorrectly\n");408 _printf0_(" Last record found is: \n"); 409 _printf0_(" the corresponding model field has probably been marshalled \n"); 410 _printf0_(" incorrectly \n"); 411 411 _printf0_(" \n"); 412 412 _printf0_("=========================================================================\n"); … … 2737 2737 2738 2738 if(strcmp(ioconstant->name,constant_name)==0){ 2739 if(ioconstant->constant->ObjectEnum()!=BoolParamEnum){ 2740 _printf0_("=========================================================================\n"); 2741 _printf0_(" Marshalled file is not consistent with compiled code \n"); 2742 _printf0_(" \n"); 2743 _printf0_(" This problem typically happens when two different versions of ISSM \n"); 2744 _printf0_(" are being used. Make sure that you are running the same version: \n"); 2745 _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); 2746 _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); 2747 _printf0_(" \n"); 2748 _printf0_("=========================================================================\n\n"); 2749 _error_("\""<< constant_name <<"\" cannot return a bool, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); 2750 } 2739 2751 ioconstant->constant->GetParameterValue(pvalue); 2740 2752 return; … … 2755 2767 2756 2768 if(strcmp(ioconstant->name,constant_name)==0){ 2769 if(ioconstant->constant->ObjectEnum()!=IntParamEnum){ 2770 _printf0_("=========================================================================\n"); 2771 _printf0_(" Marshalled file is not consistent with compiled code \n"); 2772 _printf0_(" \n"); 2773 _printf0_(" This problem typically happens when two different versions of ISSM \n"); 2774 _printf0_(" are being used. Make sure that you are running the same version: \n"); 2775 _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); 2776 _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); 2777 _printf0_(" \n"); 2778 _printf0_("=========================================================================\n\n"); 2779 _error_("\""<< constant_name <<"\" cannot return an int, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); 2780 } 2757 2781 ioconstant->constant->GetParameterValue(pvalue); 2758 2782 return; … … 2772 2796 2773 2797 if(strcmp(ioconstant->name,constant_name)==0){ 2798 if(ioconstant->constant->ObjectEnum()!=DoubleParamEnum){ 2799 _printf0_("=========================================================================\n"); 2800 _printf0_(" Marshalled file is not consistent with compiled code \n"); 2801 _printf0_(" \n"); 2802 _printf0_(" This problem typically happens when two different versions of ISSM \n"); 2803 _printf0_(" are being used. Make sure that you are running the same version: \n"); 2804 _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); 2805 _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); 2806 _printf0_(" \n"); 2807 _printf0_("=========================================================================\n\n"); 2808 _error_("\""<< constant_name <<"\" cannot return a double, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); 2809 } 2774 2810 ioconstant->constant->GetParameterValue(pvalue); 2775 2811 return; … … 2789 2825 2790 2826 if(strcmp(ioconstant->name,constant_name)==0){ 2827 if(ioconstant->constant->ObjectEnum()!=StringParamEnum){ 2828 _printf0_("=========================================================================\n"); 2829 _printf0_(" Marshalled file is not consistent with compiled code \n"); 2830 _printf0_(" \n"); 2831 _printf0_(" This problem typically happens when two different versions of ISSM \n"); 2832 _printf0_(" are being used. Make sure that you are running the same version: \n"); 2833 _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); 2834 _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); 2835 _printf0_(" \n"); 2836 _printf0_("=========================================================================\n\n"); 2837 _error_("\""<< constant_name <<"\" cannot return a string, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); 2838 } 2791 2839 ioconstant->constant->GetParameterValue(pvalue); 2792 2840 return; … … 2806 2854 2807 2855 if(strcmp(ioconstant->name,constant_name)==0){ 2856 if(ioconstant->constant->ObjectEnum()!=StringArrayParamEnum){ 2857 _printf0_("=========================================================================\n"); 2858 _printf0_(" Marshalled file is not consistent with compiled code \n"); 2859 _printf0_(" \n"); 2860 _printf0_(" This problem typically happens when two different versions of ISSM \n"); 2861 _printf0_(" are being used. Make sure that you are running the same version: \n"); 2862 _printf0_(" - to marshall the model (i.e., MATLAB/python interface) \n"); 2863 _printf0_(" - to run ISSM (i.e., the compiled code issm.exe) \n"); 2864 _printf0_(" \n"); 2865 _printf0_("=========================================================================\n\n"); 2866 _error_("\""<< constant_name <<"\" cannot return a string array, it is a " << EnumToStringx(ioconstant->constant->ObjectEnum())); 2867 } 2808 2868 ioconstant->constant->GetParameterValue(pvalue,psize); 2809 2869 return; -
issm/trunk-jpl/src/c/shared/Enum/Enum.vim
r28115 r28145 246 246 syn keyword cConstant GrdModelEnum 247 247 syn keyword cConstant GroundinglineFrictionInterpolationEnum 248 syn keyword cConstant GroundinglineIntrusionDistanceEnum 248 249 syn keyword cConstant GroundinglineMeltInterpolationEnum 249 250 syn keyword cConstant GroundinglineMigrationEnum … … 337 338 syn keyword cConstant InversionStopFlagEnum 338 339 syn keyword cConstant InversionTypeEnum 340 syn keyword cConstant IoConstantEnum 339 341 syn keyword cConstant IvinsEnum 340 342 syn keyword cConstant IsSlcCouplingEnum … … 868 870 syn keyword cConstant FrontalForcingsSubglacialDischargeEnum 869 871 syn keyword cConstant GeometryHydrostaticRatioEnum 870 syn keyword cConstant GroundinglineIntrusionDistanceEnum871 872 syn keyword cConstant NGiaEnum 872 873 syn keyword cConstant NGiaRateEnum … … 926 927 syn keyword cConstant InversionVxObsEnum 927 928 syn keyword cConstant InversionVyObsEnum 928 syn keyword cConstant IntrusionMeltEnum929 929 syn keyword cConstant LevelsetfunctionSlopeXEnum 930 930 syn keyword cConstant LevelsetfunctionSlopeYEnum … … 1742 1742 syn keyword cConstant SubelementFriction1Enum 1743 1743 syn keyword cConstant SubelementFriction2Enum 1744 syn keyword cConstant IntrusionMeltEnum 1744 1745 syn keyword cConstant SubelementMelt1Enum 1745 1746 syn keyword cConstant SubelementMelt2Enum … … 1927 1928 syn keyword cType Tria 1928 1929 syn keyword cType TriaInput 1930 syn keyword cType Tria_MICI 1929 1931 syn keyword cType TriaRef 1930 1932 syn keyword cType Variogram -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r28115 r28145 332 332 InversionStopFlagEnum, 333 333 InversionTypeEnum, 334 IoConstantEnum, 334 335 IvinsEnum, 335 336 IsSlcCouplingEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r28115 r28145 248 248 case GrdModelEnum : return "GrdModel"; 249 249 case GroundinglineFrictionInterpolationEnum : return "GroundinglineFrictionInterpolation"; 250 case GroundinglineIntrusionDistanceEnum : return "GroundinglineIntrusionDistance"; 250 251 case GroundinglineMeltInterpolationEnum : return "GroundinglineMeltInterpolation"; 251 252 case GroundinglineMigrationEnum : return "GroundinglineMigration"; … … 339 340 case InversionStopFlagEnum : return "InversionStopFlag"; 340 341 case InversionTypeEnum : return "InversionType"; 342 case IoConstantEnum : return "IoConstant"; 341 343 case IvinsEnum : return "Ivins"; 342 344 case IsSlcCouplingEnum : return "IsSlcCoupling"; … … 870 872 case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge"; 871 873 case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio"; 872 case GroundinglineIntrusionDistanceEnum : return "GroundinglineIntrusionDistance";873 874 case NGiaEnum : return "NGia"; 874 875 case NGiaRateEnum : return "NGiaRate"; … … 928 929 case InversionVxObsEnum : return "InversionVxObs"; 929 930 case InversionVyObsEnum : return "InversionVyObs"; 930 case IntrusionMeltEnum : return "IntrusionMelt";931 931 case LevelsetfunctionSlopeXEnum : return "LevelsetfunctionSlopeX"; 932 932 case LevelsetfunctionSlopeYEnum : return "LevelsetfunctionSlopeY"; … … 1744 1744 case SubelementFriction1Enum : return "SubelementFriction1"; 1745 1745 case SubelementFriction2Enum : return "SubelementFriction2"; 1746 case IntrusionMeltEnum : return "IntrusionMelt"; 1746 1747 case SubelementMelt1Enum : return "SubelementMelt1"; 1747 1748 case SubelementMelt2Enum : return "SubelementMelt2"; -
issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim
r28115 r28145 239 239 syn keyword juliaConstC GrdModelEnum 240 240 syn keyword juliaConstC GroundinglineFrictionInterpolationEnum 241 syn keyword juliaConstC GroundinglineIntrusionDistanceEnum 241 242 syn keyword juliaConstC GroundinglineMeltInterpolationEnum 242 243 syn keyword juliaConstC GroundinglineMigrationEnum … … 330 331 syn keyword juliaConstC InversionStopFlagEnum 331 332 syn keyword juliaConstC InversionTypeEnum 333 syn keyword juliaConstC IoConstantEnum 332 334 syn keyword juliaConstC IvinsEnum 333 335 syn keyword juliaConstC IsSlcCouplingEnum … … 861 863 syn keyword juliaConstC FrontalForcingsSubglacialDischargeEnum 862 864 syn keyword juliaConstC GeometryHydrostaticRatioEnum 863 syn keyword juliaConstC GroundinglineIntrusionDistanceEnum864 865 syn keyword juliaConstC NGiaEnum 865 866 syn keyword juliaConstC NGiaRateEnum … … 919 920 syn keyword juliaConstC InversionVxObsEnum 920 921 syn keyword juliaConstC InversionVyObsEnum 921 syn keyword juliaConstC IntrusionMeltEnum922 922 syn keyword juliaConstC LevelsetfunctionSlopeXEnum 923 923 syn keyword juliaConstC LevelsetfunctionSlopeYEnum … … 1735 1735 syn keyword juliaConstC SubelementFriction1Enum 1736 1736 syn keyword juliaConstC SubelementFriction2Enum 1737 syn keyword juliaConstC IntrusionMeltEnum 1737 1738 syn keyword juliaConstC SubelementMelt1Enum 1738 1739 syn keyword juliaConstC SubelementMelt2Enum -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r28115 r28145 251 251 else if (strcmp(name,"GrdModel")==0) return GrdModelEnum; 252 252 else if (strcmp(name,"GroundinglineFrictionInterpolation")==0) return GroundinglineFrictionInterpolationEnum; 253 else if (strcmp(name,"GroundinglineIntrusionDistance")==0) return GroundinglineIntrusionDistanceEnum; 253 254 else if (strcmp(name,"GroundinglineMeltInterpolation")==0) return GroundinglineMeltInterpolationEnum; 254 255 else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; … … 259 260 else if (strcmp(name,"Hydrologyarmadatebreaks")==0) return HydrologyarmadatebreaksEnum; 260 261 else if (strcmp(name,"Hydrologyarmamalagcoefs")==0) return HydrologyarmamalagcoefsEnum; 261 else if (strcmp(name,"HydrologyarmamaOrder")==0) return HydrologyarmamaOrderEnum;262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"HydrologyarmaMonthlyFactors")==0) return HydrologyarmaMonthlyFactorsEnum; 265 if (strcmp(name,"HydrologyarmamaOrder")==0) return HydrologyarmamaOrderEnum; 266 else if (strcmp(name,"HydrologyarmaMonthlyFactors")==0) return HydrologyarmaMonthlyFactorsEnum; 266 267 else if (strcmp(name,"HydrologyarmaNumBreaks")==0) return HydrologyarmaNumBreaksEnum; 267 268 else if (strcmp(name,"HydrologyarmaNumParams")==0) return HydrologyarmaNumParamsEnum; … … 345 346 else if (strcmp(name,"InversionStopFlag")==0) return InversionStopFlagEnum; 346 347 else if (strcmp(name,"InversionType")==0) return InversionTypeEnum; 348 else if (strcmp(name,"IoConstant")==0) return IoConstantEnum; 347 349 else if (strcmp(name,"Ivins")==0) return IvinsEnum; 348 350 else if (strcmp(name,"IsSlcCoupling")==0) return IsSlcCouplingEnum; … … 381 383 else if (strcmp(name,"LoveHypergeomNZ")==0) return LoveHypergeomNZEnum; 382 384 else if (strcmp(name,"LoveHypergeomNAlpha")==0) return LoveHypergeomNAlphaEnum; 383 else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;384 else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; 388 if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum; 389 else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum; 390 else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; 389 391 else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum; 390 392 else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum; … … 504 506 else if (strcmp(name,"SealevelchangePolarMotionTransferFunctionOrthogonal")==0) return SealevelchangePolarMotionTransferFunctionOrthogonalEnum; 505 507 else if (strcmp(name,"SealevelchangePolarMotionTransferFunctionZ")==0) return SealevelchangePolarMotionTransferFunctionZEnum; 506 else if (strcmp(name,"SealevelchangeTidalK2")==0) return SealevelchangeTidalK2Enum;507 else if (strcmp(name,"SealevelchangeTidalH2")==0) return SealevelchangeTidalH2Enum;508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"SealevelchangeTidalL2")==0) return SealevelchangeTidalL2Enum; 511 if (strcmp(name,"SealevelchangeTidalK2")==0) return SealevelchangeTidalK2Enum; 512 else if (strcmp(name,"SealevelchangeTidalH2")==0) return SealevelchangeTidalH2Enum; 513 else if (strcmp(name,"SealevelchangeTidalL2")==0) return SealevelchangeTidalL2Enum; 512 514 else if (strcmp(name,"SolidearthSettingsSealevelLoading")==0) return SolidearthSettingsSealevelLoadingEnum; 513 515 else if (strcmp(name,"SolidearthSettingsGRD")==0) return SolidearthSettingsGRDEnum; … … 627 629 else if (strcmp(name,"SmbSemicTauA")==0) return SmbSemicTauAEnum; 628 630 else if (strcmp(name,"SmbSemicTauF")==0) return SmbSemicTauFEnum; 629 else if (strcmp(name,"SmbSemicTmin")==0) return SmbSemicTminEnum;630 else if (strcmp(name,"SmbSemicTmid")==0) return SmbSemicTmidEnum;631 631 else stage=6; 632 632 } 633 633 if(stage==6){ 634 if (strcmp(name,"SmbSemicTmax")==0) return SmbSemicTmaxEnum; 634 if (strcmp(name,"SmbSemicTmin")==0) return SmbSemicTminEnum; 635 else if (strcmp(name,"SmbSemicTmid")==0) return SmbSemicTmidEnum; 636 else if (strcmp(name,"SmbSemicTmax")==0) return SmbSemicTmaxEnum; 635 637 else if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum; 636 638 else if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum; … … 750 752 else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; 751 753 else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum; 752 else if (strcmp(name,"BasalforcingsGroundediceMeltingRateObs")==0) return BasalforcingsGroundediceMeltingRateObsEnum;753 else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum;754 754 else stage=7; 755 755 } 756 756 if(stage==7){ 757 if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; 757 if (strcmp(name,"BasalforcingsGroundediceMeltingRateObs")==0) return BasalforcingsGroundediceMeltingRateObsEnum; 758 else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum; 759 else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; 758 760 else if (strcmp(name,"BasalforcingsSpatialDeepwaterElevation")==0) return BasalforcingsSpatialDeepwaterElevationEnum; 759 761 else if (strcmp(name,"BasalforcingsSpatialDeepwaterMeltingRate")==0) return BasalforcingsSpatialDeepwaterMeltingRateEnum; … … 873 875 else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum; 874 876 else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum; 875 else if (strcmp(name,"FrictionK")==0) return FrictionKEnum;876 else if (strcmp(name,"FrictionM")==0) return FrictionMEnum;877 877 else stage=8; 878 878 } 879 879 if(stage==8){ 880 if (strcmp(name,"FrictionP")==0) return FrictionPEnum; 880 if (strcmp(name,"FrictionK")==0) return FrictionKEnum; 881 else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; 882 else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; 881 883 else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum; 882 884 else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; … … 891 893 else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum; 892 894 else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; 893 else if (strcmp(name,"GroundinglineIntrusionDistance")==0) return GroundinglineIntrusionDistanceEnum;894 895 else if (strcmp(name,"NGia")==0) return NGiaEnum; 895 896 else if (strcmp(name,"NGiaRate")==0) return NGiaRateEnum; … … 949 950 else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; 950 951 else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; 951 else if (strcmp(name,"IntrusionMelt")==0) return IntrusionMeltEnum;952 952 else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum; 953 953 else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum; … … 1786 1786 else if (strcmp(name,"SubelementFriction1")==0) return SubelementFriction1Enum; 1787 1787 else if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum; 1788 else if (strcmp(name,"IntrusionMelt")==0) return IntrusionMeltEnum; 1788 1789 else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum; 1789 1790 else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum;
Note:
See TracChangeset
for help on using the changeset viewer.
