Index: /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim
===================================================================
--- /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim	(revision 13704)
+++ /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim	(revision 13705)
@@ -569,7 +569,24 @@
 "ISSM's objects end
 "ISSM's Enums begin
-syn keyword cConstant AutodiffForwardEnum
 syn keyword cConstant AutodiffIsautodiffEnum
-syn keyword cConstant AutodiffReverseEnum
+syn keyword cConstant AutodiffNumDependentsEnum
+syn keyword cConstant AutodiffNumDependentObjectsEnum
+syn keyword cConstant AutodiffDependentObjectNamesEnum
+syn keyword cConstant AutodiffDependentObjectTypesEnum
+syn keyword cConstant AutodiffDependentObjectIndicesEnum
+syn keyword cConstant AutodiffDependentObjectsEnum
+syn keyword cConstant AutodiffNumIndependentsEnum
+syn keyword cConstant AutodiffNumIndependentObjectsEnum
+syn keyword cConstant AutodiffIndependentObjectNamesEnum
+syn keyword cConstant AutodiffIndependentObjectTypesEnum
+syn keyword cConstant AutodiffIndependentObjectsEnum
+syn keyword cConstant AutodiffJacobianEnum
+syn keyword cConstant AutodiffXpEnum
+syn keyword cConstant AutodiffDriverEnum
+syn keyword cConstant AutodiffFosForwardIndexEnum
+syn keyword cConstant AutodiffFovForwardIndicesEnum
+syn keyword cConstant AutodiffFosReverseIndexEnum
+syn keyword cConstant AutodiffMassFluxSegmentsPresentEnum
+syn keyword cConstant AutodiffKeepEnum
 syn keyword cConstant BalancethicknessSpcthicknessEnum
 syn keyword cConstant BalancethicknessStabilizationEnum
@@ -583,4 +600,5 @@
 syn keyword cConstant ConstantsReferencetemperatureEnum
 syn keyword cConstant ConstantsYtsEnum
+syn keyword cConstant DependentObjectEnum
 syn keyword cConstant DiagnosticAbstolEnum
 syn keyword cConstant DiagnosticIcefrontEnum
@@ -607,4 +625,5 @@
 syn keyword cConstant FlowequationElementEquationEnum
 syn keyword cConstant FlowequationIshutterEnum
+syn keyword cConstant FlowequationIsl1l2Enum
 syn keyword cConstant FlowequationIsmacayealpattynEnum
 syn keyword cConstant FlowequationIsstokesEnum
@@ -621,4 +640,5 @@
 syn keyword cConstant HydrologySpcwatercolumnEnum
 syn keyword cConstant HydrologyStabilizationEnum
+syn keyword cConstant IndependentObjectEnum
 syn keyword cConstant InversionControlParametersEnum
 syn keyword cConstant InversionCostFunctionEnum
@@ -658,4 +678,6 @@
 syn keyword cConstant MaterialsRheologyLawEnum
 syn keyword cConstant MaterialsRheologyNEnum
+syn keyword cConstant MaterialsRheologyZEnum
+syn keyword cConstant MaterialsRheologyZbarEnum
 syn keyword cConstant MaterialsRhoIceEnum
 syn keyword cConstant MaterialsRhoWaterEnum
@@ -692,6 +714,10 @@
 syn keyword cConstant PrognosticStabilizationEnum
 syn keyword cConstant PrognosticVertexPairingEnum
+syn keyword cConstant PrognosticNumRequestedOutputsEnum
+syn keyword cConstant PrognosticRequestedOutputsEnum
 syn keyword cConstant QmuIsdakotaEnum
-syn keyword cConstant QmuMassFluxSegmentsEnum
+syn keyword cConstant MassFluxSegmentsEnum
+syn keyword cConstant MassFluxSegmentsPresentEnum
+syn keyword cConstant QmuMassFluxSegmentsPresentEnum
 syn keyword cConstant QmuNumberofpartitionsEnum
 syn keyword cConstant QmuNumberofresponsesEnum
@@ -728,4 +754,6 @@
 syn keyword cConstant SurfaceforcingsMonthlytemperaturesEnum
 syn keyword cConstant SurfaceforcingsHcEnum
+syn keyword cConstant SurfaceforcingsHrefEnum
+syn keyword cConstant SurfaceforcingsSmbrefEnum
 syn keyword cConstant SurfaceforcingsSmbPosMaxEnum
 syn keyword cConstant SurfaceforcingsSmbPosMinEnum
@@ -789,9 +817,10 @@
 syn keyword cConstant TransientSolutionEnum
 syn keyword cConstant ApproximationEnum
+syn keyword cConstant NoneApproximationEnum
 syn keyword cConstant HutterApproximationEnum
 syn keyword cConstant MacAyealApproximationEnum
 syn keyword cConstant MacAyealPattynApproximationEnum
 syn keyword cConstant MacAyealStokesApproximationEnum
-syn keyword cConstant NoneApproximationEnum
+syn keyword cConstant L1L2ApproximationEnum
 syn keyword cConstant PattynApproximationEnum
 syn keyword cConstant PattynStokesApproximationEnum
@@ -804,4 +833,6 @@
 syn keyword cConstant VerticesEnum
 syn keyword cConstant ResultsEnum
+syn keyword cConstant GenericParamEnum
+syn keyword cConstant AdolcParamEnum
 syn keyword cConstant BoolInputEnum
 syn keyword cConstant BoolParamEnum
@@ -811,4 +842,5 @@
 syn keyword cConstant DofIndexingEnum
 syn keyword cConstant DoubleInputEnum
+syn keyword cConstant DataSetParamEnum
 syn keyword cConstant DoubleMatArrayParamEnum
 syn keyword cConstant DoubleMatParamEnum
@@ -829,8 +861,10 @@
 syn keyword cConstant MacAyeal3dIceFrontEnum
 syn keyword cConstant MaticeEnum
+syn keyword cConstant MatdamageiceEnum
 syn keyword cConstant MatparEnum
 syn keyword cConstant NodeEnum
 syn keyword cConstant NumericalfluxEnum
 syn keyword cConstant ParamEnum
+syn keyword cConstant L1L2IceFrontEnum
 syn keyword cConstant PattynIceFrontEnum
 syn keyword cConstant PengridEnum
@@ -838,4 +872,5 @@
 syn keyword cConstant PentaEnum
 syn keyword cConstant PentaP1InputEnum
+syn keyword cConstant ProfilerEnum
 syn keyword cConstant MatrixParamEnum
 syn keyword cConstant VectorParamEnum
@@ -903,4 +938,6 @@
 syn keyword cConstant TemperatureOldEnum
 syn keyword cConstant TemperaturePicardEnum
+syn keyword cConstant TemperatureSurfaceEnum
+syn keyword cConstant TemperatureBasalEnum
 syn keyword cConstant ThicknessAbsMisfitEnum
 syn keyword cConstant TypeEnum
@@ -924,4 +961,6 @@
 syn keyword cConstant EnthalpyPicardEnum
 syn keyword cConstant ThicknessAbsGradientEnum
+syn keyword cConstant ThicknessAlongGradientEnum
+syn keyword cConstant ThicknessAcrossGradientEnum
 syn keyword cConstant StepResponsesEnum
 syn keyword cConstant IntMatParamEnum
@@ -944,8 +983,4 @@
 syn keyword cConstant StressTensoryzEnum
 syn keyword cConstant StressTensorzzEnum
-syn keyword cConstant IceVolumeEnum
-syn keyword cConstant TotalSmbEnum
-syn keyword cConstant ThicknessAlongGradientEnum
-syn keyword cConstant ThicknessAcrossGradientEnum
 syn keyword cConstant P0Enum
 syn keyword cConstant P1Enum
@@ -981,4 +1016,6 @@
 syn keyword cConstant MaxVzEnum
 syn keyword cConstant MaxAbsVzEnum
+syn keyword cConstant IceVolumeEnum
+syn keyword cConstant TotalSmbEnum
 syn keyword cConstant RelativeEnum
 syn keyword cConstant AbsoluteEnum
@@ -1004,4 +1041,6 @@
 syn keyword cConstant OldGradientEnum
 syn keyword cConstant OutputFilePointerEnum
+syn keyword cConstant OutputFileNameEnum
+syn keyword cConstant LockFileNameEnum
 syn keyword cConstant PetscOptionsAnalysesEnum
 syn keyword cConstant PetscOptionsStringsEnum
@@ -1020,4 +1059,5 @@
 syn keyword cConstant XYZPEnum
 syn keyword cConstant OptionEnum
+syn keyword cConstant GenericOptionEnum
 syn keyword cConstant OptionCellEnum
 syn keyword cConstant OptionCharEnum
Index: /issm/trunk-jpl/externalpackages/vim/addons/vimrc
===================================================================
--- /issm/trunk-jpl/externalpackages/vim/addons/vimrc	(revision 13704)
+++ /issm/trunk-jpl/externalpackages/vim/addons/vimrc	(revision 13705)
@@ -1,4 +1,4 @@
 
-" General setup{{{1
+" General setup{{{
 " ----------------------------------------------------------------------
 " Use Vim settings, rather then Vi settings (much better!).
@@ -18,5 +18,5 @@
 set showmode
 "----------------------------------------------------------------------}}}
-" Text-Formatting, Identing, Tabbing{{{1
+" Text-Formatting, Identing, Tabbing{{{
 " ----------------------------------------------------------------------
 " allow backspacing (to delete) over everything in insert mode
@@ -39,5 +39,5 @@
 set foldtext=IssmFoldText()
 " -----------------------------------------------------------}}}
-" Backups {{{1
+" Backups {{{
 " -----------------------------------------------------------
 " updatecount   number of characters typed to cause a swap file update (0->disable)
@@ -46,5 +46,5 @@
 set nobackup
 " -----------------------------------------------------------}}}
-" Searching, Substituting {{{1
+" Searching, Substituting {{{
 " -----------------------------------------------------------
 " select case-insenitive search
@@ -75,5 +75,5 @@
 set su=.h,.bak,~,.o,.info,.swp,.obj
 " ----------------------------------------------------------------------}}}
-" Colors and theme {{{1
+" Colors and theme {{{
 " ----------------------------------------------------------------------
 " use 256 colors
@@ -88,5 +88,5 @@
 " ----------------------------------------------------------------------}}}
 
-" Mappings{{{1
+" Mappings{{{
 " ----------------------------------------------------------------------
 "stop highlightings when spce is pressed
@@ -111,5 +111,5 @@
 map Q gq
 " ----------------------------------------------------------------------}}}
-" Autocommands {{{1
+" Autocommands {{{
 " ----------------------------------------------------------------------
 " Only do this part when compiled with support for autocommands.
@@ -140,5 +140,5 @@
 endif " has("autocmd")
 " ----------------------------------------------------------------------}}}
-" Matlab special {{{1
+" Matlab special {{{
 " ----------------------------------------------------------------------
 "" associate *.par with matlab filetype
@@ -146,5 +146,5 @@
 au BufRead,BufNewFile *.tpl setfiletype html
 " ----------------------------------------------------------------------}}}
-" C special{{{1
+" C special{{{
 " ----------------------------------------------------------------------
 "indenting for C-code
@@ -153,5 +153,5 @@
 set cinoptions={.5s,+.5s,t0,n-2,p2s,(03s,=.5s,>1s,=1s,:1s 
 " ----------------------------------------------------------------------}}}
-" TEX special{{{1
+" TEX special{{{
 " ----------------------------------------------------------------------
 au BufRead,BufNewFile *.tex,*.html set textwidth=100     "100 caracters max (See gq command)
@@ -165,9 +165,9 @@
 let g:tex_flavor='latex'
 " ----------------------------------------------------------------------}}}
-" FORTRAN special{{{1
+" FORTRAN special{{{
 " ----------------------------------------------------------------------
 au BufRead,BufNewFile *.src setfiletype fortran
 " ----------------------------------------------------------------------}}}
-" InsertTabWrapper{{{1
+" InsertTabWrapper{{{
 " ----------------------------------------------------------------------
 function! InsertTabWrapper(direction) 
@@ -192,5 +192,5 @@
 " ----------------------------------------------------------------------}}}
 
-" Abbreviations {{{1
+" Abbreviations {{{
 " ----------------------------------------------------------------------
 "func Eatchar(pat)
@@ -225,5 +225,5 @@
 "au BufRead,BufNewFile *.tex ab (()) \left( \right)
 "}}}
-" Skeletons {{{1
+" Skeletons {{{
 au BufNewFile letter.tex   0r ~/.vim/xtr/skeleton/letter.tex
 "}}}