Index: sm/trunk-jpl/src/m/enum/AdjointSolutionEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/AdjointSolutionEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=AdjointSolutionEnum()
-%ADJOINTSOLUTIONENUM - Enum of AdjointSolution
-%
-%   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=AdjointSolutionEnum()
-
-macro=StringToEnum('AdjointSolution');
Index: sm/trunk-jpl/src/m/enum/BasisIntegralEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/BasisIntegralEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=BasisIntegralEnum()
-%BASISINTEGRALENUM - Enum of BasisIntegral
-%
-%   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=BasisIntegralEnum()
-
-macro=StringToEnum('BasisIntegral');
Index: sm/trunk-jpl/src/m/enum/ConstantEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/ConstantEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=ConstantEnum()
-%CONSTANTENUM - Enum of Constant
-%
-%   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=ConstantEnum()
-
-macro=StringToEnum('Constant');
Index: sm/trunk-jpl/src/m/enum/DofIndexingEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/DofIndexingEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=DofIndexingEnum()
-%DOFINDEXINGENUM - Enum of DofIndexing
-%
-%   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=DofIndexingEnum()
-
-macro=StringToEnum('DofIndexing');
Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py
===================================================================
--- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 16233)
+++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 16234)
@@ -42,5 +42,4 @@
 def DependentObjectEnum(): return StringToEnum("DependentObject")[0]
 def StressbalanceAbstolEnum(): return StringToEnum("StressbalanceAbstol")[0]
-def StressbalanceIcefrontEnum(): return StringToEnum("StressbalanceIcefront")[0]
 def StressbalanceIsnewtonEnum(): return StringToEnum("StressbalanceIsnewton")[0]
 def StressbalanceMaxiterEnum(): return StringToEnum("StressbalanceMaxiter")[0]
@@ -118,5 +117,4 @@
 def HydrologyEfficientEnum(): return StringToEnum("HydrologyEfficient")[0]
 def HydrologySedimentKmaxEnum(): return StringToEnum("HydrologySedimentKmax")[0]
-def BasisIntegralEnum(): return StringToEnum("BasisIntegral")[0]
 def WaterTransferEnum(): return StringToEnum("WaterTransfer")[0]
 def IndependentObjectEnum(): return StringToEnum("IndependentObject")[0]
@@ -138,5 +136,4 @@
 def InversionStepThresholdEnum(): return StringToEnum("InversionStepThreshold")[0]
 def InversionThicknessObsEnum(): return StringToEnum("InversionThicknessObs")[0]
-def InversionVelObsEnum(): return StringToEnum("InversionVelObs")[0]
 def InversionVxObsEnum(): return StringToEnum("InversionVxObs")[0]
 def InversionVyObsEnum(): return StringToEnum("InversionVyObs")[0]
@@ -281,5 +278,4 @@
 def AdjointBalancethicknessAnalysisEnum(): return StringToEnum("AdjointBalancethicknessAnalysis")[0]
 def AdjointHorizAnalysisEnum(): return StringToEnum("AdjointHorizAnalysis")[0]
-def AdjointSolutionEnum(): return StringToEnum("AdjointSolution")[0]
 def AnalysisCounterEnum(): return StringToEnum("AnalysisCounter")[0]
 def NoneAnalysisEnum(): return StringToEnum("NoneAnalysis")[0]
@@ -353,5 +349,4 @@
 def ControlInputEnum(): return StringToEnum("ControlInput")[0]
 def DatasetInputEnum(): return StringToEnum("DatasetInput")[0]
-def DofIndexingEnum(): return StringToEnum("DofIndexing")[0]
 def DoubleInputEnum(): return StringToEnum("DoubleInput")[0]
 def DataSetParamEnum(): return StringToEnum("DataSetParam")[0]
@@ -364,6 +359,4 @@
 def ExternalResultEnum(): return StringToEnum("ExternalResult")[0]
 def FileParamEnum(): return StringToEnum("FileParam")[0]
-def HookEnum(): return StringToEnum("Hook")[0]
-def IcefrontEnum(): return StringToEnum("Icefront")[0]
 def InputEnum(): return StringToEnum("Input")[0]
 def IntInputEnum(): return StringToEnum("IntInput")[0]
@@ -371,7 +364,4 @@
 def IntVecParamEnum(): return StringToEnum("IntVecParam")[0]
 def TransientParamEnum(): return StringToEnum("TransientParam")[0]
-def IceFrontTypeEnum(): return StringToEnum("IceFrontType")[0]
-def SSA2dIceFrontEnum(): return StringToEnum("SSA2dIceFront")[0]
-def SSA3dIceFrontEnum(): return StringToEnum("SSA3dIceFront")[0]
 def MaticeEnum(): return StringToEnum("Matice")[0]
 def MatparEnum(): return StringToEnum("Matpar")[0]
@@ -380,6 +370,4 @@
 def NumericalfluxTypeEnum(): return StringToEnum("NumericalfluxType")[0]
 def ParamEnum(): return StringToEnum("Param")[0]
-def L1L2IceFrontEnum(): return StringToEnum("L1L2IceFront")[0]
-def HOIceFrontEnum(): return StringToEnum("HOIceFront")[0]
 def PengridEnum(): return StringToEnum("Pengrid")[0]
 def PenpairEnum(): return StringToEnum("Penpair")[0]
@@ -397,5 +385,4 @@
 def SpcStaticEnum(): return StringToEnum("SpcStatic")[0]
 def SpcTransientEnum(): return StringToEnum("SpcTransient")[0]
-def FSIceFrontEnum(): return StringToEnum("FSIceFront")[0]
 def StringArrayParamEnum(): return StringToEnum("StringArrayParam")[0]
 def StringParamEnum(): return StringToEnum("StringParam")[0]
@@ -420,5 +407,4 @@
 def BedSlopeYEnum(): return StringToEnum("BedSlopeY")[0]
 def BoundaryEnum(): return StringToEnum("Boundary")[0]
-def ConstantEnum(): return StringToEnum("Constant")[0]
 def ConvergedEnum(): return StringToEnum("Converged")[0]
 def FillEnum(): return StringToEnum("Fill")[0]
@@ -428,8 +414,6 @@
 def InternalEnum(): return StringToEnum("Internal")[0]
 def MassFluxEnum(): return StringToEnum("MassFlux")[0]
-def MaxPenetrationEnum(): return StringToEnum("MaxPenetration")[0]
 def MeltingOffsetEnum(): return StringToEnum("MeltingOffset")[0]
 def MisfitEnum(): return StringToEnum("Misfit")[0]
-def NumberNodeToElementConnectivityEnum(): return StringToEnum("NumberNodeToElementConnectivity")[0]
 def PressureEnum(): return StringToEnum("Pressure")[0]
 def PressurePicardEnum(): return StringToEnum("PressurePicard")[0]
@@ -457,5 +441,4 @@
 def SurfaceSlopeYEnum(): return StringToEnum("SurfaceSlopeY")[0]
 def TemperatureEnum(): return StringToEnum("Temperature")[0]
-def TemperatureOldEnum(): return StringToEnum("TemperatureOld")[0]
 def TemperaturePicardEnum(): return StringToEnum("TemperaturePicard")[0]
 def ThicknessAbsMisfitEnum(): return StringToEnum("ThicknessAbsMisfit")[0]
@@ -598,8 +581,5 @@
 def GenericOptionEnum(): return StringToEnum("GenericOption")[0]
 def OptionCellEnum(): return StringToEnum("OptionCell")[0]
-def OptionCharEnum(): return StringToEnum("OptionChar")[0]
 def OptionStructEnum(): return StringToEnum("OptionStruct")[0]
-def OptionDoubleEnum(): return StringToEnum("OptionDouble")[0]
-def OptionLogicalEnum(): return StringToEnum("OptionLogical")[0]
 def PatersonEnum(): return StringToEnum("Paterson")[0]
 def ArrheniusEnum(): return StringToEnum("Arrhenius")[0]
Index: sm/trunk-jpl/src/m/enum/FSIceFrontEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/FSIceFrontEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=FSIceFrontEnum()
-%FSICEFRONTENUM - Enum of FSIceFront
-%
-%   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=FSIceFrontEnum()
-
-macro=StringToEnum('FSIceFront');
Index: sm/trunk-jpl/src/m/enum/HOIceFrontEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/HOIceFrontEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=HOIceFrontEnum()
-%HOICEFRONTENUM - Enum of HOIceFront
-%
-%   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=HOIceFrontEnum()
-
-macro=StringToEnum('HOIceFront');
Index: sm/trunk-jpl/src/m/enum/HookEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/HookEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=HookEnum()
-%HOOKENUM - Enum of Hook
-%
-%   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=HookEnum()
-
-macro=StringToEnum('Hook');
Index: sm/trunk-jpl/src/m/enum/IceFrontTypeEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/IceFrontTypeEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=IceFrontTypeEnum()
-%ICEFRONTTYPEENUM - Enum of IceFrontType
-%
-%   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=IceFrontTypeEnum()
-
-macro=StringToEnum('IceFrontType');
Index: sm/trunk-jpl/src/m/enum/IcefrontEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/IcefrontEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=IcefrontEnum()
-%ICEFRONTENUM - Enum of Icefront
-%
-%   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=IcefrontEnum()
-
-macro=StringToEnum('Icefront');
Index: sm/trunk-jpl/src/m/enum/InversionVelObsEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/InversionVelObsEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=InversionVelObsEnum()
-%INVERSIONVELOBSENUM - Enum of InversionVelObs
-%
-%   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=InversionVelObsEnum()
-
-macro=StringToEnum('InversionVelObs');
Index: sm/trunk-jpl/src/m/enum/L1L2IceFrontEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/L1L2IceFrontEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=L1L2IceFrontEnum()
-%L1L2ICEFRONTENUM - Enum of L1L2IceFront
-%
-%   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=L1L2IceFrontEnum()
-
-macro=StringToEnum('L1L2IceFront');
Index: sm/trunk-jpl/src/m/enum/MaxPenetrationEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/MaxPenetrationEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=MaxPenetrationEnum()
-%MAXPENETRATIONENUM - Enum of MaxPenetration
-%
-%   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=MaxPenetrationEnum()
-
-macro=StringToEnum('MaxPenetration');
Index: sm/trunk-jpl/src/m/enum/NumberNodeToElementConnectivityEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/NumberNodeToElementConnectivityEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=NumberNodeToElementConnectivityEnum()
-%NUMBERNODETOELEMENTCONNECTIVITYENUM - Enum of NumberNodeToElementConnectivity
-%
-%   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=NumberNodeToElementConnectivityEnum()
-
-macro=StringToEnum('NumberNodeToElementConnectivity');
Index: sm/trunk-jpl/src/m/enum/OptionCharEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/OptionCharEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=OptionCharEnum()
-%OPTIONCHARENUM - Enum of OptionChar
-%
-%   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=OptionCharEnum()
-
-macro=StringToEnum('OptionChar');
Index: sm/trunk-jpl/src/m/enum/OptionDoubleEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/OptionDoubleEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=OptionDoubleEnum()
-%OPTIONDOUBLEENUM - Enum of OptionDouble
-%
-%   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=OptionDoubleEnum()
-
-macro=StringToEnum('OptionDouble');
Index: sm/trunk-jpl/src/m/enum/OptionLogicalEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/OptionLogicalEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=OptionLogicalEnum()
-%OPTIONLOGICALENUM - Enum of OptionLogical
-%
-%   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=OptionLogicalEnum()
-
-macro=StringToEnum('OptionLogical');
Index: sm/trunk-jpl/src/m/enum/SSA2dIceFrontEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/SSA2dIceFrontEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=SSA2dIceFrontEnum()
-%SSA2DICEFRONTENUM - Enum of SSA2dIceFront
-%
-%   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=SSA2dIceFrontEnum()
-
-macro=StringToEnum('SSA2dIceFront');
Index: sm/trunk-jpl/src/m/enum/SSA3dIceFrontEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/SSA3dIceFrontEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=SSA3dIceFrontEnum()
-%SSA3DICEFRONTENUM - Enum of SSA3dIceFront
-%
-%   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=SSA3dIceFrontEnum()
-
-macro=StringToEnum('SSA3dIceFront');
Index: sm/trunk-jpl/src/m/enum/StressbalanceIcefrontEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/StressbalanceIcefrontEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=StressbalanceIcefrontEnum()
-%STRESSBALANCEICEFRONTENUM - Enum of StressbalanceIcefront
-%
-%   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=StressbalanceIcefrontEnum()
-
-macro=StringToEnum('StressbalanceIcefront');
Index: sm/trunk-jpl/src/m/enum/TemperatureOldEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/TemperatureOldEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=TemperatureOldEnum()
-%TEMPERATUREOLDENUM - Enum of TemperatureOld
-%
-%   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=TemperatureOldEnum()
-
-macro=StringToEnum('TemperatureOld');
Index: sm/trunk-jpl/src/m/enum/ThermalIsdynamicbasalspcEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/ThermalIsdynamicbasalspcEnum.m	(revision 16233)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=ThermalIsdynamicbasalspcEnum()
-%THERMALISDYNAMICBASALSPCENUM - Enum of ThermalIsdynamicbasalspc
-%
-%   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=ThermalIsdynamicbasalspcEnum()
-
-macro=StringToEnum('ThermalIsdynamicbasalspc');