Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 24240)
+++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 24241)
@@ -188,12 +188,11 @@
 syn keyword cConstant HydrologydcRelTolEnum
 syn keyword cConstant HydrologydcSedimentCompressibilityEnum
+syn keyword cConstant HydrologydcSedimentlimitEnum
+syn keyword cConstant HydrologydcSedimentlimitFlagEnum
 syn keyword cConstant HydrologydcSedimentPorosityEnum
 syn keyword cConstant HydrologydcSedimentThicknessEnum
-syn keyword cConstant HydrologydcSedimentlimitEnum
-syn keyword cConstant HydrologydcSedimentlimitFlagEnum
 syn keyword cConstant HydrologydcTransferFlagEnum
 syn keyword cConstant HydrologydcUnconfinedFlagEnum
 syn keyword cConstant HydrologydcWaterCompressibilityEnum
-syn keyword cConstant HydrologydtEnum
 syn keyword cConstant HydrologyshreveStabilizationEnum
 syn keyword cConstant IcecapToEarthCommEnum
@@ -337,11 +336,11 @@
 syn keyword cConstant SmbAccurefEnum
 syn keyword cConstant SmbAdThreshEnum
+syn keyword cConstant SmbDesfacEnum
+syn keyword cConstant SmbDpermilEnum
+syn keyword cConstant SmbDsnowIdxEnum
 syn keyword cConstant SmbCldFracEnum
 syn keyword cConstant SmbDelta18oEnum
 syn keyword cConstant SmbDelta18oSurfaceEnum
 syn keyword cConstant SmbDenIdxEnum
-syn keyword cConstant SmbDesfacEnum
-syn keyword cConstant SmbDpermilEnum
-syn keyword cConstant SmbDsnowIdxEnum
 syn keyword cConstant SmbDtEnum
 syn keyword cConstant SmbEnum
@@ -375,4 +374,5 @@
 syn keyword cConstant SmbRunoffrefEnum
 syn keyword cConstant SmbSealevEnum
+syn keyword cConstant SmbStepsPerStepEnum
 syn keyword cConstant SmbSwIdxEnum
 syn keyword cConstant SmbT0dryEnum
@@ -517,14 +517,14 @@
 syn keyword cConstant DrivingStressYEnum
 syn keyword cConstant EffectivePressureEnum
-syn keyword cConstant EffectivePressureHydrostepEnum
-syn keyword cConstant EffectivePressureStackedEnum
+syn keyword cConstant EffectivePressureSubstepEnum
+syn keyword cConstant EffectivePressureTransientEnum
 syn keyword cConstant EnthalpyEnum
 syn keyword cConstant EnthalpyPicardEnum
 syn keyword cConstant EplHeadEnum
-syn keyword cConstant EplHeadHydrostepEnum
 syn keyword cConstant EplHeadOldEnum
 syn keyword cConstant EplHeadSlopeXEnum
 syn keyword cConstant EplHeadSlopeYEnum
-syn keyword cConstant EplHeadStackedEnum
+syn keyword cConstant EplHeadSubstepEnum
+syn keyword cConstant EplHeadTransientEnum
 syn keyword cConstant EsaDeltathicknessEnum
 syn keyword cConstant EsaEmotionEnum
@@ -568,4 +568,14 @@
 syn keyword cConstant HydrologyBumpHeightEnum
 syn keyword cConstant HydrologyBumpSpacingEnum
+syn keyword cConstant HydrologydcBasalMoulinInputEnum
+syn keyword cConstant HydrologydcEplThicknessEnum
+syn keyword cConstant HydrologydcEplThicknessOldEnum
+syn keyword cConstant HydrologydcEplThicknessSubstepEnum
+syn keyword cConstant HydrologydcEplThicknessTransientEnum
+syn keyword cConstant HydrologydcMaskEplactiveEltEnum
+syn keyword cConstant HydrologydcMaskEplactiveNodeEnum
+syn keyword cConstant HydrologydcMaskThawedEltEnum
+syn keyword cConstant HydrologydcMaskThawedNodeEnum
+syn keyword cConstant HydrologydcSedimentTransmitivityEnum
 syn keyword cConstant HydrologyDrainageRateEnum
 syn keyword cConstant HydrologyEnglacialInputEnum
@@ -579,17 +589,7 @@
 syn keyword cConstant HydrologySheetThicknessEnum
 syn keyword cConstant HydrologySheetThicknessOldEnum
+syn keyword cConstant HydrologyWatercolumnMaxEnum
 syn keyword cConstant HydrologyWaterVxEnum
 syn keyword cConstant HydrologyWaterVyEnum
-syn keyword cConstant HydrologyWatercolumnMaxEnum
-syn keyword cConstant HydrologydcBasalMoulinInputEnum
-syn keyword cConstant HydrologydcEplThicknessEnum
-syn keyword cConstant HydrologydcEplThicknessHydrostepEnum
-syn keyword cConstant HydrologydcEplThicknessOldEnum
-syn keyword cConstant HydrologydcEplThicknessStackedEnum
-syn keyword cConstant HydrologydcMaskEplactiveEltEnum
-syn keyword cConstant HydrologydcMaskEplactiveNodeEnum
-syn keyword cConstant HydrologydcMaskThawedEltEnum
-syn keyword cConstant HydrologydcMaskThawedNodeEnum
-syn keyword cConstant HydrologydcSedimentTransmitivityEnum
 syn keyword cConstant IceEnum
 syn keyword cConstant IceMaskNodeActivationEnum
@@ -664,6 +664,7 @@
 syn keyword cConstant SealevelriseStericRateEnum
 syn keyword cConstant SedimentHeadEnum
-syn keyword cConstant SedimentHeadHydrostepEnum
 syn keyword cConstant SedimentHeadOldEnum
+syn keyword cConstant SedimentHeadSubstepEnum
+syn keyword cConstant SedimentHeadTransientEnum
 syn keyword cConstant SedimentHeadResidualEnum
 syn keyword cConstant SedimentHeadStackedEnum
@@ -712,4 +713,6 @@
 syn keyword cConstant SmbMassBalanceClimateEnum
 syn keyword cConstant SmbMassBalanceEnum
+syn keyword cConstant SmbMassBalanceSubstepEnum
+syn keyword cConstant SmbMassBalanceTransientEnum
 syn keyword cConstant SmbMeanLHFEnum
 syn keyword cConstant SmbMeanSHFEnum
@@ -732,4 +735,6 @@
 syn keyword cConstant SmbReiniEnum
 syn keyword cConstant SmbRunoffEnum
+syn keyword cConstant SmbRunoffSubstepEnum
+syn keyword cConstant SmbRunoffTransientEnum
 syn keyword cConstant SmbS0gcmEnum
 syn keyword cConstant SmbS0pEnum
@@ -1298,4 +1303,5 @@
 syn keyword cType Cfsurfacesquare
 syn keyword cType Channel
+syn keyword cType classes
 syn keyword cType Constraint
 syn keyword cType Constraints
@@ -1304,6 +1310,6 @@
 syn keyword cType ControlInput
 syn keyword cType Covertree
+syn keyword cType DatasetInput
 syn keyword cType DataSetParam
-syn keyword cType DatasetInput
 syn keyword cType Definition
 syn keyword cType DependentObject
@@ -1318,6 +1324,6 @@
 syn keyword cType ElementHook
 syn keyword cType ElementMatrix
+syn keyword cType Elements
 syn keyword cType ElementVector
-syn keyword cType Elements
 syn keyword cType ExponentialVariogram
 syn keyword cType ExternalResult
@@ -1326,9 +1332,10 @@
 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
@@ -1345,4 +1352,5 @@
 syn keyword cType IssmDirectApplicInterface
 syn keyword cType IssmParallelDirectApplicInterface
+syn keyword cType krigingobjects
 syn keyword cType Load
 syn keyword cType Loads
@@ -1355,4 +1363,5 @@
 syn keyword cType Matice
 syn keyword cType Matlitho
+syn keyword cType matrixobjects
 syn keyword cType MatrixParam
 syn keyword cType Misfit
@@ -1367,6 +1376,6 @@
 syn keyword cType Observations
 syn keyword cType Option
+syn keyword cType Options
 syn keyword cType OptionUtilities
-syn keyword cType Options
 syn keyword cType Param
 syn keyword cType Parameters
@@ -1382,10 +1391,10 @@
 syn keyword cType Regionaloutput
 syn keyword cType Results
+syn keyword cType Riftfront
 syn keyword cType RiftStruct
-syn keyword cType Riftfront
 syn keyword cType Seg
 syn keyword cType SegInput
+syn keyword cType Segment
 syn keyword cType SegRef
-syn keyword cType Segment
 syn keyword cType SpcDynamic
 syn keyword cType SpcStatic
@@ -1394,4 +1403,5 @@
 syn keyword cType StringArrayParam
 syn keyword cType StringParam
+syn keyword cType temp
 syn keyword cType Tetra
 syn keyword cType TetraInput
@@ -1407,8 +1417,4 @@
 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 AdjointBalancethickness2Analysis
 syn keyword cType AdjointBalancethicknessAnalysis
@@ -1429,6 +1435,6 @@
 syn keyword cType FreeSurfaceBaseAnalysis
 syn keyword cType FreeSurfaceTopAnalysis
+syn keyword cType GiaIvinsAnalysis
 syn keyword cType GLheightadvectionAnalysis
-syn keyword cType GiaIvinsAnalysis
 syn keyword cType HydrologyDCEfficientAnalysis
 syn keyword cType HydrologyDCInefficientAnalysis
Index: /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh	(revision 24240)
+++ /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh	(revision 24241)
@@ -6,6 +6,6 @@
 
 #Removed existing files
-rm $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
-rm $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp
+rm $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
+rm $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
 
 #Get number of enums
@@ -16,5 +16,5 @@
 #Build EnumToAnalysis.cpp {{{
 #Header
-cat <<END > $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp
+cat <<END > $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
 /*
 * \file EnumToAnalysis.cpp
@@ -37,8 +37,8 @@
 	grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \
 	awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \
-		>> $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp
+		>> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
 
 #Footer
-cat <<END >> $ISSM_DEV_DIR/src/c/analyses/EnumToAnalysis.cpp
+cat <<END >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
 		default : _error_("enum provided not supported ("<<EnumToStringx(analysis_enum)<<")");
 	}
@@ -48,5 +48,5 @@
 #Build analyses.m4{{{
 #Header
-cat <<END > $ISSM_DEV_DIR/m4/analyses.m4
+cat <<END > $ISSM_DIR/m4/analyses.m4
 
 dnl   WARNING: DO NOT MODIFY THIS FILE
@@ -78,8 +78,8 @@
 AC_MSG_RESULT($HAVE_" toupper($1)")\n\
 dnl }}}"}' \
-	>> $ISSM_DEV_DIR/m4/analyses.m4
+	>> $ISSM_DIR/m4/analyses.m4
 
 #Footer
-cat <<END >> $ISSM_DEV_DIR/m4/analyses.m4
+cat <<END >> $ISSM_DIR/m4/analyses.m4
 
 ])
@@ -91,5 +91,5 @@
 #Build EnumToStringx.cpp {{{
 #Header
-cat <<END >  $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
+cat <<END >  $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
 /*
 * \file EnumToStringx.cpp:
@@ -112,7 +112,7 @@
 END
 #core
-cat temp |  awk '{print "\t\t" "case " $1" : return \"" substr($1,1,length($1)-4) "\";"}' >> $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
+cat temp |  awk '{print "\t\t" "case " $1" : return \"" substr($1,1,length($1)-4) "\";"}' >> $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
 #Footer
-cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/EnumToStringx.cpp
+cat <<END >> $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
 		default : return "unknown";
 
@@ -144,5 +144,5 @@
 #Build StringToEnumx.cpp {{{
 #Header
-cat <<END > $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp
+cat <<END > $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
 /*
 * \file StringToEnumx.cpp:
@@ -168,9 +168,9 @@
 i2=120;
 for (( i=1 ; i<=100 ; i++ )); do
-	echo "   if(stage==$i){" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
+	echo "   if(stage==$i){" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
 	awk -v i1=$i1 -v i2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp |
-	awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($1,1,length($1)-4) "\")==0) return " $1 ";"}' >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
-	echo "         else stage=$(($i+1));" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
-	echo "   }" >> $ISSM_DEV_DIR//src/c/shared/Enum/StringToEnumx.cpp
+	awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($1,1,length($1)-4) "\")==0) return " $1 ";"}' >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
+	echo "         else stage=$(($i+1));" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
+	echo "   }" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp
 
 	if [ $i2 -ge $NUMENUMS ]; then break; fi
@@ -180,5 +180,5 @@
 
 #footer
-cat <<END >> $ISSM_DEV_DIR/src/c/shared/Enum/StringToEnumx.cpp
+cat <<END >> $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
 	/*If we reach this point, the string provided has not been found*/
 	if(notfounderror)
Index: /issm/trunk-jpl/src/m/contrib/defleurian/netCDF/export_netCDF.py
===================================================================
--- /issm/trunk-jpl/src/m/contrib/defleurian/netCDF/export_netCDF.py	(revision 24240)
+++ /issm/trunk-jpl/src/m/contrib/defleurian/netCDF/export_netCDF.py	(revision 24241)
@@ -175,6 +175,5 @@
         print(('WARNING type "{}" is unknown for "{}.{}"'.format(val_type, Group.name, field)))
     return DimDict
-
-    # ============================================================================
+# ============================================================================
     # retriev the dimension tuple from a dictionnary
 
Index: /issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py
===================================================================
--- /issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py	(revision 24240)
+++ /issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py	(revision 24241)
@@ -120,6 +120,6 @@
         saved_cells = {}
         timestep = step
-        fid = open((filename + '/Timestep.vtk' + str(timestep) + '.vtk'), 'w + ')
-        fid.write('  # vtk DataFile Version 3.0 \n')
+        fid = open((filename + '/Timestep.vtk' + str(timestep) + '.vtk'), 'w+')
+        fid.write('# vtk DataFile Version 3.0 \n')
         fid.write('Data for run {} \n'.format(md.miscellaneous.name))
         fid.write('ASCII \n')
Index: /issm/trunk-jpl/src/m/dev/devpath.py
===================================================================
--- /issm/trunk-jpl/src/m/dev/devpath.py	(revision 24240)
+++ /issm/trunk-jpl/src/m/dev/devpath.py	(revision 24241)
@@ -5,9 +5,9 @@
 
 #Recover ISSM_DIR and USERNAME
-ISSM_DIR = os.getenv('ISSM_DEV_DIR')
+ISSM_DIR = os.getenv('ISSM_DIR')
 USERNAME = os.getenv('USER')
 JPL_SVN = os.getenv('JPL_SVN')
 if ISSM_DIR is None:
-    raise NameError('"ISSM_DEV_DIR" environment variable is empty! You should define ISSM_DEV_DIR in your .cshrc or .bashrc!')
+    raise NameError('"ISSM_DIR" environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!')
 
     #Go through src / m and append any directory that contains a * .py file to PATH
Index: /issm/trunk-jpl/src/m/miscellaneous/parallelrange.py
===================================================================
--- /issm/trunk-jpl/src/m/miscellaneous/parallelrange.py	(revision 24240)
+++ /issm/trunk-jpl/src/m/miscellaneous/parallelrange.py	(revision 24241)
@@ -1,3 +1,3 @@
-#! / usr / bin / env python
+#!/usr/bin/env python
 def parallelrange(rank, numprocs, globalsize):
     """
Index: /issm/trunk-jpl/src/m/qmu/importancefactors.py
===================================================================
--- /issm/trunk-jpl/src/m/qmu/importancefactors.py	(revision 24240)
+++ /issm/trunk-jpl/src/m/qmu/importancefactors.py	(revision 24241)
@@ -18,5 +18,5 @@
     found = -1
     for i in range(len(responsefunctions)):
-        if strcmpi(responsefunctions[i].descriptor, responsename):
+        if responsefunctions[i].descriptor == responsename:
             found = i
             break