Index: ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 27283) +++ ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 27284) @@ -134,7 +134,7 @@ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum); } else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){ - iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum); + iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum); } break; default: Index: ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 27283) +++ ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 27284) @@ -224,7 +224,7 @@ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum); } else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){ - iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum); + iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum); } break; case LinearFloatingMeltRatearmaEnum: Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 27283) +++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 27284) @@ -862,7 +862,7 @@ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum); } else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){ - iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum); + iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum); } break; default: Index: ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 27283) +++ ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 27284) @@ -164,7 +164,7 @@ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum); } else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){ - iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum); + iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum); } break; default: Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 27283) +++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 27284) @@ -149,7 +149,7 @@ break; case FrontalForcingsRignotEnum: /*Retrieve thermal forcing only in the case of non-arma FrontalForcingsRignot*/ - iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum); + iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.thermalforcing",ThermalForcingEnum); /* Do not break here, still retrieve basin_ID,subglacial_discharge, etc.*/ case FrontalForcingsRignotarmaEnum: iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.basin_id",FrontalForcingsBasinIdEnum); Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 27283) +++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 27284) @@ -85,7 +85,7 @@ maenum_type = ThermalforcingValuesMovingaverageEnum; basinenum_type = FrontalForcingsBasinIdEnum; noiseenum_type = ThermalforcingARMANoiseEnum; - outenum_type = FrontalForcingsAndBasalforcingsThermalForcingEnum; + outenum_type = ThermalForcingEnum; break; case(BasalforcingsDeepwaterMeltingRatearmaEnum): arenum_type = BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum; @@ -194,7 +194,7 @@ arenum_type = ThermalforcingValuesAutoregressionEnum; basinenum_type = FrontalForcingsBasinIdEnum; noiseenum_type = ThermalforcingARMANoiseEnum; - outenum_type = FrontalForcingsAndBasalforcingsThermalForcingEnum; + outenum_type = ThermalForcingEnum; break; case(BasalforcingsDeepwaterMeltingRatearmaEnum): arenum_type = BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum; @@ -2804,7 +2804,7 @@ this->GetInputListOnVertices(oceantemp,BasalforcingsOceanTempEnum); } else{ - this->GetInputListOnVertices(oceanthermalforcing,FrontalForcingsAndBasalforcingsThermalForcingEnum); + this->GetInputListOnVertices(oceanthermalforcing,ThermalForcingEnum); } Gauss* gauss=this->NewGauss(); @@ -3813,7 +3813,7 @@ this->GetInputValue(&basinid,FrontalForcingsBasinIdEnum); Input* bed_input = this->GetInput(BedEnum); _assert_(bed_input); Input* qsg_input = this->GetInput(FrontalForcingsSubglacialDischargeEnum); _assert_(qsg_input); - Input* TF_input = this->GetInput(FrontalForcingsAndBasalforcingsThermalForcingEnum); _assert_(TF_input); + Input* TF_input = this->GetInput(ThermalForcingEnum); _assert_(TF_input); this->FindParam(&yts, ConstantsYtsEnum); this->parameters->FindParam(&numbasins,FrontalForcingsNumberofBasinsEnum); Index: ../trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- ../trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27283) +++ ../trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27284) @@ -775,7 +775,6 @@ syn keyword cConstant FrictionfEnum syn keyword cConstant FrontalForcingsBasinIdEnum syn keyword cConstant FrontalForcingsSubglacialDischargeEnum -syn keyword cConstant FrontalForcingsAndBasalforcingsThermalForcingEnum syn keyword cConstant GeometryHydrostaticRatioEnum syn keyword cConstant NGiaEnum syn keyword cConstant NGiaRateEnum @@ -1105,6 +1104,7 @@ syn keyword cConstant TemperaturePicardEnum syn keyword cConstant TemperatureSEMICEnum syn keyword cConstant ThermalforcingARMANoiseEnum +syn keyword cConstant ThermalForcingEnum syn keyword cConstant ThermalforcingValuesAutoregressionEnum syn keyword cConstant ThermalforcingValuesMovingaverageEnum syn keyword cConstant ThermalSpctemperatureEnum Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27283) +++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27284) @@ -771,7 +771,6 @@ FrictionfEnum, FrontalForcingsBasinIdEnum, FrontalForcingsSubglacialDischargeEnum, - FrontalForcingsAndBasalforcingsThermalForcingEnum, GeometryHydrostaticRatioEnum, NGiaEnum, NGiaRateEnum, @@ -1102,6 +1101,7 @@ TemperaturePicardEnum, TemperatureSEMICEnum, ThermalforcingARMANoiseEnum, + ThermalForcingEnum, ThermalforcingValuesAutoregressionEnum, ThermalforcingValuesMovingaverageEnum, ThermalSpctemperatureEnum, Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27283) +++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27284) @@ -777,7 +777,6 @@ case FrictionfEnum : return "Frictionf"; case FrontalForcingsBasinIdEnum : return "FrontalForcingsBasinId"; case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge"; - case FrontalForcingsAndBasalforcingsThermalForcingEnum : return "FrontalForcingsAndBasalforcingsThermalForcing"; case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio"; case NGiaEnum : return "NGia"; case NGiaRateEnum : return "NGiaRate"; @@ -1107,6 +1106,7 @@ case TemperaturePicardEnum : return "TemperaturePicard"; case TemperatureSEMICEnum : return "TemperatureSEMIC"; case ThermalforcingARMANoiseEnum : return "ThermalforcingARMANoise"; + case ThermalForcingEnum : return "ThermalForcing"; case ThermalforcingValuesAutoregressionEnum : return "ThermalforcingValuesAutoregression"; case ThermalforcingValuesMovingaverageEnum : return "ThermalforcingValuesMovingaverage"; case ThermalSpctemperatureEnum : return "ThermalSpctemperature"; Index: ../trunk-jpl/src/c/shared/Enum/Enumjl.vim =================================================================== --- ../trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27283) +++ ../trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27284) @@ -768,7 +768,6 @@ syn keyword juliaConstC FrictionfEnum syn keyword juliaConstC FrontalForcingsBasinIdEnum syn keyword juliaConstC FrontalForcingsSubglacialDischargeEnum -syn keyword juliaConstC FrontalForcingsAndBasalforcingsThermalForcingEnum syn keyword juliaConstC GeometryHydrostaticRatioEnum syn keyword juliaConstC NGiaEnum syn keyword juliaConstC NGiaRateEnum @@ -1098,6 +1097,7 @@ syn keyword juliaConstC TemperaturePicardEnum syn keyword juliaConstC TemperatureSEMICEnum syn keyword juliaConstC ThermalforcingARMANoiseEnum +syn keyword juliaConstC ThermalForcingEnum syn keyword juliaConstC ThermalforcingValuesAutoregressionEnum syn keyword juliaConstC ThermalforcingValuesMovingaverageEnum syn keyword juliaConstC ThermalSpctemperatureEnum Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27283) +++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27284) @@ -795,7 +795,6 @@ else if (strcmp(name,"Frictionf")==0) return FrictionfEnum; else if (strcmp(name,"FrontalForcingsBasinId")==0) return FrontalForcingsBasinIdEnum; else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum; - else if (strcmp(name,"FrontalForcingsAndBasalforcingsThermalForcing")==0) return FrontalForcingsAndBasalforcingsThermalForcingEnum; else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; else if (strcmp(name,"NGia")==0) return NGiaEnum; else if (strcmp(name,"NGiaRate")==0) return NGiaRateEnum; @@ -874,11 +873,11 @@ else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; else if (strcmp(name,"Misfit")==0) return MisfitEnum; else if (strcmp(name,"MovingFrontalVx")==0) return MovingFrontalVxEnum; + else if (strcmp(name,"MovingFrontalVy")==0) return MovingFrontalVyEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"MovingFrontalVy")==0) return MovingFrontalVyEnum; - else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; + if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; else if (strcmp(name,"NewDamage")==0) return NewDamageEnum; else if (strcmp(name,"Node")==0) return NodeEnum; else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum; @@ -997,11 +996,11 @@ else if (strcmp(name,"SmbCcsnowValue")==0) return SmbCcsnowValueEnum; else if (strcmp(name,"SmbCciceValue")==0) return SmbCciceValueEnum; else if (strcmp(name,"SmbCotValue")==0) return SmbCotValueEnum; + else if (strcmp(name,"SmbD")==0) return SmbDEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"SmbD")==0) return SmbDEnum; - else if (strcmp(name,"SmbDailyairdensity")==0) return SmbDailyairdensityEnum; + if (strcmp(name,"SmbDailyairdensity")==0) return SmbDailyairdensityEnum; else if (strcmp(name,"SmbDailyairhumidity")==0) return SmbDailyairhumidityEnum; else if (strcmp(name,"SmbDailydlradiation")==0) return SmbDailydlradiationEnum; else if (strcmp(name,"SmbDailydsradiation")==0) return SmbDailydsradiationEnum; @@ -1120,11 +1119,11 @@ else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum; else if (strcmp(name,"Surface")==0) return SurfaceEnum; else if (strcmp(name,"SurfaceOld")==0) return SurfaceOldEnum; + else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; - else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; + if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum; else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; @@ -1134,6 +1133,7 @@ else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum; else if (strcmp(name,"ThermalforcingARMANoise")==0) return ThermalforcingARMANoiseEnum; + else if (strcmp(name,"ThermalForcing")==0) return ThermalForcingEnum; else if (strcmp(name,"ThermalforcingValuesAutoregression")==0) return ThermalforcingValuesAutoregressionEnum; else if (strcmp(name,"ThermalforcingValuesMovingaverage")==0) return ThermalforcingValuesMovingaverageEnum; else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;