Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp	(revision 27284)
@@ -135,5 +135,5 @@
          }
          else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
-            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
+            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
          }
 			break;
Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp	(revision 27284)
@@ -150,5 +150,5 @@
 		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:
Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp	(revision 27284)
@@ -225,5 +225,5 @@
 			}
 			else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
-				iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
+				iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
 			}
 			break;
Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp	(revision 27284)
@@ -863,5 +863,5 @@
       	   }
       	   else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
-      	      iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
+      	      iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
       	   }
 				break;
Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp	(revision 27284)
@@ -165,5 +165,5 @@
          }
          else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
-            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
+            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
          }
 			break;
Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 27284)
@@ -86,5 +86,5 @@
          basinenum_type = FrontalForcingsBasinIdEnum;
          noiseenum_type = ThermalforcingARMANoiseEnum;
-         outenum_type   = FrontalForcingsAndBasalforcingsThermalForcingEnum;
+         outenum_type   = ThermalForcingEnum;
          break;
 		case(BasalforcingsDeepwaterMeltingRatearmaEnum):
@@ -195,5 +195,5 @@
          basinenum_type = FrontalForcingsBasinIdEnum;
          noiseenum_type = ThermalforcingARMANoiseEnum;
-         outenum_type   = FrontalForcingsAndBasalforcingsThermalForcingEnum;
+         outenum_type   = ThermalForcingEnum;
          break;
 		case(BasalforcingsDeepwaterMeltingRatearmaEnum):
@@ -2805,5 +2805,5 @@
 	}
 	else{
-		this->GetInputListOnVertices(oceanthermalforcing,FrontalForcingsAndBasalforcingsThermalForcingEnum);
+		this->GetInputListOnVertices(oceanthermalforcing,ThermalForcingEnum);
 	}
 
@@ -3814,5 +3814,5 @@
 	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);
Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 27283)
+++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 27284)
@@ -776,5 +776,4 @@
 syn keyword cConstant FrontalForcingsBasinIdEnum
 syn keyword cConstant FrontalForcingsSubglacialDischargeEnum
-syn keyword cConstant FrontalForcingsAndBasalforcingsThermalForcingEnum
 syn keyword cConstant GeometryHydrostaticRatioEnum
 syn keyword cConstant NGiaEnum
@@ -1106,4 +1105,5 @@
 syn keyword cConstant TemperatureSEMICEnum
 syn keyword cConstant ThermalforcingARMANoiseEnum
+syn keyword cConstant ThermalForcingEnum
 syn keyword cConstant ThermalforcingValuesAutoregressionEnum
 syn keyword cConstant ThermalforcingValuesMovingaverageEnum
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 27283)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 27284)
@@ -772,5 +772,4 @@
 	FrontalForcingsBasinIdEnum,
 	FrontalForcingsSubglacialDischargeEnum,
-	FrontalForcingsAndBasalforcingsThermalForcingEnum,
 	GeometryHydrostaticRatioEnum,
 	NGiaEnum,
@@ -1103,4 +1102,5 @@
 	TemperatureSEMICEnum,
    ThermalforcingARMANoiseEnum,
+	ThermalForcingEnum,
 	ThermalforcingValuesAutoregressionEnum,
 	ThermalforcingValuesMovingaverageEnum,
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 27284)
@@ -778,5 +778,4 @@
 		case FrontalForcingsBasinIdEnum : return "FrontalForcingsBasinId";
 		case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge";
-		case FrontalForcingsAndBasalforcingsThermalForcingEnum : return "FrontalForcingsAndBasalforcingsThermalForcing";
 		case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
 		case NGiaEnum : return "NGia";
@@ -1108,4 +1107,5 @@
 		case TemperatureSEMICEnum : return "TemperatureSEMIC";
 		case ThermalforcingARMANoiseEnum : return "ThermalforcingARMANoise";
+		case ThermalForcingEnum : return "ThermalForcing";
 		case ThermalforcingValuesAutoregressionEnum : return "ThermalforcingValuesAutoregression";
 		case ThermalforcingValuesMovingaverageEnum : return "ThermalforcingValuesMovingaverage";
Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim	(revision 27283)
+++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim	(revision 27284)
@@ -769,5 +769,4 @@
 syn keyword juliaConstC FrontalForcingsBasinIdEnum
 syn keyword juliaConstC FrontalForcingsSubglacialDischargeEnum
-syn keyword juliaConstC FrontalForcingsAndBasalforcingsThermalForcingEnum
 syn keyword juliaConstC GeometryHydrostaticRatioEnum
 syn keyword juliaConstC NGiaEnum
@@ -1099,4 +1098,5 @@
 syn keyword juliaConstC TemperatureSEMICEnum
 syn keyword juliaConstC ThermalforcingARMANoiseEnum
+syn keyword juliaConstC ThermalForcingEnum
 syn keyword juliaConstC ThermalforcingValuesAutoregressionEnum
 syn keyword juliaConstC ThermalforcingValuesMovingaverageEnum
Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 27283)
+++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 27284)
@@ -796,5 +796,4 @@
 	      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;
@@ -875,9 +874,9 @@
 	      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;
@@ -998,9 +997,9 @@
 	      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;
@@ -1121,9 +1120,9 @@
 	      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;
@@ -1135,4 +1134,5 @@
 	      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;