Index: /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumDefinitions.h	(revision 21600)
+++ /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumDefinitions.h	(revision 21601)
@@ -687,4 +687,6 @@
 	VxObsEnum,
 	VyObsEnum,
+	WeightsVxObsEnum,
+	WeightsVyObsEnum,
 	/*}}}*/
 	/*Relaxation{{{*/
Index: /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumToStringx.cpp	(revision 21600)
+++ /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumToStringx.cpp	(revision 21601)
@@ -681,4 +681,6 @@
 		case VxObsEnum : return "VxObs";
 		case VyObsEnum : return "VyObs";
+		case WeightsVxObsEnum : return "WeightsVxObs";
+		case WeightsVyObsEnum : return "WeightsVyObs";
 		case AbsoluteEnum : return "Absolute";
 		case IncrementalEnum : return "Incremental";
Index: /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/StringToEnumx.cpp	(revision 21600)
+++ /issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/StringToEnumx.cpp	(revision 21601)
@@ -696,4 +696,6 @@
 	      else if (strcmp(name,"VxObs")==0) return VxObsEnum;
 	      else if (strcmp(name,"VyObs")==0) return VyObsEnum;
+	      else if (strcmp(name,"WeightsVxObs")==0) return WeightsVxObsEnum;
+	      else if (strcmp(name,"WeightsVyObs")==0) return WeightsVyObsEnum;
 	      else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
 	      else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
@@ -750,10 +752,10 @@
 	      else if (strcmp(name,"Mpi")==0) return MpiEnum;
 	      else if (strcmp(name,"Mumps")==0) return MumpsEnum;
-	      else if (strcmp(name,"Gsl")==0) return GslEnum;
-	      else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
          else stage=7;
    }
    if(stage==7){
-	      if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
+	      if (strcmp(name,"Gsl")==0) return GslEnum;
+	      else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
+	      else if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
 	      else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
 	      else if (strcmp(name,"Paterson")==0) return PatersonEnum;
@@ -873,10 +875,10 @@
 	      else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
 	      else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
-	      else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
-	      else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
          else stage=8;
    }
    if(stage==8){
-	      if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
+	      if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
+	      else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
+	      else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
 	      else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
 	      else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
@@ -996,10 +998,10 @@
 	      else if (strcmp(name,"Nodes")==0) return NodesEnum;
 	      else if (strcmp(name,"Contours")==0) return ContoursEnum;
-	      else if (strcmp(name,"Parameters")==0) return ParametersEnum;
-	      else if (strcmp(name,"Vertices")==0) return VerticesEnum;
          else stage=9;
    }
    if(stage==9){
-	      if (strcmp(name,"Results")==0) return ResultsEnum;
+	      if (strcmp(name,"Parameters")==0) return ParametersEnum;
+	      else if (strcmp(name,"Vertices")==0) return VerticesEnum;
+	      else if (strcmp(name,"Results")==0) return ResultsEnum;
 	      else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
          else stage=10;