Index: ../trunk-jpl/test/NightlyRun/test332.py
===================================================================
--- ../trunk-jpl/test/NightlyRun/test332.py	(revision 0)
+++ ../trunk-jpl/test/NightlyRun/test332.py	(revision 18973)
@@ -0,0 +1,46 @@
+import numpy
+from model import *
+from triangle import *
+from setmask import *
+from parameterize import *
+from transient import *
+from setflowequation import *
+from EnumDefinitions import *
+from solve import *
+from MatlabFuncs import *
+
+from generic import generic
+
+md=triangle(model(),'../Exp/Square.exp',100000.)
+md=setmask(md,'','')
+md=parameterize(md,'../Par/SquareSheetConstrained.py')
+
+md.transient=transient.setallnullparameters(md.transient)
+md.transient.ishydrology=True
+
+md=setflowequation(md,'SSA','all')
+md.cluster=generic('name',oshostname(),'np',1)
+md.hydrology=hydrologydc()
+md.hydrology=md.hydrology.initialize(md)
+
+md.hydrology.isefficientlayer=0
+md.hydrology.sedimentlimit_flag=1
+md.hydrology.sedimentlimit=8000.0
+md.initialization.sediment_head=numpy.zeros((md.mesh.numberofvertices,1))
+md.hydrology.spcsediment_head=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+pos=numpy.nonzero(md.mesh.y==0.)[0]
+md.hydrology.spcsediment_head[pos]=0.0
+md.basalforcings.groundedice_melting_rate = 2.0*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.floatingice_melting_rate = 0.0*numpy.ones((md.mesh.numberofvertices,1))
+md.hydrology.sediment_transmitivity= 3.0*numpy.ones((md.mesh.numberofvertices,1))
+md.timestepping.time_step=0
+md.timestepping.final_time=1.0
+md=solve(md,HydrologySolutionEnum())
+
+#Fields and tolerances to track changes
+#you can also compare with an analitic solution, but it is exact
+#only if no limits are applied
+#analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity))
+field_names     =['SedimentWaterHead','SedimentHeadResidual']
+field_tolerances=[1e-13, 3e-10]
+field_values=[md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual]
Index: ../trunk-jpl/test/NightlyRun/test333.py
===================================================================
--- ../trunk-jpl/test/NightlyRun/test333.py	(revision 0)
+++ ../trunk-jpl/test/NightlyRun/test333.py	(revision 18973)
@@ -0,0 +1,67 @@
+import numpy
+from model import *
+from triangle import *
+from setmask import *
+from parameterize import *
+from transient import *
+from setflowequation import *
+from EnumDefinitions import *
+from solve import *
+from MatlabFuncs import *
+
+from generic import generic
+
+md=triangle(model(),'../Exp/Square.exp',100000.)
+md=setmask(md,'','')
+md=parameterize(md,'../Par/SquareSheetConstrained.py')
+md.transient=transient.setallnullparameters(md.transient)
+md.transient.ishydrology=True
+md=setflowequation(md,'SSA','all')
+md.cluster=generic('name',oshostname(),'np',1)
+md.hydrology=hydrologydc()
+md.hydrology=md.hydrology.initialize(md)
+
+md.hydrology.isefficientlayer=1
+md.hydrology.sedimentlimit_flag=1
+md.hydrology.sedimentlimit=800.0
+md.initialization.sediment_head=numpy.zeros((md.mesh.numberofvertices,1))
+md.hydrology.spcsediment_head=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+
+md.basalforcings.groundedice_melting_rate = 2.0*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.floatingice_melting_rate = 0.0*numpy.ones((md.mesh.numberofvertices,1))
+md.hydrology.sediment_transmitivity= 3.0*numpy.ones((md.mesh.numberofvertices,1))
+
+md.initialization.epl_head=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.epl_thickness=numpy.ones((md.mesh.numberofvertices,1))
+md.hydrology.spcepl_head=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.hydrology.mask_eplactive_node=numpy.zeros((md.mesh.numberofvertices,1))
+md.hydrology.epl_conductivity=30
+md.hydrology.epl_initial_thickness=1
+md.hydrology.epl_colapse_thickness=1.0e-3
+md.hydrology.epl_max_thickness=1
+md.timestepping.time_step=0.2
+md.timestepping.final_time=2.0
+
+md=solve(md,TransientSolutionEnum())
+
+field_names     =['SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1', \
+						'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4', \
+						'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5', \
+						'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9']
+field_tolerances=[ \
+	1e-13, 1e-13, 1e-13, \
+	1e-13, 1e-13, 1e-13, \
+	1e-13, 5e-12, 8e-12, \
+	1e-13, 5e-12, 1e-11]
+field_values=[md.results.TransientSolution[0].SedimentHead, \
+							md.results.TransientSolution[0].EplHead, \
+							md.results.TransientSolution[0].SedimentHeadResidual, \
+							md.results.TransientSolution[3].SedimentHead, \
+							md.results.TransientSolution[3].EplHead, \
+							md.results.TransientSolution[3].SedimentHeadResidual, \
+							md.results.TransientSolution[4].SedimentHead, \
+							md.results.TransientSolution[4].EplHead, \
+							md.results.TransientSolution[4].SedimentHeadResidual, \
+							md.results.TransientSolution[8].SedimentHead, \
+							md.results.TransientSolution[8].EplHead, \
+							md.results.TransientSolution[8].SedimentHeadResidual]
Index: ../trunk-jpl/test/NightlyRun/test3300.m
===================================================================
--- ../trunk-jpl/test/NightlyRun/test3300.m	(revision 18972)
+++ ../trunk-jpl/test/NightlyRun/test3300.m	(revision 18973)
@@ -21,32 +21,36 @@
 md.hydrology.spcepl_head=NaN*ones(md.mesh.numberofvertices,1);
 md.hydrology.mask_eplactive_node=0*ones(md.mesh.numberofvertices,1);
 
-md.hydrology.epl_conductivity=1.5e-2;
+pos=find(md.mesh.y==0 & md.mesh.x<6.0e5 & md.mesh.x>4.0e5);
+md.hydrology.spcepl_head(pos)=0.0;
+
+
+md.hydrology.epl_conductivity=1000;
 md.hydrology.epl_initial_thickness=1.0;
-md.hydrology.epl_colapse_thickness=1.0e-6;
+md.hydrology.epl_colapse_thickness=1.0e-5;
 md.hydrology.epl_max_thickness=5.0;
 
 md.hydrology.transfer_flag=1.0;
-md.hydrology.leakage_factor=3.9e-12;
+md.hydrology.leakage_factor=1.0e-1;
 
-times=0:0.2:8.0;
+times=0:0.2:30.0;
 md.basalforcings.groundedice_melting_rate=ones(md.mesh.numberofvertices+1,length(times));
 
-for i=1:length(times)
-	if(times(i)<=1.0)
-		md.basalforcings.groundedice_melting_rate(:,i)=1.0;
-	elseif(times(i)<=6.0)
-		md.basalforcings.groundedice_melting_rate(:,i)=-0.2;
-	else
-		md.basalforcings.groundedice_melting_rate(:,i)=0.0;
- end
-end	
-
+% for i=1:length(times)
+% 	if(times(i)<=1.0)
+% 		md.basalforcings.groundedice_melting_rate(:,i)=1.0;
+% 	elseif(times(i)<=6.0)
+% 		md.basalforcings.groundedice_melting_rate(:,i)=-0.2;
+% 	else
+% 		md.basalforcings.groundedice_melting_rate(:,i)=0.0;
+%  end
+% end	
+md.basalforcings.groundedice_melting_rate(:,:)=1.0;
 md.basalforcings.groundedice_melting_rate(end,:)=times;
 
 
 md.timestepping.time_step=0.2;
-md.timestepping.final_time=8.0;
+md.timestepping.final_time=30.0;
 
 md=solve(md,TransientSolutionEnum());
 
