Index: /issm/trunk-jpl/configs/config-macosx64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64.sh	(revision 20946)
+++ /issm/trunk-jpl/configs/config-macosx64.sh	(revision 20947)
@@ -11,9 +11,8 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+   --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lpmpich -lmpich -lmpl" \
 	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-fortran-lib="/usr/lib/gcc/i686-apple-darwin10/4.2.1/x86_64/libgfortran.a" \
-	--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
-	--with-numthreads=8
+	--with-numthreads=8 \
+	--enable-debugging \
+	--enable-development
Index: /issm/trunk-jpl/examples/IceflowModels/eismint.m
===================================================================
--- /issm/trunk-jpl/examples/IceflowModels/eismint.m	(revision 20946)
+++ /issm/trunk-jpl/examples/IceflowModels/eismint.m	(revision 20947)
@@ -14,5 +14,5 @@
 
 %Set ice flow approximation
-md=setflowequation(md,'SIA','all');
+md=setflowequation(md,'SSA','all');
 
 %Create boundary conditions: zero velocity on the bed
Index: /issm/trunk-jpl/examples/IceflowModels/runme.m
===================================================================
--- /issm/trunk-jpl/examples/IceflowModels/runme.m	(revision 20946)
+++ /issm/trunk-jpl/examples/IceflowModels/runme.m	(revision 20947)
@@ -5,4 +5,5 @@
 %Set flow equation
 md=setflowequation(md,'HO','Contour.exp','fill','SSA','coupling','tiling');
+%md=setflowequation(md,'SSA','all');
 %Solve
 md=solve(md,StressbalanceSolutionEnum);
Index: /issm/trunk-jpl/examples/Inversion/CheatSheet.m
===================================================================
--- /issm/trunk-jpl/examples/Inversion/CheatSheet.m	(revision 20946)
+++ /issm/trunk-jpl/examples/Inversion/CheatSheet.m	(revision 20947)
@@ -1,5 +1,5 @@
 step=1;
 if step==1
-	%Generate observations
+	%Generate observation
 	md = model;
 	md = triangle(md,'DomainOutline.exp',100000);
@@ -23,8 +23,9 @@
 	md.friction.coefficient(find(md.mesh.x<600000 & md.mesh.x>400000))=10;
 
-	md = solve(md,StressbalanceSolutionEnum());
+	md = solve(md,StressbalanceSolutionEnum);
 
-	plotmodel(md,'axis#all','tight','data',md.friction.coefficient,'caxis',[0 100],'title','"True" \alpha',...
-		'data',md.results.StressbalanceSolution.Vel,'title','"observed velocities"')
+	plotmodel(md,'data',md.friction.coefficient,'figure',1);
+	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);
+
 	save model1 md
 end
@@ -41,8 +42,8 @@
 	md.inversion.vel_obs = md.results.StressbalanceSolution.Vel;
 
-	md = solve(md,StressbalanceSolutionEnum());
+	md = solve(md,StressbalanceSolutionEnum);
 
-	plotmodel(md,'axis#all','tight','data',md.friction.coefficient,'caxis',[0 100],'title','\alpha first guess',...
-		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
+	plotmodel(md,'data',md.friction.coefficient,'figure',1);
+	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);
 
 	save model2 md
@@ -61,6 +62,6 @@
 
 	%Hands on: STEP 2
-	md.inversion.cost_functions = [101 103];
-	md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,2);
+	md.inversion.cost_functions = 101;
+	md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,1);
 
 	%Hands on: STEP 3
@@ -70,7 +71,7 @@
 	%Go solve!
 	md.verbose=verbose(0);
-	md=solve(md,StressbalanceSolutionEnum());
+	md=solve(md,StressbalanceSolutionEnum);
 
-	plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.FrictionCoefficient,'caxis',[0 100],'title','inferred \alpha',...
-		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
+	plotmodel(md,'data',md.results.StressbalanceSolution.FrictionCoefficient,'figure',1,'caxis',[10 50]);
+	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);  
 end
Index: /issm/trunk-jpl/examples/Inversion/runme.m
===================================================================
--- /issm/trunk-jpl/examples/Inversion/runme.m	(revision 20946)
+++ /issm/trunk-jpl/examples/Inversion/runme.m	(revision 20947)
@@ -1,14 +1,24 @@
-step=1;
+step=3;
 if step==1
-	%Generate observations
+	%Generate observation
 	md = model;
 	md = triangle(md,'DomainOutline.exp',100000);
-	md = setmask(md,'all','');
+	md = setmask(md,'','');
 	md = parameterize(md,'Square.par');
 	md = setflowequation(md,'SSA','all');
+    md.geometry.base = md.geometry.base + 100;
+    md.geometry.surface = md.geometry.surface + 100;
+    md.materials.rheology_B(:) = 1.8*10^8;
+    md.friction.coefficient(:) = 50;
+    pos = find(md.mesh.x < 600000 & md.mesh.x > 400000);
+    md.friction.coefficient(pos) = 10;
 	md.cluster = generic('np',2);
-	md = solve(md,StressbalanceSolutionEnum());
-	plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','"True" B',...
-		'data',md.results.StressbalanceSolution.Vel,'title','"observed velocities"')
+
+    
+	md = solve(md,StressbalanceSolutionEnum);
+
+	plotmodel(md,'data',md.friction.coefficient,'caxis',[0 100],'figure',1,'gridded#all',1);
+	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2,'gridded#all',1);  
+
 	save model1 md
 end
@@ -17,5 +27,6 @@
 	loadmodel('model1.mat');
 	md.materials.rheology_B(:) = 1.8*10^8;
-
+    md.friction.coefficient(:) = 50;
+    
 	%results of previous run are taken as observations
 	md.inversion=m1qn3inversion();
@@ -24,7 +35,9 @@
 	md.inversion.vel_obs = md.results.StressbalanceSolution.Vel;
 
-	md = solve(md,StressbalanceSolutionEnum());
-	plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','B first guess',...
-		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
+	md = solve(md,StressbalanceSolutionEnum);
+
+	plotmodel(md,'data',md.friction.coefficient,'caxis',[0 100],'figure',1);
+	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);  
+
 	save model2 md
 end
@@ -36,16 +49,19 @@
 	maxsteps = 20;
 	md.inversion.iscontrol = 1;
-	md.inversion.control_parameters = {'MaterialsRheologyBbar'};
+	md.inversion.control_parameters = {'FrictionCoefficient'};
 	md.inversion.maxsteps = maxsteps;
-	md.inversion.cost_functions = 101;
-	md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,1);
-	md.inversion.min_parameters    = cuffey(273)*ones(md.mesh.numberofvertices,1);
-	md.inversion.max_parameters    = cuffey(200)*ones(md.mesh.numberofvertices,1);
+	md.inversion.cost_functions = [101 103 501];
+	md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,3);
+    md.inversion.cost_functions_coefficients(:,1) = 1000;
+    md.inversion.cost_functions_coefficients(:,3) = 0.05;
+	md.inversion.min_parameters    = 1*ones(md.mesh.numberofvertices,1);
+	md.inversion.max_parameters    = 100*ones(md.mesh.numberofvertices,1);
 
 	%Go solve!
 	md.verbose=verbose(0);
-	md=solve(md,StressbalanceSolutionEnum());
-	plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
-		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
+	md=solve(md,StressbalanceSolutionEnum);
+
+	plotmodel(md,'data',md.results.StressbalanceSolution.FrictionCoefficient,'caxis',[0 100],'figure',1);
+	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);  
 end
 if step==4
@@ -61,11 +77,12 @@
 	md.inversion.cost_functions_coefficients      = ones(md.mesh.numberofvertices,1);
 	md.inversion.cost_functions_coefficients(:,2) = 10^-16*ones(md.mesh.numberofvertices,1);
-	md.inversion.min_parameters    = cuffey(273)*ones(md.mesh.numberofvertices,1);
-	md.inversion.max_parameters    = cuffey(200)*ones(md.mesh.numberofvertices,1);
+	md.inversion.min_parameters    = paterson(273)*ones(md.mesh.numberofvertices,1);
+	md.inversion.max_parameters    = paterson(200)*ones(md.mesh.numberofvertices,1);
 
 	%Go solve!
 	md.verbose=verbose(0);
-	md=solve(md,StressbalanceSolutionEnum());
-	plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
-		'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
+	md=solve(md,StressbalanceSolutionEnum);
+
+	plotmodel(md,'data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'figure',1);
+	plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'figure',2);  
 end
Index: /issm/trunk-jpl/examples/Pig/runme.m
===================================================================
--- /issm/trunk-jpl/examples/Pig/runme.m	(revision 20946)
+++ /issm/trunk-jpl/examples/Pig/runme.m	(revision 20947)
@@ -138,5 +138,9 @@
 
 	% Save model
+<<<<<<< .mine
+	save ./Models/PIG_ModelHO md;
+=======
 	save ./Models/PIG_Control_drag md;
+>>>>>>> .r20806
 end
 
@@ -161,14 +165,17 @@
 
 	% Load Model
-
+    md = loadmodel('./Models/PIG_Control_drag.mat');
 	% Disable inversion
-
+    md.inversion.iscontrol = 0;
 	% Extrude Mesh
-
+    md = extrude(md, 10, 1);
 	% Set Flowequation
-
+    md = setflowequation(md,'HO','all');
 	% Solve
-
+    md.cluster=generic('name',oshostname,'np',2);
+	md=solve(md,StressbalanceSolutionEnum);
 	% Save Model
+    save ./Models/PIG_Control_drag md;
+    
 
 end
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-greenplanet.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.7-greenplanet.sh	(revision 20946)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-greenplanet.sh	(revision 20947)
@@ -5,14 +5,14 @@
 
 #Some cleanup
-rm -rf install petsc-3.7.2 src
+rm -rf install petsc-3.7.1 src
 mkdir install src
 
 #Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
 
 #Untar and move petsc to install directory
-tar -zxvf  petsc-3.7.2.tar.gz
-mv petsc-3.7.2/* src/
-rm -rf petsc-3.7.2
+tar -zxvf  petsc-3.7.1.tar.gz
+mv petsc-3.7.1/* src/
+rm -rf petsc-3.7.1
 
 #configure
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-hpc.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.7-hpc.sh	(revision 20946)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-hpc.sh	(revision 20947)
@@ -5,14 +5,14 @@
 
 #Some cleanup
-rm -rf install petsc-3.7.2 src
+rm -rf install petsc-3.7.1 src
 mkdir install src
 
 #Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
 
 #Untar and move petsc to install directory
-tar -zxvf  petsc-3.7.2.tar.gz
-mv petsc-3.7.2/* src/
-rm -rf petsc-3.7.2
+tar -zxvf  petsc-3.7.1.tar.gz
+mv petsc-3.7.1/* src/
+rm -rf petsc-3.7.1
 
 #configure
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh	(revision 20946)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh	(revision 20947)
@@ -3,14 +3,14 @@
 
 #Some cleanup
-rm -rf install petsc-3.7.2 src
+rm -rf install petsc-3.7.1 src
 mkdir install src
 
 #Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
 
 #Untar and move petsc to install directory
-tar -zxvf  petsc-3.7.2.tar.gz
-mv petsc-3.7.2/* src/
-rm -rf petsc-3.7.2
+tar -zxvf  petsc-3.7.1.tar.gz
+mv petsc-3.7.1/* src/
+rm -rf petsc-3.7.1
 
 #configure
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64.sh	(revision 20946)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64.sh	(revision 20947)
@@ -7,5 +7,5 @@
 
 #Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.2.tar.gz' 'petsc-3.7.2.tar.gz'
+#$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.1.tar.gz' 'petsc-3.7.1.tar.gz'
 
 #Untar and move petsc to install directory
@@ -15,9 +15,8 @@
 
 #configure
+#	--download-mpich \
+#	--with-fc=/usr/local/Cellar/gcc/6.1.0/bin/gfortran \
 cd src
 ./config/configure.py \
-	--CXXOPTFLAGS="-g -O3" \
-	--COPTFLAGS="-g -O3" \
-	--FOPTFLAGS="-g -O3" \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
Index: /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim
===================================================================
--- /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim	(revision 20946)
+++ /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim	(revision 20947)
@@ -412,5 +412,4 @@
 syn keyword cType BoolInput
 syn keyword cType BoolParam
-syn keyword cType classes
 syn keyword cType Constraint
 syn keyword cType Constraints
@@ -419,6 +418,6 @@
 syn keyword cType ControlInput
 syn keyword cType Covertree
+syn keyword cType DataSetParam
 syn keyword cType DatasetInput
-syn keyword cType DataSetParam
 syn keyword cType Definition
 syn keyword cType DependentObject
@@ -434,6 +433,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
@@ -442,10 +441,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
@@ -453,4 +451,5 @@
 syn keyword cType GiaDeflectionCoreArgs
 syn keyword cType Hook
+syn keyword cType IndependentObject
 syn keyword cType Input
 syn keyword cType Inputs
@@ -462,5 +461,4 @@
 syn keyword cType IssmDirectApplicInterface
 syn keyword cType IssmParallelDirectApplicInterface
-syn keyword cType krigingobjects
 syn keyword cType Load
 syn keyword cType Loads
@@ -470,13 +468,10 @@
 syn keyword cType Material
 syn keyword cType Materials
-syn keyword cType Matestar
 syn keyword cType Matice
 syn keyword cType Matpar
-syn keyword cType matrixobjects
 syn keyword cType MatrixParam
 syn keyword cType Misfit
 syn keyword cType Moulin
 syn keyword cType Neumannflux
-syn keyword cType Nodalvalue
 syn keyword cType Node
 syn keyword cType Nodes
@@ -485,6 +480,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
@@ -498,10 +493,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
@@ -523,4 +518,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 AdjointBalancethickness2Analysis
 syn keyword cType AdjointBalancethicknessAnalysis
@@ -552,5 +551,4 @@
 syn keyword cType MeltingAnalysis
 syn keyword cType MeshdeformationAnalysis
-syn keyword cType SealevelriseAnalysis
 syn keyword cType SmbAnalysis
 syn keyword cType SmoothAnalysis
@@ -562,12 +560,5 @@
 "ISSM's objects end
 "ISSM's Enums begin
-syn keyword cConstant ParametersSTARTEnum
 syn keyword cConstant FemModelEnum
-syn keyword cConstant FemModelCommEnum
-syn keyword cConstant WorldCommEnum
-syn keyword cConstant IcecapToEarthCommEnum
-syn keyword cConstant NumModelsEnum
-syn keyword cConstant ModelIdEnum
-syn keyword cConstant EarthIdEnum
 syn keyword cConstant AutodiffIsautodiffEnum
 syn keyword cConstant AutodiffNumDependentsEnum
@@ -609,20 +600,7 @@
 syn keyword cConstant BasalforcingsThresholdThicknessEnum
 syn keyword cConstant BasalforcingsUpperdepthMeltEnum
-syn keyword cConstant BasalforcingsMantleconductivityEnum
-syn keyword cConstant BasalforcingsNusseltEnum
-syn keyword cConstant BasalforcingsDtbgEnum
-syn keyword cConstant BasalforcingsPlumeradiusEnum
-syn keyword cConstant BasalforcingsTopplumedepthEnum
-syn keyword cConstant BasalforcingsBottomplumedepthEnum
-syn keyword cConstant BasalforcingsPlumexEnum
-syn keyword cConstant BasalforcingsPlumeyEnum
-syn keyword cConstant BasalforcingsCrustthicknessEnum
-syn keyword cConstant BasalforcingsUppercrustthicknessEnum
-syn keyword cConstant BasalforcingsUppercrustheatEnum
-syn keyword cConstant BasalforcingsLowercrustheatEnum
 syn keyword cConstant FloatingMeltRateEnum
 syn keyword cConstant LinearFloatingMeltRateEnum
 syn keyword cConstant MismipFloatingMeltRateEnum
-syn keyword cConstant MantlePlumeGeothermalFluxEnum
 syn keyword cConstant BedEnum
 syn keyword cConstant BaseEnum
@@ -632,5 +610,4 @@
 syn keyword cConstant DependentObjectEnum
 syn keyword cConstant StressbalanceAbstolEnum
-syn keyword cConstant StressbalanceConvergenceNumStepsEnum
 syn keyword cConstant StressbalanceIsnewtonEnum
 syn keyword cConstant StressbalanceMaxiterEnum
@@ -738,4 +715,5 @@
 syn keyword cConstant HydrologySpcheadEnum
 syn keyword cConstant HydrologyConductivityEnum
+syn keyword cConstant IndependentObjectEnum
 syn keyword cConstant InversionControlParametersEnum
 syn keyword cConstant InversionControlScalingFactorsEnum
@@ -769,6 +747,4 @@
 syn keyword cConstant InversionVzObsEnum
 syn keyword cConstant MaskIceLevelsetEnum
-syn keyword cConstant MaskOceanLevelsetEnum
-syn keyword cConstant MaskLandLevelsetEnum
 syn keyword cConstant MaterialsBetaEnum
 syn keyword cConstant MaterialsHeatcapacityEnum
@@ -780,10 +756,4 @@
 syn keyword cConstant MaterialsRheologyLawEnum
 syn keyword cConstant MaterialsRheologyNEnum
-syn keyword cConstant MaterialsRheologyKoEnum
-syn keyword cConstant MaterialsRheologyKobarEnum
-syn keyword cConstant MaterialsRheologyEcEnum
-syn keyword cConstant MaterialsRheologyEcbarEnum
-syn keyword cConstant MaterialsRheologyEsEnum
-syn keyword cConstant MaterialsRheologyEsbarEnum
 syn keyword cConstant DamageIsdamageEnum
 syn keyword cConstant DamageDEnum
@@ -813,11 +783,12 @@
 syn keyword cConstant CalvingMeltingrateEnum
 syn keyword cConstant CalvingLevermannEnum
+syn keyword cConstant CalvingPiEnum
 syn keyword cConstant CalvingDevEnum
-syn keyword cConstant CalvingMinthicknessEnum
 syn keyword cConstant DefaultCalvingEnum
 syn keyword cConstant CalvingRequestedOutputsEnum
 syn keyword cConstant CalvinglevermannCoeffEnum
 syn keyword cConstant CalvinglevermannMeltingrateEnum
-syn keyword cConstant CalvingdevCoeffEnum
+syn keyword cConstant CalvingpiCoeffEnum
+syn keyword cConstant CalvingpiMeltingrateEnum
 syn keyword cConstant CalvingratexEnum
 syn keyword cConstant CalvingrateyEnum
@@ -838,5 +809,4 @@
 syn keyword cConstant MaterialsMantleShearModulusEnum
 syn keyword cConstant MaterialsMantleDensityEnum
-syn keyword cConstant MaterialsEarthDensityEnum
 syn keyword cConstant MeshAverageVertexConnectivityEnum
 syn keyword cConstant MeshElements2dEnum
@@ -855,7 +825,4 @@
 syn keyword cConstant MeshYEnum
 syn keyword cConstant MeshZEnum
-syn keyword cConstant MeshLatEnum
-syn keyword cConstant MeshLongEnum
-syn keyword cConstant MeshREnum
 syn keyword cConstant MeshElementtypeEnum
 syn keyword cConstant MeshSegmentsEnum
@@ -865,5 +832,4 @@
 syn keyword cConstant Domain2DverticalEnum
 syn keyword cConstant Domain3DEnum
-syn keyword cConstant Domain3DsurfaceEnum
 syn keyword cConstant MiscellaneousNameEnum
 syn keyword cConstant MasstransportHydrostaticAdjustmentEnum
@@ -923,5 +889,4 @@
 syn keyword cConstant TimesteppingInterpForcingsEnum
 syn keyword cConstant TransientIssmbEnum
-syn keyword cConstant TransientIscouplerEnum
 syn keyword cConstant TransientIsstressbalanceEnum
 syn keyword cConstant TransientIsgroundinglineEnum
@@ -931,6 +896,5 @@
 syn keyword cConstant TransientIsdamageevolutionEnum
 syn keyword cConstant TransientIshydrologyEnum
-syn keyword cConstant TransientIsmovingfrontEnum
-syn keyword cConstant TransientIsslrEnum
+syn keyword cConstant TransientIscalvingEnum
 syn keyword cConstant TransientNumRequestedOutputsEnum
 syn keyword cConstant TransientRequestedOutputsEnum
@@ -1147,5 +1111,4 @@
 syn keyword cConstant MaticeEnum
 syn keyword cConstant MatdamageiceEnum
-syn keyword cConstant MatestarEnum
 syn keyword cConstant MatparEnum
 syn keyword cConstant NodeEnum
@@ -1254,5 +1217,4 @@
 syn keyword cConstant ThicknessAlongGradientEnum
 syn keyword cConstant ThicknessAcrossGradientEnum
-syn keyword cConstant ThicknessPositiveEnum
 syn keyword cConstant IntMatParamEnum
 syn keyword cConstant RheologyBbarAbsGradientEnum
@@ -1284,6 +1246,4 @@
 syn keyword cConstant DeviatoricStressyzEnum
 syn keyword cConstant DeviatoricStresszzEnum
-syn keyword cConstant DeviatoricStresseffectiveEnum
-syn keyword cConstant LambdaSEnum
 syn keyword cConstant StrainRateEnum
 syn keyword cConstant StrainRatexxEnum
@@ -1437,9 +1397,4 @@
 syn keyword cConstant MassfluxatgateDefinitionenumEnum
 syn keyword cConstant MassfluxatgateSegmentsEnum
-syn keyword cConstant NodalvalueEnum
-syn keyword cConstant NodalvalueNameEnum
-syn keyword cConstant NodalvalueDefinitionenumEnum
-syn keyword cConstant NodalvalueModelEnumEnum
-syn keyword cConstant NodalvalueNodeEnum
 syn keyword cConstant MisfitNameEnum
 syn keyword cConstant MisfitDefinitionenumEnum
@@ -1468,11 +1423,8 @@
 syn keyword cConstant MaxVzEnum
 syn keyword cConstant MaxAbsVzEnum
-syn keyword cConstant FloatingAreaEnum
 syn keyword cConstant GroundedAreaEnum
 syn keyword cConstant IceMassEnum
 syn keyword cConstant IceVolumeEnum
 syn keyword cConstant IceVolumeAboveFloatationEnum
-syn keyword cConstant TotalFloatingBmbEnum
-syn keyword cConstant TotalGroundedBmbEnum
 syn keyword cConstant TotalSmbEnum
 syn keyword cConstant AbsoluteEnum
@@ -1511,6 +1463,4 @@
 syn keyword cConstant NodalEnum
 syn keyword cConstant OldGradientEnum
-syn keyword cConstant OutputBufferPointerEnum
-syn keyword cConstant OutputBufferSizePointerEnum
 syn keyword cConstant OutputFilePointerEnum
 syn keyword cConstant ToolkitsFileNameEnum
@@ -1547,10 +1497,9 @@
 syn keyword cConstant OptionStructEnum
 syn keyword cConstant CuffeyEnum
-syn keyword cConstant BuddJackaEnum
-syn keyword cConstant CuffeyTemperateEnum
 syn keyword cConstant PatersonEnum
 syn keyword cConstant ArrheniusEnum
 syn keyword cConstant LliboutryDuvalEnum
-syn keyword cConstant SpclevelsetEnum
+syn keyword cConstant TransientIslevelsetEnum
+syn keyword cConstant SpcLevelsetEnum
 syn keyword cConstant ExtrapolationVariableEnum
 syn keyword cConstant IceMaskNodeActivationEnum
@@ -1558,26 +1507,4 @@
 syn keyword cConstant LevelsetfunctionSlopeYEnum
 syn keyword cConstant LevelsetfunctionPicardEnum
-syn keyword cConstant LevelsetReinitFrequencyEnum
-syn keyword cConstant SealevelriseSolutionEnum
-syn keyword cConstant SealevelriseAnalysisEnum
-syn keyword cConstant SealevelEnum
-syn keyword cConstant SealevelEustaticEnum
-syn keyword cConstant SealevelriseDeltathicknessEnum
-syn keyword cConstant SealevelriseMaxiterEnum
-syn keyword cConstant SealevelriseReltolEnum
-syn keyword cConstant SealevelriseAbstolEnum
-syn keyword cConstant SealevelriseLoveHEnum
-syn keyword cConstant SealevelriseLoveKEnum
-syn keyword cConstant SealevelriseTideLoveHEnum
-syn keyword cConstant SealevelriseTideLoveKEnum
-syn keyword cConstant SealevelriseRigidEnum
-syn keyword cConstant SealevelriseElasticEnum
-syn keyword cConstant SealevelriseRotationEnum
-syn keyword cConstant SealevelriseGElasticEnum
-syn keyword cConstant SealevelriseDegaccEnum
-syn keyword cConstant SealevelriseTransitionsEnum
-syn keyword cConstant SealevelriseRequestedOutputsEnum
-syn keyword cConstant SealevelriseNumRequestedOutputsEnum
-syn keyword cConstant ParametersENDEnum
 "ISSM's Enums end
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Index: /issm/trunk-jpl/jenkins/linux64_ross_se
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_se	(revision 20946)
+++ /issm/trunk-jpl/jenkins/linux64_ross_se	(revision 20947)
@@ -38,5 +38,4 @@
 EXTERNALPACKAGES="autotools     install.sh                
 						mpich         install-3.0-linux64.sh    
-						cmake         install.sh
 						petsc         install-3.6-linux64.sh    
 						triangle      install-linux64.sh        
@@ -44,7 +43,5 @@
 						gshhg         install.sh
 						gdal          install-1.10-linux64.sh
-						hdf5          install.sh
-						netcdf        install.sh
-						gmt           install-jenkins.sh
+						gmt           install.sh
 						gmsh          install.sh
 						shell2junit   install.sh"
Index: /issm/trunk-jpl/scripts/ol
===================================================================
--- /issm/trunk-jpl/scripts/ol	(revision 20946)
+++ /issm/trunk-jpl/scripts/ol	(revision 20947)
@@ -3,5 +3,5 @@
 #Get the runme file, read it, and display steps
 rm -rf orglist_temporary_file
-LIST=$(cat runme.m | grep perform | grep if | sed "s/'/ /g" | awk '{print $3}')
+LIST=$(cat runme.m | grep perform | sed "s/'/ /g" | awk '{print $3}')
 
 COUNT=0;
Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 20946)
+++ /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 20947)
@@ -660,4 +660,6 @@
 						this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
 					} else if(strcmp(record_name,"md.masstransport.hydrostatic_adjustment")==0){
+						this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
+					} else if(strcmp(record_name,"md.materials.rheology_law")==0){
 						this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
 					} else {
@@ -792,4 +794,6 @@
 						} else if(strcmp(record_name,"md.masstransport.hydrostatic_adjustment")==0){
 							this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
+						} else if(strcmp(record_name,"md.materials.rheology_law")==0){
+							this->AddConstant(new IoConstant(StringToEnumx(string),record_name));
 						} else {
 							/*Add string to parameters: */
@@ -799,5 +803,4 @@
 						/*Free string*/
 						xDelete<char>(string);
-
 						break;
 					case 5: break; //do nothing. not interested in this type of data, which is memory intensive.
Index: /issm/trunk-jpl/src/m/classes/matdamageice.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matdamageice.m	(revision 20946)
+++ /issm/trunk-jpl/src/m/classes/matdamageice.m	(revision 20947)
@@ -168,5 +168,5 @@
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1);
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
-			WriteData(fid,prefix,'data',StringToEnum(self.rheology_law),'name','md.materials.rheology_law','format','Integer');
+			WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String');
 
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
Index: /issm/trunk-jpl/src/m/classes/matdamageice.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/matdamageice.py	(revision 20946)
+++ /issm/trunk-jpl/src/m/classes/matdamageice.py	(revision 20947)
@@ -160,5 +160,5 @@
 		WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1)
 		WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2)
-		WriteData(fid,prefix,'data',StringToEnum(self.rheology_law)[0],'name','md.materials.rheology_law','format','Integer')
+		WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String')
 
 		WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
Index: /issm/trunk-jpl/src/m/classes/matestar.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matestar.m	(revision 20946)
+++ /issm/trunk-jpl/src/m/classes/matestar.m	(revision 20947)
@@ -172,5 +172,5 @@
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_Ec','format','DoubleMat','mattype',1);
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_Es','format','DoubleMat','mattype',1);
-			WriteData(fid,prefix,'data',StringToEnum(self.rheology_law),'name','md.materials.rheology_law','format','Integer');
+			WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String');
 
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
Index: /issm/trunk-jpl/src/m/classes/matice.js
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.js	(revision 20946)
+++ /issm/trunk-jpl/src/m/classes/matice.js	(revision 20947)
@@ -129,5 +129,5 @@
 			WriteData(fid,prefix,'object',this,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
 			WriteData(fid,prefix,'object',this,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
-			WriteData(fid,prefix,'data',StringToEnum(this.rheology_law),'name','md.materials.rheology_law','format','Integer');
+			WriteData(fid,prefix,'data',this.rheology_law,'name','md.materials.rheology_law','format','String');
 			WriteData(fid,prefix,'object',this,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
 			WriteData(fid,prefix,'object',this,'class','materials','fieldname','lithosphere_density','format','Double','scale',Math.pow(10,3));
Index: /issm/trunk-jpl/src/m/classes/matice.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.m	(revision 20946)
+++ /issm/trunk-jpl/src/m/classes/matice.m	(revision 20947)
@@ -167,5 +167,5 @@
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
-			WriteData(fid,prefix,'data',StringToEnum(self.rheology_law),'name','md.materials.rheology_law','format','Integer');
+			WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String');
 
 			WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
Index: /issm/trunk-jpl/src/m/classes/matice.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.py	(revision 20946)
+++ /issm/trunk-jpl/src/m/classes/matice.py	(revision 20947)
@@ -161,5 +161,5 @@
 		WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
 		WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2)
-		WriteData(fid,prefix,'data',StringToEnum(self.rheology_law)[0],'name','md.materials.rheology_law','format','Integer')
+		WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String')
 
 		WriteData(fid,prefix,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
Index: /issm/trunk-jpl/test/NightlyRun/test101.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test101.m	(revision 20946)
+++ /issm/trunk-jpl/test/NightlyRun/test101.m	(revision 20947)
@@ -4,5 +4,5 @@
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'SSA','all');
-md.cluster=generic('name',oshostname(),'np',2);
+md.cluster=generic('name',oshostname(),'np',1); % originally, 'np',2
 
 %output
Index: /issm/trunk-jpl/test/NightlyRun/test102.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test102.m	(revision 20946)
+++ /issm/trunk-jpl/test/NightlyRun/test102.m	(revision 20947)
@@ -5,5 +5,5 @@
 md=extrude(md,3,2.);
 md=setflowequation(md,'SSA','all');
-md.cluster=generic('name',oshostname(),'np',3);
+md.cluster=generic('name',oshostname(),'np', 3); %originally 3
 md=solve(md,StressbalanceSolutionEnum());
 
Index: /issm/trunk-jpl/test/NightlyRun/test243.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test243.m	(revision 20946)
+++ /issm/trunk-jpl/test/NightlyRun/test243.m	(revision 20947)
@@ -45,5 +45,5 @@
 %Fields and tolerances to track changes
 field_names      ={'SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance'};
-field_tolerances ={1e-7,5e-5,1e-4,5e-5,1e-5,5e-5,1e-5,1e-7,1e-7};
+field_tolerances ={1e-13,1e-13,5e-13,5e-13,1e-13 ,5e-13 ,1e-13,1e-13,1e-13};
 
 field_values={...