Index: /issm/trunk-jpl/test/NightlyRun/test330.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test330.m	(revision 21633)
+++ /issm/trunk-jpl/test/NightlyRun/test330.m	(revision 21633)
@@ -0,0 +1,45 @@
+%Test Name:UnConfinedHydroDC
+%setup for Wang 2009 Fig 6b to check confined unconfined treatment
+md=triangle(model(),'../Exp/Strip.exp',10000.);
+md=setmask(md,'','');
+%reduced slab (20m long)
+md.mesh.x=md.mesh.x/5.0e3;
+md.mesh.y=md.mesh.y/5.0e3;
+md=parameterize(md,'../Par/IceCube.py');
+md.transient=deactivateall(md.transient);
+md.transient.ishydrology=1;
+md=setflowequation(md,'SSA','all');
+md.cluster=generic('name',oshostname(),'np',1);
+md.hydrology=(hydrologydc);
+md.hydrology=initialize(md.hydrology,md);
+
+%Hydro Model Parameters
+md.hydrology.isefficientlayer=0;
+md.hydrology.sedimentlimit_flag=0;
+md.hydrology.rel_tol=1.0e-6;
+md.hydrology.penalty_lock=0;
+md.hydrology.max_iter=200;
+md.hydrology.transfer_flag=0;
+md.hydrology.sediment_porosity=0.1;
+%Sediment
+md.hydrology.sediment_thickness=10.0;
+md.hydrology.sediment_transmitivity=(1.0e-3*md.hydrology.sediment_thickness)*ones(md.mesh.numberofvertices,1);
+%init
+md.initialization.sediment_head=-5.0*ones(md.mesh.numberofvertices,1);
+%BC
+md.hydrology.spcsediment_head=NaN*ones((md.mesh.numberofvertices));
+pos=find(md.mesh.x==0)
+md.hydrology.spcsediment_head(pos)=0.5;
+
+md.timestepping.time_step=5/md.constants.yts; %5s steppin
+md.settings.output_frequency=2;
+md.timestepping.final_time=300/md.constants.yts; %500s run
+
+md=solve(md,'Transient');
+
+field_names={'SedimentWaterHead1',...
+						 'SedimentWaterHead2'};
+field_tolerances={1e-13,...
+									1e-13};
+field_values={md.results.TransientSolution[10].SedimentHead,...
+							md.results.TransientSolution[30].SedimentHead};
Index: /issm/trunk-jpl/test/NightlyRun/test330.m~
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test330.m~	(revision 21633)
+++ /issm/trunk-jpl/test/NightlyRun/test330.m~	(revision 21633)
@@ -0,0 +1,44 @@
+%Test Name:UnConfinedHydroDC
+%setup for Wang 2009 Fig 6b to check confined unconfined treatment
+md=triangle(model(),'../Exp/Strip.exp',10000.);
+md=setmask(md,'','');
+%reduced slab (20m long)
+md.mesh.x=md.mesh.x/5.0e3;
+md.mesh.y=md.mesh.y/5.0e3;
+md=parameterize(md,'../Par/IceCube.py');
+md.transient=deactivateall(md.transient);
+md.transient.ishydrology=1;
+md=setflowequation(md,'SSA','all');
+md.cluster=generic('name',oshostname(),'np',1);
+md.hydrology=(hydrologydc);
+md.hydrology=initialize(md.hydrology,md);
+
+%Hydro Model Parameters
+md.hydrology.isefficientlayer=0;
+md.hydrology.sedimentlimit_flag=0;
+md.hydrology.rel_tol=1.0e-6;
+md.hydrology.penalty_lock=0;
+md.hydrology.max_iter=200;
+md.hydrology.transfer_flag=0;
+md.hydrology.sediment_porosity=0.1;
+%Sediment
+md.hydrology.sediment_thickness=10.0;
+md.hydrology.sediment_transmitivity=(1.0e-3*md.hydrology.sediment_thickness)*ones(md.mesh.numberofvertices,1);
+%init
+md.initialization.sediment_head=-5.0*ones(md.mesh.numberofvertices,1);
+%BC
+md.hydrology.spcsediment_head=NaN*ones((md.mesh.numberofvertices));
+md.hydrology.spcsediment_head[np.where(md.mesh.x==0)]=0.5;
+
+md.timestepping.time_step=5/md.constants.yts; %5s steppin
+md.settings.output_frequency=2;
+md.timestepping.final_time=300/md.constants.yts; %500s run
+
+md=solve(md,'Transient');
+
+field_names=['SedimentWaterHead1',
+						 'SedimentWaterHead2'];
+field_tolerances=[1e-13, 
+									1e-13];
+field_values=[md.results.TransientSolution[10].SedimentHead,
+							md.results.TransientSolution[30].SedimentHead];
Index: /issm/trunk-jpl/test/NightlyRun/test330.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test330.py	(revision 21633)
+++ /issm/trunk-jpl/test/NightlyRun/test330.py	(revision 21633)
@@ -0,0 +1,56 @@
+#Test Name:UnConfinedHydroDC
+#setup for Wang 2009 Fig 6b to check confined unconfined treatment
+import numpy as np
+import inspect
+from model import *
+from triangle import triangle
+from setmask import setmask
+from transient import transient
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from socket import gethostname
+from generic import generic
+
+md=triangle(model(),'../Exp/Strip.exp',10000.)
+md=setmask(md,'','')
+#reduced slab (20m long)
+md.mesh.x=md.mesh.x/5.0e3
+md.mesh.y=md.mesh.y/5.0e3
+md=parameterize(md,'../Par/IceCube.py')
+md.transient=transient.setallnullparameters(md.transient)
+md.transient.ishydrology=True
+md=setflowequation(md,'SSA','all')
+md.cluster=generic('name',gethostname(),'np',1)
+md.hydrology=hydrologydc()
+md.hydrology=md.hydrology.initialize(md)
+
+#Hydro Model Parameters
+md.hydrology.isefficientlayer=0
+md.hydrology.sedimentlimit_flag=0
+md.hydrology.rel_tol=1.0e-6
+md.hydrology.penalty_lock=0
+md.hydrology.max_iter=200
+md.hydrology.transfer_flag=0
+md.hydrology.sediment_porosity=0.1
+#Sediment
+md.hydrology.sediment_thickness=10.0
+md.hydrology.sediment_transmitivity=(1.0e-3*md.hydrology.sediment_thickness)*np.ones((md.mesh.numberofvertices))
+#init
+md.initialization.sediment_head=-5.0*np.ones((md.mesh.numberofvertices))
+#BC
+md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices))
+md.hydrology.spcsediment_head[np.where(md.mesh.x==0)]=0.5
+
+md.timestepping.time_step=5/md.constants.yts #5s steppin
+md.settings.output_frequency=2
+md.timestepping.final_time=300/md.constants.yts #500s run
+
+md=solve(md,'Transient')
+
+field_names=['SedimentWaterHead1',
+						 'SedimentWaterHead2']
+field_tolerances=[1e-13, 
+									1e-13]
+field_values=[md.results.TransientSolution[10].SedimentHead,
+							md.results.TransientSolution[30].SedimentHead]
Index: /issm/trunk-jpl/test/NightlyRun/test330.py~
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test330.py~	(revision 21633)
+++ /issm/trunk-jpl/test/NightlyRun/test330.py~	(revision 21633)
@@ -0,0 +1,59 @@
+#Test Name:ConfinedUnconfinedHydroDC
+#setup for Wang 2009 Fig 6b to check confined unconfined treatment
+import numpy as np
+import inspect
+from model import *
+from triangle import triangle
+from setmask import setmask
+from transient import transient
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from socket import gethostname
+from generic import generic
+
+md=triangle(model(),'../Exp/Strip.exp',10000.)
+md=setmask(md,'','')
+#reduced slab (20m long)
+md.mesh.x=md.mesh.x/5.0e3
+md.mesh.y=md.mesh.y/5.0e3
+md=parameterize(md,'../Par/IceCube.py')
+md.transient=transient.setallnullparameters(md.transient)
+md.transient.ishydrology=True
+md=setflowequation(md,'SSA','all')
+md.cluster=generic('name',gethostname(),'np',1)
+md.hydrology=hydrologydc()
+md.hydrology=md.hydrology.initialize(md)
+
+#Hydro Model Parameters
+md.hydrology.isefficientlayer=0
+md.hydrology.sedimentlimit_flag=0
+md.hydrology.rel_tol=1.0e-6
+md.hydrology.penalty_lock=0
+md.hydrology.max_iter=200
+md.hydrology.transfer_flag=0
+md.hydrology.sediment_porosity=0.1
+#Sediment
+md.hydrology.sediment_thickness=10.0
+md.hydrology.sediment_transmitivity=(1.0e-3*md.hydrology.sediment_thickness)*np.ones((md.mesh.numberofvertices))
+#init
+md.initialization.sediment_head=-5.0*np.ones((md.mesh.numberofvertices))
+#BC
+md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices))
+md.hydrology.spcsediment_head[np.where(md.mesh.x==0)]=0.5
+
+if len(inspect.stack()) > 2:
+	md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0]
+
+md.timestepping.time_step=5/md.constants.yts #5s steppin
+md.settings.output_frequency=2
+md.timestepping.final_time=300/md.constants.yts #500s run
+
+md=solve(md,'Transient')
+
+field_names=['SedimentWaterHead1',
+						 'SedimentWaterHead2']
+field_tolerances=[1e-13, 
+									1e-13]
+field_values=[md.results.TransientSolution[10].SedimentHead,
+							md.results.TransientSolution[30].SedimentHead]