Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24446) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24447) @@ -5446,27 +5446,22 @@ IssmDouble pc1,pc2,pc3,pc4; - GetInputListOnVertices(&eof1[0],SealevelriseModeleoftrendEof1Enum); - GetInputListOnVertices(&eof2[0],SealevelriseModeleoftrendEof2Enum); - GetInputListOnVertices(&eof3[0],SealevelriseModeleoftrendEof3Enum); - GetInputListOnVertices(&eof4[0],SealevelriseModeleoftrendEof4Enum); - - Input2* pc1_input = inputs2->GetInput(SealevelriseModeleoftrendPc1Enum); _assert_(pc1_input); - Input2* pc2_input = inputs2->GetInput(SealevelriseModeleoftrendPc2Enum); _assert_(pc2_input); - Input2* pc3_input = inputs2->GetInput(SealevelriseModeleoftrendPc3Enum); _assert_(pc3_input); - Input2* pc4_input = inputs2->GetInput(SealevelriseModeleoftrendPc4Enum); _assert_(pc4_input); - - pc1_input->GetInputValue(&pc1); - pc2_input->GetInputValue(&pc2); - pc3_input->GetInputValue(&pc3); - pc4_input->GetInputValue(&pc4); + Element::GetInputListOnVertices(&eof1[0],SealevelriseModeleoftrendEof1Enum); + Element::GetInputListOnVertices(&eof2[0],SealevelriseModeleoftrendEof2Enum); + Element::GetInputListOnVertices(&eof3[0],SealevelriseModeleoftrendEof3Enum); + Element::GetInputListOnVertices(&eof4[0],SealevelriseModeleoftrendEof4Enum); + + Element::GetInputValue(&pc1,SealevelriseModeleoftrendPc1Enum); + Element::GetInputValue(&pc2,SealevelriseModeleoftrendPc2Enum); + Element::GetInputValue(&pc3,SealevelriseModeleoftrendPc3Enum); + Element::GetInputValue(&pc4,SealevelriseModeleoftrendPc4Enum); for (int i=0;i<4;i++)steric_rate[i]=pc1*eof1[i]+pc2*eof2[i]+pc3*eof3[i]+pc4*eof4[i]; /*upate input: */ - this->inputs2->AddInput2(new TriaInput(SealevelriseStericRateEnum,&steric_rate[0],P1Enum)); - - }else{ - - + this->AddInput2(SealevelriseStericRateEnum,&steric_rate[0],P1Enum); + + } + else{ + _error_("not supported??"); } } Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24446) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24447) @@ -668,4 +668,12 @@ syn keyword cConstant SealevelriseStericRateEnum syn keyword cConstant SealevelriseHydroRateEnum +syn keyword cConstant SealevelriseModeleoftrendEof1Enum +syn keyword cConstant SealevelriseModeleoftrendEof2Enum +syn keyword cConstant SealevelriseModeleoftrendEof3Enum +syn keyword cConstant SealevelriseModeleoftrendEof4Enum +syn keyword cConstant SealevelriseModeleoftrendPc1Enum +syn keyword cConstant SealevelriseModeleoftrendPc2Enum +syn keyword cConstant SealevelriseModeleoftrendPc3Enum +syn keyword cConstant SealevelriseModeleoftrendPc4Enum syn keyword cConstant SedimentHeadEnum syn keyword cConstant SedimentHeadOldEnum @@ -1302,4 +1310,6 @@ syn keyword cConstant NearestInterpEnum syn keyword cConstant OutputdefinitionListEnum +syn keyword cConstant QmuOutputEnum +syn keyword cConstant QmuCurrEvalIdEnum syn keyword cConstant SealevelObsEnum syn keyword cConstant SealevelWeightsEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24446) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24447) @@ -664,4 +664,12 @@ SealevelriseStericRateEnum, SealevelriseHydroRateEnum, + SealevelriseModeleoftrendEof1Enum, + SealevelriseModeleoftrendEof2Enum, + SealevelriseModeleoftrendEof3Enum, + SealevelriseModeleoftrendEof4Enum, + SealevelriseModeleoftrendPc1Enum, + SealevelriseModeleoftrendPc2Enum, + SealevelriseModeleoftrendPc3Enum, + SealevelriseModeleoftrendPc4Enum, SedimentHeadEnum, SedimentHeadOldEnum, @@ -1302,4 +1310,6 @@ NearestInterpEnum, OutputdefinitionListEnum, + QmuOutputEnum, + QmuCurrEvalIdEnum, SealevelObsEnum, SealevelWeightsEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24446) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24447) @@ -670,4 +670,12 @@ case SealevelriseStericRateEnum : return "SealevelriseStericRate"; case SealevelriseHydroRateEnum : return "SealevelriseHydroRate"; + case SealevelriseModeleoftrendEof1Enum : return "SealevelriseModeleoftrendEof1"; + case SealevelriseModeleoftrendEof2Enum : return "SealevelriseModeleoftrendEof2"; + case SealevelriseModeleoftrendEof3Enum : return "SealevelriseModeleoftrendEof3"; + case SealevelriseModeleoftrendEof4Enum : return "SealevelriseModeleoftrendEof4"; + case SealevelriseModeleoftrendPc1Enum : return "SealevelriseModeleoftrendPc1"; + case SealevelriseModeleoftrendPc2Enum : return "SealevelriseModeleoftrendPc2"; + case SealevelriseModeleoftrendPc3Enum : return "SealevelriseModeleoftrendPc3"; + case SealevelriseModeleoftrendPc4Enum : return "SealevelriseModeleoftrendPc4"; case SedimentHeadEnum : return "SedimentHead"; case SedimentHeadOldEnum : return "SedimentHeadOld"; @@ -1304,4 +1312,6 @@ case NearestInterpEnum : return "NearestInterp"; case OutputdefinitionListEnum : return "OutputdefinitionList"; + case QmuOutputEnum : return "QmuOutput"; + case QmuCurrEvalIdEnum : return "QmuCurrEvalId"; case SealevelObsEnum : return "SealevelObs"; case SealevelWeightsEnum : return "SealevelWeights"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24446) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24447) @@ -685,4 +685,12 @@ else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum; else if (strcmp(name,"SealevelriseHydroRate")==0) return SealevelriseHydroRateEnum; + else if (strcmp(name,"SealevelriseModeleoftrendEof1")==0) return SealevelriseModeleoftrendEof1Enum; + else if (strcmp(name,"SealevelriseModeleoftrendEof2")==0) return SealevelriseModeleoftrendEof2Enum; + else if (strcmp(name,"SealevelriseModeleoftrendEof3")==0) return SealevelriseModeleoftrendEof3Enum; + else if (strcmp(name,"SealevelriseModeleoftrendEof4")==0) return SealevelriseModeleoftrendEof4Enum; + else if (strcmp(name,"SealevelriseModeleoftrendPc1")==0) return SealevelriseModeleoftrendPc1Enum; + else if (strcmp(name,"SealevelriseModeleoftrendPc2")==0) return SealevelriseModeleoftrendPc2Enum; + else if (strcmp(name,"SealevelriseModeleoftrendPc3")==0) return SealevelriseModeleoftrendPc3Enum; + else if (strcmp(name,"SealevelriseModeleoftrendPc4")==0) return SealevelriseModeleoftrendPc4Enum; else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum; else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum; @@ -744,5 +752,8 @@ else if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum; else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum; - else if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum; else if (strcmp(name,"SmbP")==0) return SmbPEnum; else if (strcmp(name,"SmbPddfacIce")==0) return SmbPddfacIceEnum; @@ -752,8 +763,5 @@ else if (strcmp(name,"SmbPrecipitationsLgm")==0) return SmbPrecipitationsLgmEnum; else if (strcmp(name,"SmbPrecipitationsPresentday")==0) return SmbPrecipitationsPresentdayEnum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"SmbPrecipitationsReconstructed")==0) return SmbPrecipitationsReconstructedEnum; + else if (strcmp(name,"SmbPrecipitationsReconstructed")==0) return SmbPrecipitationsReconstructedEnum; else if (strcmp(name,"SmbRe")==0) return SmbReEnum; else if (strcmp(name,"SmbRefreeze")==0) return SmbRefreezeEnum; @@ -867,5 +875,8 @@ else if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum; else if (strcmp(name,"Outputdefinition25")==0) return Outputdefinition25Enum; - else if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum; else if (strcmp(name,"Outputdefinition27")==0) return Outputdefinition27Enum; else if (strcmp(name,"Outputdefinition28")==0) return Outputdefinition28Enum; @@ -875,8 +886,5 @@ else if (strcmp(name,"Outputdefinition31")==0) return Outputdefinition31Enum; else if (strcmp(name,"Outputdefinition32")==0) return Outputdefinition32Enum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"Outputdefinition33")==0) return Outputdefinition33Enum; + else if (strcmp(name,"Outputdefinition33")==0) return Outputdefinition33Enum; else if (strcmp(name,"Outputdefinition34")==0) return Outputdefinition34Enum; else if (strcmp(name,"Outputdefinition35")==0) return Outputdefinition35Enum; @@ -990,5 +998,8 @@ else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum; else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum; - else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum; else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum; else if (strcmp(name,"Cfsurfacesquare")==0) return CfsurfacesquareEnum; @@ -998,8 +1009,5 @@ else if (strcmp(name,"Closed")==0) return ClosedEnum; else if (strcmp(name,"Colinear")==0) return ColinearEnum; - else stage=9; - } - if(stage==9){ - if (strcmp(name,"Constraints")==0) return ConstraintsEnum; + else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; else if (strcmp(name,"Contact")==0) return ContactEnum; else if (strcmp(name,"Contour")==0) return ContourEnum; @@ -1113,5 +1121,8 @@ else if (strcmp(name,"SegInput2")==0) return SegInput2Enum; else if (strcmp(name,"TriaInput2")==0) return TriaInput2Enum; - else if (strcmp(name,"PentaInput2")==0) return PentaInput2Enum; + else stage=10; + } + if(stage==10){ + if (strcmp(name,"PentaInput2")==0) return PentaInput2Enum; else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum; else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum; @@ -1121,8 +1132,5 @@ else if (strcmp(name,"Internal")==0) return InternalEnum; else if (strcmp(name,"Intersect")==0) return IntersectEnum; - else stage=10; - } - if(stage==10){ - if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum; + else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum; else if (strcmp(name,"J")==0) return JEnum; else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum; @@ -1236,5 +1244,8 @@ else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum; else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum; - else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum; + else stage=11; + } + if(stage==11){ + if (strcmp(name,"SMBgemb")==0) return SMBgembEnum; else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum; else if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum; @@ -1244,8 +1255,5 @@ else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum; else if (strcmp(name,"SMBpddSicopolis")==0) return SMBpddSicopolisEnum; - else stage=11; - } - if(stage==11){ - if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum; + else if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum; else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum; @@ -1334,4 +1342,6 @@ else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum; + else if (strcmp(name,"QmuOutput")==0) return QmuOutputEnum; + else if (strcmp(name,"QmuCurrEvalId")==0) return QmuCurrEvalIdEnum; else if (strcmp(name,"SealevelObs")==0) return SealevelObsEnum; else if (strcmp(name,"SealevelWeights")==0) return SealevelWeightsEnum;