Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 18879)
+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 18880)
@@ -494,9 +494,11 @@
 	MatrixParamEnum,
 	MassconEnum,
 	MassconNameEnum,
+	MassconDefinitionenumEnum,
 	MassconLevelsetEnum,
 	MassconaxpbyEnum,
 	MassconaxpbyNameEnum,
+	MassconaxpbyDefinitionenumEnum,
 	MassconaxpbyNamexEnum,
 	MassconaxpbyNameyEnum,
 	MassconaxpbyAlphaEnum,
@@ -670,11 +672,23 @@
 	/*}}}*/
 	/*Output Definitions{{{*/
 	OutputdefinitionEnum,
+	Outputdefinition1Enum,
+	Outputdefinition2Enum,
+	Outputdefinition3Enum,
+	Outputdefinition4Enum,
+	Outputdefinition5Enum,
+	Outputdefinition6Enum,
+	Outputdefinition7Enum,
+	Outputdefinition8Enum,
+	Outputdefinition9Enum,
+	Outputdefinition10Enum,
 	OutputdefinitionListEnum,
 	MassfluxatgateEnum,
 	MassfluxatgateNameEnum,
+	MassfluxatgateDefinitionenumEnum,
 	MassfluxatgateSegmentsEnum,
 	MisfitNameEnum,
+	MisfitDefinitionenumEnum,
 	MisfitModelEnumEnum,
 	MisfitObservationEnum,
 	MisfitObservationEnumEnum,
@@ -745,7 +759,10 @@
 	NodalEnum,
 	OldGradientEnum,
 	OutputFilePointerEnum,
+	ToolkitsFileNameEnum,
+	RootPathEnum,
 	OutputFileNameEnum,
+	InputFileNameEnum,
 	LockFileNameEnum,
 	ToolkitsOptionsAnalysesEnum,
 	ToolkitsOptionsStringsEnum,
Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 18879)
+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 18880)
@@ -491,9 +491,11 @@
 		case MatrixParamEnum : return "MatrixParam";
 		case MassconEnum : return "Masscon";
 		case MassconNameEnum : return "MassconName";
+		case MassconDefinitionenumEnum : return "MassconDefinitionenum";
 		case MassconLevelsetEnum : return "MassconLevelset";
 		case MassconaxpbyEnum : return "Massconaxpby";
 		case MassconaxpbyNameEnum : return "MassconaxpbyName";
+		case MassconaxpbyDefinitionenumEnum : return "MassconaxpbyDefinitionenum";
 		case MassconaxpbyNamexEnum : return "MassconaxpbyNamex";
 		case MassconaxpbyNameyEnum : return "MassconaxpbyNamey";
 		case MassconaxpbyAlphaEnum : return "MassconaxpbyAlpha";
@@ -655,11 +657,23 @@
 		case TimeEnum : return "Time";
 		case WaterColumnOldEnum : return "WaterColumnOld";
 		case OutputdefinitionEnum : return "Outputdefinition";
+		case Outputdefinition1Enum : return "Outputdefinition1";
+		case Outputdefinition2Enum : return "Outputdefinition2";
+		case Outputdefinition3Enum : return "Outputdefinition3";
+		case Outputdefinition4Enum : return "Outputdefinition4";
+		case Outputdefinition5Enum : return "Outputdefinition5";
+		case Outputdefinition6Enum : return "Outputdefinition6";
+		case Outputdefinition7Enum : return "Outputdefinition7";
+		case Outputdefinition8Enum : return "Outputdefinition8";
+		case Outputdefinition9Enum : return "Outputdefinition9";
+		case Outputdefinition10Enum : return "Outputdefinition10";
 		case OutputdefinitionListEnum : return "OutputdefinitionList";
 		case MassfluxatgateEnum : return "Massfluxatgate";
 		case MassfluxatgateNameEnum : return "MassfluxatgateName";
+		case MassfluxatgateDefinitionenumEnum : return "MassfluxatgateDefinitionenum";
 		case MassfluxatgateSegmentsEnum : return "MassfluxatgateSegments";
 		case MisfitNameEnum : return "MisfitName";
+		case MisfitDefinitionenumEnum : return "MisfitDefinitionenum";
 		case MisfitModelEnumEnum : return "MisfitModelEnum";
 		case MisfitObservationEnum : return "MisfitObservation";
 		case MisfitObservationEnumEnum : return "MisfitObservationEnum";
@@ -718,7 +732,10 @@
 		case NodalEnum : return "Nodal";
 		case OldGradientEnum : return "OldGradient";
 		case OutputFilePointerEnum : return "OutputFilePointer";
+		case ToolkitsFileNameEnum : return "ToolkitsFileName";
+		case RootPathEnum : return "RootPath";
 		case OutputFileNameEnum : return "OutputFileName";
+		case InputFileNameEnum : return "InputFileName";
 		case LockFileNameEnum : return "LockFileName";
 		case ToolkitsOptionsAnalysesEnum : return "ToolkitsOptionsAnalyses";
 		case ToolkitsOptionsStringsEnum : return "ToolkitsOptionsStrings";
Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 18879)
+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 18880)
@@ -500,15 +500,17 @@
 	      else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
 	      else if (strcmp(name,"Masscon")==0) return MassconEnum;
 	      else if (strcmp(name,"MassconName")==0) return MassconNameEnum;
+	      else if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum;
 	      else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum;
 	      else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
 	      else if (strcmp(name,"MassconaxpbyName")==0) return MassconaxpbyNameEnum;
-	      else if (strcmp(name,"MassconaxpbyNamex")==0) return MassconaxpbyNamexEnum;
-	      else if (strcmp(name,"MassconaxpbyNamey")==0) return MassconaxpbyNameyEnum;
+	      else if (strcmp(name,"MassconaxpbyDefinitionenum")==0) return MassconaxpbyDefinitionenumEnum;
          else stage=5;
    }
    if(stage==5){
-	      if (strcmp(name,"MassconaxpbyAlpha")==0) return MassconaxpbyAlphaEnum;
+	      if (strcmp(name,"MassconaxpbyNamex")==0) return MassconaxpbyNamexEnum;
+	      else if (strcmp(name,"MassconaxpbyNamey")==0) return MassconaxpbyNameyEnum;
+	      else if (strcmp(name,"MassconaxpbyAlpha")==0) return MassconaxpbyAlphaEnum;
 	      else if (strcmp(name,"MassconaxpbyBeta")==0) return MassconaxpbyBetaEnum;
 	      else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
 	      else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
@@ -626,12 +628,12 @@
 	      else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
 	      else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
 	      else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
-	      else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
-	      else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
          else stage=6;
    }
    if(stage==6){
-	      if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
+	      if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
+	      else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
+	      else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
 	      else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
 	      else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
 	      else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
@@ -670,11 +672,23 @@
 	      else if (strcmp(name,"Time")==0) return TimeEnum;
 	      else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
 	      else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
+	      else if (strcmp(name,"Outputdefinition1")==0) return Outputdefinition1Enum;
+	      else if (strcmp(name,"Outputdefinition2")==0) return Outputdefinition2Enum;
+	      else if (strcmp(name,"Outputdefinition3")==0) return Outputdefinition3Enum;
+	      else if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
+	      else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
+	      else if (strcmp(name,"Outputdefinition6")==0) return Outputdefinition6Enum;
+	      else if (strcmp(name,"Outputdefinition7")==0) return Outputdefinition7Enum;
+	      else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
+	      else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum;
+	      else if (strcmp(name,"Outputdefinition10")==0) return Outputdefinition10Enum;
 	      else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
 	      else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
 	      else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
+	      else if (strcmp(name,"MassfluxatgateDefinitionenum")==0) return MassfluxatgateDefinitionenumEnum;
 	      else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
 	      else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
+	      else if (strcmp(name,"MisfitDefinitionenum")==0) return MisfitDefinitionenumEnum;
 	      else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
 	      else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
 	      else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
@@ -733,8 +747,14 @@
 	      else if (strcmp(name,"Nodal")==0) return NodalEnum;
 	      else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
 	      else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
+	      else if (strcmp(name,"ToolkitsFileName")==0) return ToolkitsFileNameEnum;
+	      else if (strcmp(name,"RootPath")==0) return RootPathEnum;
 	      else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
-	      else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
+	      else if (strcmp(name,"InputFileName")==0) return InputFileNameEnum;
+         else stage=7;
+   }
+   if(stage==7){
+	      if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
 	      else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
 	      else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
 	      else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
@@ -751,10 +771,7 @@
 	      else if (strcmp(name,"XY")==0) return XYEnum;
 	      else if (strcmp(name,"XYZ")==0) return XYZEnum;
 	      else if (strcmp(name,"Dense")==0) return DenseEnum;
-         else stage=7;
-   }
-   if(stage==7){
-	      if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
+	      else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
 	      else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
 	      else if (strcmp(name,"Seq")==0) return SeqEnum;
 	      else if (strcmp(name,"Mpi")==0) return MpiEnum;
