Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 23957)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 23958)
@@ -64,5 +64,10 @@
 	BasalforcingsEnum,
 	BasalforcingsIsmp6AverageTfEnum,
+	BasalforcingsIsmp6BasinAreaEnum,
+	BasalforcingsIsmp6DeltaTEnum,
+	BasalforcingsIsmp6Gamma0Enum,
 	BasalforcingsIsmp6IsLocalEnum,
+	BasalforcingsIsmp6NumBasinsEnum,
+	BasalforcingsIsmp6TfDepthsEnum,
 	BasalforcingsLowercrustheatEnum,
 	BasalforcingsMantleconductivityEnum,
@@ -426,9 +431,4 @@
 	VelocityEnum,
 	WorldCommEnum,
-   BasalforcingsIsmp6BasinAreaEnum,
-   BasalforcingsIsmp6DeltaTEnum,
-   BasalforcingsIsmp6Gamma0Enum,
-   BasalforcingsIsmp6NumBasinsEnum,
-   BasalforcingsIsmp6TfDepthsEnum,
 	/*}}}*/
 	ParametersENDEnum,
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 23957)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 23958)
@@ -72,5 +72,10 @@
 		case BasalforcingsEnum : return "Basalforcings";
 		case BasalforcingsIsmp6AverageTfEnum : return "BasalforcingsIsmp6AverageTf";
+		case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea";
+		case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT";
+		case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0";
 		case BasalforcingsIsmp6IsLocalEnum : return "BasalforcingsIsmp6IsLocal";
+		case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins";
+		case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths";
 		case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat";
 		case BasalforcingsMantleconductivityEnum : return "BasalforcingsMantleconductivity";
@@ -434,9 +439,4 @@
 		case VelocityEnum : return "Velocity";
 		case WorldCommEnum : return "WorldComm";
-		case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea";
-		case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT";
-		case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0";
-		case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins";
-		case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths";
 		case ParametersENDEnum : return "ParametersEND";
 		case InputsSTARTEnum : return "InputsSTART";
Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 23957)
+++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 23958)
@@ -72,5 +72,10 @@
 	      else if (strcmp(name,"Basalforcings")==0) return BasalforcingsEnum;
 	      else if (strcmp(name,"BasalforcingsIsmp6AverageTf")==0) return BasalforcingsIsmp6AverageTfEnum;
+	      else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum;
+	      else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum;
+	      else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum;
 	      else if (strcmp(name,"BasalforcingsIsmp6IsLocal")==0) return BasalforcingsIsmp6IsLocalEnum;
+	      else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum;
+	      else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum;
 	      else if (strcmp(name,"BasalforcingsLowercrustheat")==0) return BasalforcingsLowercrustheatEnum;
 	      else if (strcmp(name,"BasalforcingsMantleconductivity")==0) return BasalforcingsMantleconductivityEnum;
@@ -132,13 +137,13 @@
 	      else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
 	      else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
-	      else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
+         else stage=2;
+   }
+   if(stage==2){
+	      if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
 	      else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum;
 	      else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum;
 	      else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum;
 	      else if (strcmp(name,"FlowequationIsL1L2")==0) return FlowequationIsL1L2Enum;
-         else stage=2;
-   }
-   if(stage==2){
-	      if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
+	      else if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
 	      else if (strcmp(name,"FlowequationIsSSA")==0) return FlowequationIsSSAEnum;
 	      else if (strcmp(name,"FrictionCoupling")==0) return FrictionCouplingEnum;
@@ -255,13 +260,13 @@
 	      else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
 	      else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
-	      else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
+         else stage=3;
+   }
+   if(stage==3){
+	      if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
 	      else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
 	      else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum;
 	      else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
 	      else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
-         else stage=3;
-   }
-   if(stage==3){
-	      if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum;
+	      else if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum;
 	      else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
 	      else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
@@ -378,13 +383,13 @@
 	      else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum;
 	      else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum;
-	      else if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum;
+         else stage=4;
+   }
+   if(stage==4){
+	      if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum;
 	      else if (strcmp(name,"SmoothThicknessMultiplier")==0) return SmoothThicknessMultiplierEnum;
 	      else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
 	      else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
 	      else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
-         else stage=4;
-   }
-   if(stage==4){
-	      if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
+	      else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
 	      else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
 	      else if (strcmp(name,"Step")==0) return StepEnum;
@@ -443,9 +448,4 @@
 	      else if (strcmp(name,"Velocity")==0) return VelocityEnum;
 	      else if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
-	      else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum;
-	      else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum;
-	      else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum;
-	      else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum;
-	      else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum;
 	      else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum;
 	      else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum;