Index: /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim
===================================================================
--- /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim	(revision 17913)
+++ /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim	(revision 17914)
@@ -412,5 +412,4 @@
 syn keyword cType BoolInput
 syn keyword cType BoolParam
-syn keyword cType classes
 syn keyword cType Constraint
 syn keyword cType Constraints
@@ -418,6 +417,6 @@
 syn keyword cType Contours
 syn keyword cType ControlInput
+syn keyword cType DataSetParam
 syn keyword cType DatasetInput
-syn keyword cType DataSetParam
 syn keyword cType Definition
 syn keyword cType DependentObject
@@ -432,6 +431,6 @@
 syn keyword cType ElementHook
 syn keyword cType ElementMatrix
+syn keyword cType ElementVector
 syn keyword cType Elements
-syn keyword cType ElementVector
 syn keyword cType ExponentialVariogram
 syn keyword cType ExternalResult
@@ -440,10 +439,9 @@
 syn keyword cType Friction
 syn keyword cType Gauss
-syn keyword cType GaussianVariogram
-syn keyword cType gaussobjects
 syn keyword cType GaussPenta
 syn keyword cType GaussSeg
 syn keyword cType GaussTetra
 syn keyword cType GaussTria
+syn keyword cType GaussianVariogram
 syn keyword cType GenericExternalResult
 syn keyword cType GenericOption
@@ -459,5 +457,4 @@
 syn keyword cType IntVecParam
 syn keyword cType IoModel
-syn keyword cType krigingobjects
 syn keyword cType Load
 syn keyword cType Loads
@@ -467,5 +464,4 @@
 syn keyword cType Matice
 syn keyword cType Matpar
-syn keyword cType matrixobjects
 syn keyword cType MatrixParam
 syn keyword cType Misfit
@@ -476,6 +472,6 @@
 syn keyword cType Observations
 syn keyword cType Option
+syn keyword cType OptionUtilities
 syn keyword cType Options
-syn keyword cType OptionUtilities
 syn keyword cType Param
 syn keyword cType Parameters
@@ -489,10 +485,10 @@
 syn keyword cType Quadtree
 syn keyword cType Results
+syn keyword cType RiftStruct
 syn keyword cType Riftfront
-syn keyword cType RiftStruct
 syn keyword cType Seg
 syn keyword cType SegInput
+syn keyword cType SegRef
 syn keyword cType Segment
-syn keyword cType SegRef
 syn keyword cType SpcDynamic
 syn keyword cType SpcStatic
@@ -514,4 +510,8 @@
 syn keyword cType Vertex
 syn keyword cType Vertices
+syn keyword cType classes
+syn keyword cType gaussobjects
+syn keyword cType krigingobjects
+syn keyword cType matrixobjects
 syn keyword cType AdjointBalancethicknessAnalysis
 syn keyword cType AdjointHorizAnalysis
@@ -627,9 +627,4 @@
 syn keyword cConstant HydrologyModelEnum
 syn keyword cConstant HydrologyshreveEnum
-syn keyword cConstant HydrologyshreveCREnum
-syn keyword cConstant HydrologyshreveKnEnum
-syn keyword cConstant HydrologyshreveNEnum
-syn keyword cConstant HydrologyshrevePEnum
-syn keyword cConstant HydrologyshreveQEnum
 syn keyword cConstant HydrologyshreveSpcwatercolumnEnum
 syn keyword cConstant HydrologyshreveStabilizationEnum
@@ -680,10 +675,20 @@
 syn keyword cConstant InversionGradientScalingEnum
 syn keyword cConstant InversionIscontrolEnum
-syn keyword cConstant InversionTaoEnum
+syn keyword cConstant InversionTypeEnum
 syn keyword cConstant InversionIncompleteAdjointEnum
 syn keyword cConstant InversionMaxParametersEnum
 syn keyword cConstant InversionMaxiterPerStepEnum
+syn keyword cConstant InversionMaxiterEnum
+syn keyword cConstant InversionMaxstepsEnum
+syn keyword cConstant InversionFatolEnum
+syn keyword cConstant InversionFgtolEnum
+syn keyword cConstant InversionGatolEnum
+syn keyword cConstant InversionGgtolEnum
+syn keyword cConstant InversionGttolEnum
+syn keyword cConstant InversionAlgorithmEnum
 syn keyword cConstant InversionMinParametersEnum
 syn keyword cConstant InversionNstepsEnum
+syn keyword cConstant InversionDxminEnum
+syn keyword cConstant InversionEpsrelEnum
 syn keyword cConstant InversionNumControlParametersEnum
 syn keyword cConstant InversionNumCostFunctionsEnum
@@ -739,6 +744,4 @@
 syn keyword cConstant MaterialsMantleDensityEnum
 syn keyword cConstant MeshAverageVertexConnectivityEnum
-syn keyword cConstant MeshElementonbaseEnum
-syn keyword cConstant MeshElementonsurfaceEnum
 syn keyword cConstant MeshElements2dEnum
 syn keyword cConstant MeshElementsEnum
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 17913)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 17914)
@@ -139,4 +139,12 @@
 	InversionMaxParametersEnum,
 	InversionMaxiterPerStepEnum,
+	InversionMaxiterEnum,
+	InversionMaxstepsEnum,
+	InversionFatolEnum,
+	InversionFgtolEnum,
+	InversionGatolEnum,
+	InversionGgtolEnum,
+	InversionGttolEnum,
+	InversionAlgorithmEnum,
 	InversionMinParametersEnum,
 	InversionNstepsEnum,
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 17913)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 17914)
@@ -147,4 +147,12 @@
 		case InversionMaxParametersEnum : return "InversionMaxParameters";
 		case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";
+		case InversionMaxiterEnum : return "InversionMaxiter";
+		case InversionMaxstepsEnum : return "InversionMaxsteps";
+		case InversionFatolEnum : return "InversionFatol";
+		case InversionFgtolEnum : return "InversionFgtol";
+		case InversionGatolEnum : return "InversionGatol";
+		case InversionGgtolEnum : return "InversionGgtol";
+		case InversionGttolEnum : return "InversionGttol";
+		case InversionAlgorithmEnum : return "InversionAlgorithm";
 		case InversionMinParametersEnum : return "InversionMinParameters";
 		case InversionNstepsEnum : return "InversionNsteps";
Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 17913)
+++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 17914)
@@ -150,4 +150,12 @@
 	      else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
 	      else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
+	      else if (strcmp(name,"InversionMaxiter")==0) return InversionMaxiterEnum;
+	      else if (strcmp(name,"InversionMaxsteps")==0) return InversionMaxstepsEnum;
+	      else if (strcmp(name,"InversionFatol")==0) return InversionFatolEnum;
+	      else if (strcmp(name,"InversionFgtol")==0) return InversionFgtolEnum;
+	      else if (strcmp(name,"InversionGatol")==0) return InversionGatolEnum;
+	      else if (strcmp(name,"InversionGgtol")==0) return InversionGgtolEnum;
+	      else if (strcmp(name,"InversionGttol")==0) return InversionGttolEnum;
+	      else if (strcmp(name,"InversionAlgorithm")==0) return InversionAlgorithmEnum;
 	      else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
 	      else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
@@ -252,5 +260,8 @@
 	      else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
 	      else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
-	      else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
+         else stage=3;
+   }
+   if(stage==3){
+	      if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
 	      else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
 	      else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
@@ -260,8 +271,5 @@
 	      else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
 	      else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
-         else stage=3;
-   }
-   if(stage==3){
-	      if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
+	      else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
 	      else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
 	      else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
@@ -375,5 +383,8 @@
 	      else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
 	      else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
-	      else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
+         else stage=4;
+   }
+   if(stage==4){
+	      if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
 	      else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum;
 	      else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
@@ -383,8 +394,5 @@
 	      else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
 	      else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
-         else stage=4;
-   }
-   if(stage==4){
-	      if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
+	      else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
 	      else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
 	      else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
@@ -498,5 +506,8 @@
 	      else if (strcmp(name,"QmuVyMesh")==0) return QmuVyMeshEnum;
 	      else if (strcmp(name,"QmuVzMesh")==0) return QmuVzMeshEnum;
-	      else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
+         else stage=5;
+   }
+   if(stage==5){
+	      if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
 	      else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
 	      else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
@@ -506,8 +517,5 @@
 	      else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
 	      else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
-         else stage=5;
-   }
-   if(stage==5){
-	      if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
+	      else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
 	      else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
 	      else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
@@ -621,5 +629,8 @@
 	      else if (strcmp(name,"MinVy")==0) return MinVyEnum;
 	      else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
-	      else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
+         else stage=6;
+   }
+   if(stage==6){
+	      if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
 	      else if (strcmp(name,"MinVz")==0) return MinVzEnum;
 	      else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
@@ -629,8 +640,5 @@
 	      else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
 	      else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
-         else stage=6;
-   }
-   if(stage==6){
-	      if (strcmp(name,"Incremental")==0) return IncrementalEnum;
+	      else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
 	      else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
 	      else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py
===================================================================
--- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 17913)
+++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 17914)
@@ -139,4 +139,12 @@
 def InversionMaxParametersEnum(): return StringToEnum("InversionMaxParameters")[0]
 def InversionMaxiterPerStepEnum(): return StringToEnum("InversionMaxiterPerStep")[0]
+def InversionMaxiterEnum(): return StringToEnum("InversionMaxiter")[0]
+def InversionMaxstepsEnum(): return StringToEnum("InversionMaxsteps")[0]
+def InversionFatolEnum(): return StringToEnum("InversionFatol")[0]
+def InversionFgtolEnum(): return StringToEnum("InversionFgtol")[0]
+def InversionGatolEnum(): return StringToEnum("InversionGatol")[0]
+def InversionGgtolEnum(): return StringToEnum("InversionGgtol")[0]
+def InversionGttolEnum(): return StringToEnum("InversionGttol")[0]
+def InversionAlgorithmEnum(): return StringToEnum("InversionAlgorithm")[0]
 def InversionMinParametersEnum(): return StringToEnum("InversionMinParameters")[0]
 def InversionNstepsEnum(): return StringToEnum("InversionNsteps")[0]
Index: /issm/trunk-jpl/src/m/enum/InversionAlgorithmEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionAlgorithmEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionAlgorithmEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionAlgorithmEnum()
+%INVERSIONALGORITHMENUM - Enum of InversionAlgorithm
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionAlgorithmEnum()
+
+macro=StringToEnum('InversionAlgorithm');
Index: /issm/trunk-jpl/src/m/enum/InversionFatolEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionFatolEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionFatolEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionFatolEnum()
+%INVERSIONFATOLENUM - Enum of InversionFatol
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionFatolEnum()
+
+macro=StringToEnum('InversionFatol');
Index: /issm/trunk-jpl/src/m/enum/InversionFgtolEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionFgtolEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionFgtolEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionFgtolEnum()
+%INVERSIONFGTOLENUM - Enum of InversionFgtol
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionFgtolEnum()
+
+macro=StringToEnum('InversionFgtol');
Index: /issm/trunk-jpl/src/m/enum/InversionGatolEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionGatolEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionGatolEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionGatolEnum()
+%INVERSIONGATOLENUM - Enum of InversionGatol
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionGatolEnum()
+
+macro=StringToEnum('InversionGatol');
Index: /issm/trunk-jpl/src/m/enum/InversionGgtolEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionGgtolEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionGgtolEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionGgtolEnum()
+%INVERSIONGGTOLENUM - Enum of InversionGgtol
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionGgtolEnum()
+
+macro=StringToEnum('InversionGgtol');
Index: /issm/trunk-jpl/src/m/enum/InversionGttolEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionGttolEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionGttolEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionGttolEnum()
+%INVERSIONGTTOLENUM - Enum of InversionGttol
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionGttolEnum()
+
+macro=StringToEnum('InversionGttol');
Index: /issm/trunk-jpl/src/m/enum/InversionMaxiterEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionMaxiterEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionMaxiterEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionMaxiterEnum()
+%INVERSIONMAXITERENUM - Enum of InversionMaxiter
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionMaxiterEnum()
+
+macro=StringToEnum('InversionMaxiter');
Index: /issm/trunk-jpl/src/m/enum/InversionMaxstepsEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionMaxstepsEnum.m	(revision 17914)
+++ /issm/trunk-jpl/src/m/enum/InversionMaxstepsEnum.m	(revision 17914)
@@ -0,0 +1,11 @@
+function macro=InversionMaxstepsEnum()
+%INVERSIONMAXSTEPSENUM - Enum of InversionMaxsteps
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=InversionMaxstepsEnum()
+
+macro=StringToEnum('InversionMaxsteps');