Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 23861)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 23862)
@@ -506,4 +506,7 @@
 	EsaNmotionEnum,
 	EsaUmotionEnum,
+	EsaStrainratexxEnum,
+	EsaStrainratexyEnum,
+	EsaStrainrateyyEnum,
 	EsaXmotionEnum,
 	EsaYmotionEnum,
@@ -573,4 +576,6 @@
 	MaskIceLevelsetEnum,
 	MasstransportSpcthicknessEnum,
+	MaskLandLevelsetEnum,
+	MaskOceanLevelsetEnum,
 	MaterialsRheologyBbarEnum,
 	MaterialsRheologyBEnum,
@@ -848,7 +853,4 @@
 	EsaRotationrateEnum,
 	EsaSolutionEnum,
-	EsaStrainratexxEnum,
-	EsaStrainratexyEnum,
-	EsaStrainrateyyEnum,
 	EsaTransitionsEnum,
 	ExternalResultEnum,
@@ -944,6 +946,4 @@
 	LoveSolutionEnum,
 	MantlePlumeGeothermalFluxEnum,
-	MaskLandLevelsetEnum,
-	MaskOceanLevelsetEnum,
 	MassconaxpbyEnum,
 	MassconEnum,
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 23861)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 23862)
@@ -512,4 +512,7 @@
 		case EsaNmotionEnum : return "EsaNmotion";
 		case EsaUmotionEnum : return "EsaUmotion";
+		case EsaStrainratexxEnum : return "EsaStrainratexx";
+		case EsaStrainratexyEnum : return "EsaStrainratexy";
+		case EsaStrainrateyyEnum : return "EsaStrainrateyy";
 		case EsaXmotionEnum : return "EsaXmotion";
 		case EsaYmotionEnum : return "EsaYmotion";
@@ -579,4 +582,6 @@
 		case MaskIceLevelsetEnum : return "MaskIceLevelset";
 		case MasstransportSpcthicknessEnum : return "MasstransportSpcthickness";
+		case MaskLandLevelsetEnum : return "MaskLandLevelset";
+		case MaskOceanLevelsetEnum : return "MaskOceanLevelset";
 		case MaterialsRheologyBbarEnum : return "MaterialsRheologyBbar";
 		case MaterialsRheologyBEnum : return "MaterialsRheologyB";
@@ -852,7 +857,4 @@
 		case EsaRotationrateEnum : return "EsaRotationrate";
 		case EsaSolutionEnum : return "EsaSolution";
-		case EsaStrainratexxEnum : return "EsaStrainratexx";
-		case EsaStrainratexyEnum : return "EsaStrainratexy";
-		case EsaStrainrateyyEnum : return "EsaStrainrateyy";
 		case EsaTransitionsEnum : return "EsaTransitions";
 		case ExternalResultEnum : return "ExternalResult";
@@ -948,6 +950,4 @@
 		case LoveSolutionEnum : return "LoveSolution";
 		case MantlePlumeGeothermalFluxEnum : return "MantlePlumeGeothermalFlux";
-		case MaskLandLevelsetEnum : return "MaskLandLevelset";
-		case MaskOceanLevelsetEnum : return "MaskOceanLevelset";
 		case MassconaxpbyEnum : return "Massconaxpby";
 		case MassconEnum : return "Masscon";
Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 23861)
+++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 23862)
@@ -524,4 +524,7 @@
 	      else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
 	      else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum;
+	      else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
+	      else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
+	      else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum;
 	      else if (strcmp(name,"EsaXmotion")==0) return EsaXmotionEnum;
 	      else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum;
@@ -591,4 +594,6 @@
 	      else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum;
 	      else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum;
+	      else if (strcmp(name,"MaskLandLevelset")==0) return MaskLandLevelsetEnum;
+	      else if (strcmp(name,"MaskOceanLevelset")==0) return MaskOceanLevelsetEnum;
 	      else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
 	      else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
@@ -624,13 +629,13 @@
 	      else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
 	      else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
-	      else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
+         else stage=6;
+   }
+   if(stage==6){
+	      if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
 	      else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
 	      else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
 	      else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
 	      else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
-         else stage=6;
-   }
-   if(stage==6){
-	      if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
+	      else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
 	      else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
 	      else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
@@ -747,13 +752,13 @@
 	      else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
 	      else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
-	      else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
+         else stage=7;
+   }
+   if(stage==7){
+	      if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
 	      else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
 	      else if (strcmp(name,"Surface")==0) return SurfaceEnum;
 	      else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
 	      else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
-         else stage=7;
-   }
-   if(stage==7){
-	      if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
+	      else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
 	      else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
 	      else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
@@ -870,13 +875,10 @@
 	      else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
 	      else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
-	      else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
-	      else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
-	      else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum;
-	      else if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
-	      else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
          else stage=8;
    }
    if(stage==8){
-	      if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
+	      if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
+	      else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
+	      else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
 	      else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
 	      else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
@@ -969,6 +971,4 @@
 	      else if (strcmp(name,"LoveSolution")==0) return LoveSolutionEnum;
 	      else if (strcmp(name,"MantlePlumeGeothermalFlux")==0) return MantlePlumeGeothermalFluxEnum;
-	      else if (strcmp(name,"MaskLandLevelset")==0) return MaskLandLevelsetEnum;
-	      else if (strcmp(name,"MaskOceanLevelset")==0) return MaskOceanLevelsetEnum;
 	      else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
 	      else if (strcmp(name,"Masscon")==0) return MassconEnum;