Index: /issm/trunk-jpl/jenkins/windows
===================================================================
--- /issm/trunk-jpl/jenkins/windows	(revision 17059)
+++ /issm/trunk-jpl/jenkins/windows	(revision 17060)
@@ -98,6 +98,6 @@
 #ex: "'id',[101 102 103]"
 
-#In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs.
-MATLAB_NROPTIONS="'exclude',[104, 204, 211, 215, 220, 221, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 701, 702]"
+#In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs. Also exclude all runs with Dakota.
+MATLAB_NROPTIONS="'exclude',[104, 204, 211, 215, 220, 221, 285, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 701, 702, 218, 234, 235, 412, 413, 414, 417, 418, 420]"
 PYTHON_NROPTIONS=""
 
Index: /issm/trunk-jpl/packagers/win7/package32.sh
===================================================================
--- /issm/trunk-jpl/packagers/win7/package32.sh	(revision 17059)
+++ /issm/trunk-jpl/packagers/win7/package32.sh	(revision 17060)
@@ -16,5 +16,5 @@
 END
 
-ls $ISSM_DIR_WIN/scripts/*.bat startup.m $ISSM_DIR_WIN/bin/*.h | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic
+ls $ISSM_DIR_WIN/scripts/*.bat startup.m  | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic
 
 cat << END >> ISSM.aic
@@ -33,5 +33,5 @@
 
 #Run installer: 
-"C:/Program Files (x86)/Caphyon/Advanced Installer 10.1/bin/x86/AdvancedInstaller.com" /execute  ./ISSM.aip ./ISSM.aic
+"C:/Program Files (x86)/Caphyon/Advanced Installer 10.8/bin/x86/AdvancedInstaller.com" /execute  ./ISSM.aip ./ISSM.aic
 
 #Get rid of temporary files: 
Index: /issm/trunk-jpl/packagers/win7/package64.sh
===================================================================
--- /issm/trunk-jpl/packagers/win7/package64.sh	(revision 17059)
+++ /issm/trunk-jpl/packagers/win7/package64.sh	(revision 17060)
@@ -19,5 +19,5 @@
 END
 
-ls $ISSM_DIR_WIN/scripts/*.bat startup.m $ISSM_DIR_WIN/bin/*.h | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic
+ls $ISSM_DIR_WIN/scripts/*.bat startup.m | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic
 
 cat << END >> ISSM.aic
@@ -38,5 +38,5 @@
 
 #Run installer: 
-"C:/Program Files (x86)/Caphyon/Advanced Installer 10.1/bin/x86/AdvancedInstaller.com" /execute  ./ISSM.aip ./ISSM.aic
+"C:/Program Files (x86)/Caphyon/Advanced Installer 10.8/bin/x86/AdvancedInstaller.com" /execute  ./ISSM.aip ./ISSM.aic
 
 #Get rid of temporary files: 
@@ -44,5 +44,4 @@
 rm -rf ISSM.aip ISSM-SetupFiles ISSM.aic
 
-#Upload?: 
+#To upload to website: 
 #scp ISSM.msi websites:/home/larour/files/ISSM64.msi
-#cp  ISSM.msi /cygrdive/z/Desktop/ISSM64.msi
Index: /issm/trunk-jpl/test/NightlyRun/test216.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test216.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test216.m	(revision 17060)
@@ -16,5 +16,5 @@
 %Fields and tolerances to track changes
 field_names     ={'Vx','Vy','Vel','Pressure'};
-field_tolerances={4e-11,2e-11,4e-11,2e-11};
+field_tolerances={8e-7,5e-8,7e-8,2e-11};
 field_values={...
 	(md.results.StressbalanceSolution.Vx),...
Index: /issm/trunk-jpl/test/NightlyRun/test314.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test314.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test314.m	(revision 17060)
@@ -8,5 +8,5 @@
 %Fields and tolerances to track changes
 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'};
-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1.5e-13,1.5e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
 	(md.results.TransientSolution(1).Vx),...
Index: /issm/trunk-jpl/test/NightlyRun/test315.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test315.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test315.m	(revision 17060)
@@ -13,5 +13,5 @@
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
 	1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-	1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+	1e-10,1.5e-13,1.5e-13,1.5e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
 	(md.results.TransientSolution(1).Vx),...
Index: /issm/trunk-jpl/test/NightlyRun/test318.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test318.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test318.m	(revision 17060)
@@ -10,5 +10,5 @@
 %Fields and tolerances to track changes
 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
-field_tolerances={1e-13,1e-13,1.5e-10,1e-10,1e-13,1e-11,1e-6};
+field_tolerances={1e-13,1e-13,4e-10,1e-10,1e-13,1e-11,1e-6};
 field_values={...
 	(md.results.SteadystateSolution.Vx),...
Index: /issm/trunk-jpl/test/NightlyRun/test324.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test324.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test324.m	(revision 17060)
@@ -14,6 +14,6 @@
 	%'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
 field_tolerances={1e-13,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
-	5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-	1e-10,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+	5*1e-11,1e-13,1.5e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+	%1e-10,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
 	(md.results.TransientSolution(1).Vx),...
Index: /issm/trunk-jpl/test/NightlyRun/test328.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test328.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test328.m	(revision 17060)
@@ -14,5 +14,5 @@
 %Fields and tolerances to track changes
 field_names     ={'Vx1','Vy1','Vel1','Bed1','Surface1','Thickness1','SMB1','TotalSmb1','Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','TotalSmb2','Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3','TotalSmb3'};
-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1.5e-13,1e-13};
 field_values={...
 	(md.results.TransientSolution(1).Vx),...
Index: /issm/trunk-jpl/test/NightlyRun/test333.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test333.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test333.m	(revision 17060)
@@ -47,6 +47,6 @@
 field_tolerances={1e-13, 1e-13, 1e-13,...
 								 1e-13, 1e-13, 1e-13,...
-								 1e-13, 1e-13, 1e-13,...
-								 1e-13, 1e-13, 1e-13};
+								 1e-13, 6e-13, 8e-12,...
+								 1e-13, 9e-13, 1e-11};
 field_values={md.results.HydrologySolution(1).SedimentHead, ...
 							md.results.HydrologySolution(1).EplHead,...
Index: /issm/trunk-jpl/test/NightlyRun/test335.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test335.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test335.m	(revision 17060)
@@ -47,6 +47,6 @@
 field_tolerances={1e-13, 1e-13, 1e-13,...
 								 1e-13, 1e-13, 1e-13,...
-								 1e-13, 1e-13, 1e-13,...
-								 1e-13, 1e-13, 1e-13};
+								 1e-13, 6e-13, 9e-12,...
+								 1e-13, 9e-13, 1e-11};
 field_values={md.results.HydrologySolution(1).SedimentHead, ...
 							md.results.HydrologySolution(1).EplHead,...
Index: /issm/trunk-jpl/test/NightlyRun/test410.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test410.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test410.m	(revision 17060)
@@ -10,5 +10,5 @@
 %Fields and tolerances to track changes
 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
-field_tolerances={1e-09,1e-09,1e-08,2e-10,1e-13,2e-10,1e-06};
+field_tolerances={1e-09,1e-09,1e-08,3e-10,1e-13,2e-10,1e-06};
 field_values={...
 	(md.results.SteadystateSolution.Vx),...
Index: /issm/trunk-jpl/test/NightlyRun/test423.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test423.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test423.m	(revision 17060)
@@ -47,4 +47,4 @@
 %Fields and tolerances to track changes
 field_names     ={'ElementOnIceShelfAgressive','VelAgressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'};
-field_tolerances={1e-13,2e-13,1e-13,2e-13,1e-13,2e-13,1e-13,2e-13};
+field_tolerances={1e-13,2e-12,1e-13,2e-12,1e-13,3e-12,1e-13,2e-12};
 field_values={element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2};
Index: /issm/trunk-jpl/test/NightlyRun/test505.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test505.m	(revision 17059)
+++ /issm/trunk-jpl/test/NightlyRun/test505.m	(revision 17060)
@@ -10,6 +10,6 @@
 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
 				      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'};
-field_tolerances={1e-12,1e-12,1e-10,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-						1e-13,1e-12,1e-10,1e-12,1e-13,1e-11,1e-11,2e-12,1e-11,1e-8};
+field_tolerances={1e-12,1e-12,3e-10,1e-12,1e-13,1e-11,5e-12,9e-12,1e-13,5e-9,...
+						5e-11,5e-11,1e-10,2e-11,7e-12,1e-11,1e-11,5e-12,1e-11,2e-8};
 field_values={...
 	(md.results.TransientSolution(1).Vx),...