Index: sm/trunk-jpl/test/NightlyRun/test330.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.m (revision 24586) +++ (revision ) @@ -1,48 +1,0 @@ -%Test Name:UnConfinedHydroDC -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.par'); -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.mask_thawed_node=ones(md.mesh.numberofvertices,1); -md.hydrology.rel_tol=1.0e-6; -md.hydrology.penalty_lock=0; -md.hydrology.max_iter=200; -md.hydrology.transfer_flag=0; -md.hydrology.unconfined_flag=1; -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,1); -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'); - -%fields to track, results can also be found in -%Wang 2009 Fig 6b (jouranl of Hydrology) -field_names={'SedimentWaterHead1',... - 'SedimentWaterHead2'}; -field_tolerances={1e-13,... - 1e-13}; -field_values={md.results.TransientSolution(11).SedimentHead,... - md.results.TransientSolution(31).SedimentHead}; Index: sm/trunk-jpl/test/NightlyRun/test330.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.py (revision 24586) +++ (revision ) @@ -1,55 +1,0 @@ -#Test Name:UnConfinedHydroDC -import numpy as np -from model import * -from setmask import * -from triangle import triangle -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.mask_thawed_node = np.ones((md.mesh.numberofvertices)) -md.hydrology.rel_tol = 1.0e-6 -md.hydrology.penalty_lock = 0 -md.hydrology.max_iter = 200 -md.hydrology.transfer_flag = 0 -md.hydrology.unconfined_flag = 1 -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') - -#fields to track, results can also be found in -#Wang 2009 Fig 6b (jouranl of Hydrology) -field_names = ['SedimentWaterHead1', 'SedimentWaterHead2'] -field_tolerances = [1e-13, 1e-13] -field_values = [md.results.TransientSolution[10].SedimentHead, md.results.TransientSolution[30].SedimentHead] Index: sm/trunk-jpl/test/NightlyRun/test332.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.m (revision 24586) +++ (revision ) @@ -1,32 +1,0 @@ -%Test Name: SquareSheetConstrainedHydrologyDC -md=triangle(model(),'../Exp/Square.exp',100000.); -md=setmask(md,'',''); -md=parameterize(md,'../Par/IceCube.par'); -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); -md.hydrology.isefficientlayer=0; -md.hydrology.sedimentlimit_flag=1; -md.hydrology.sedimentlimit=8000.0; -md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1); -md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1); -md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1); -pos=find(md.mesh.y==0); -md.hydrology.spcsediment_head(pos)=0.0; -md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1); -md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1); -md.hydrology.sediment_transmitivity=3*ones(md.mesh.numberofvertices,1); -md.timestepping.time_step=0; -md.timestepping.final_time=1.0; -md=solve(md,'Hydrology'); - -%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: sm/trunk-jpl/test/NightlyRun/test332.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.py (revision 24586) +++ (revision ) @@ -1,48 +1,0 @@ -#Test Name: SquareSheetConstrainedHydrologyDC -import numpy as np -from model import * -from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from transient import * -from setflowequation import * -from solve import * - - -from generic import generic - -md = triangle(model(), '../Exp/Square.exp', 100000.) -md = setmask(md, '', '') -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) - -md.hydrology.isefficientlayer = 0 -md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) -md.hydrology.sedimentlimit_flag = 1 -md.hydrology.sedimentlimit = 8000.0 -md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) -pos = np.nonzero(md.mesh.y == 0.)[0] -md.hydrology.spcsediment_head[pos] = 0.0 -md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate = 0.0 * np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity = 3.0 * np.ones((md.mesh.numberofvertices)) -md.timestepping.time_step = 0 -md.timestepping.final_time = 1.0 -md = solve(md, 'Hydrology') - -#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: sm/trunk-jpl/test/NightlyRun/test333.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.m (revision 24586) +++ (revision ) @@ -1,82 +1,0 @@ -%Test Name: SquareSheetHydrologyDCTwoLayers -md=triangle(model(),'../Exp/Square.exp',100000.); -md=setmask(md,'',''); -md=parameterize(md,'../Par/IceCube.par'); -md.transient=deactivateall(md.transient); -md.transient.ishydrology=1; -md.transient.issmb=1; -md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',1); -md.hydrology=(hydrologydc); -md.hydrology=initialize(md.hydrology,md); -md.hydrology.isefficientlayer=1; -md.hydrology.sedimentlimit_flag=1; -md.hydrology.sedimentlimit=800.0; -md.hydrology.transfer_flag = 0; -md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1); -md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1); -md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1); -md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1); -md.hydrology.sediment_transmitivity=3*ones(md.mesh.numberofvertices,1); -md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1); - -md.initialization.epl_head=0.0*ones(md.mesh.numberofvertices,1); -md.initialization.epl_thickness=1.0*ones(md.mesh.numberofvertices,1); -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=30; -md.hydrology.epl_initial_thickness=1; -md.hydrology.epl_thick_comp=1; -md.hydrology.epl_colapse_thickness=1.0e-3; -md.hydrology.epl_max_thickness=1; -md.hydrology.steps_per_step=10; -md.timestepping.time_step=2.0; -md.timestepping.final_time=2.0; - -%md.verbose.solution=1; - -md=solve(md,'Transient'); -%re-run with no substeps -mdfine=md; -mdfine.results=struct(); -mdfine.hydrology.steps_per_step=1; -mdfine.timestepping.time_step=0.2; -mdfine=solve(mdfine,'Transient'); - -%store=md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility); -%sedstore=20.0*store; -%for i=1:10 -%diff=(mean(md.results.HydrologySolution(i).EplHead)*store+ ... -% mean(md.results.HydrologySolution(i).SedimentHead)*sedstore-0.4*i) -%end -%Fields and tolerances to track changes -field_names ={'SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1',... - 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',... - 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',... - 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9',... - 'EplWaterHead10', 'EplWaterHeadSubstep10', 'SedimentWaterHead10',... - 'SedimentWaterHeadSubstep10'}; -field_tolerances={... - 1e-13, 1e-13, 1e-13,... - 1e-13, 1e-13, 1e-13,... - 1e-13, 5e-12, 1e-11,... - 1e-13, 5e-12, 1e-11,... - 1e-13, 1e-13, 1e-13,... - 1e-13}; -field_values={mdfine.results.TransientSolution(1).SedimentHead, ... - mdfine.results.TransientSolution(1).EplHead,... - mdfine.results.TransientSolution(1).SedimentHeadResidual,... - mdfine.results.TransientSolution(4).SedimentHead,... - mdfine.results.TransientSolution(4).EplHead,... - mdfine.results.TransientSolution(4).SedimentHeadResidual, ... - mdfine.results.TransientSolution(5).SedimentHead,... - mdfine.results.TransientSolution(5).EplHead,... - mdfine.results.TransientSolution(5).SedimentHeadResidual, ... - mdfine.results.TransientSolution(9).SedimentHead,... - mdfine.results.TransientSolution(9).EplHead,... - mdfine.results.TransientSolution(9).SedimentHeadResidual,... - md.results.TransientSolution(1).EplHead,... - md.results.TransientSolution(1).EplHeadSubstep,... - md.results.TransientSolution(1).SedimentHead,... - md.results.TransientSolution(1).SedimentHeadSubstep - }; Index: sm/trunk-jpl/test/NightlyRun/test333.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.py (revision 24586) +++ (revision ) @@ -1,87 +1,0 @@ -#Test Name: SquareSheetHydrologyDCTwoLayers -import numpy as np -from model import * -from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from transient import * -from setflowequation import * -from solve import * -from generic import generic - - -md = triangle(model(), '../Exp/Square.exp', 100000.) -md = setmask(md, '', '') -md = parameterize(md, '../Par/IceCube.py') - -md.transient = transient.setallnullparameters(md.transient) -md.transient.ishydrology = True -#md.transient.issmb = True -md = setflowequation(md, 'SSA', 'all') -md.cluster = generic('name', gethostname(), '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.hydrology.transfer_flag = 0 -md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) -md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) - -md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate = 0.0 * np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity = 3.0 * np.ones((md.mesh.numberofvertices)) - -md.initialization.epl_head = np.zeros((md.mesh.numberofvertices)) -md.initialization.epl_thickness = np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head = np.nan * np.ones((md.mesh.numberofvertices)) -md.hydrology.mask_eplactive_node = np.zeros((md.mesh.numberofvertices)) -md.hydrology.epl_conductivity = 30 -md.hydrology.epl_initial_thickness = 1 -md.hydrology.epl_colapse_thickness = 1.0e-3 -md.hydrology.epl_thick_comp = 1 -md.hydrology.epl_max_thickness = 1 -md.hydrology.steps_per_step = 10 -md.timestepping.time_step = 2.0 -md.timestepping.final_time = 2.0 - -md = solve(md, 'Transient') - -#re-run with no substeps -mdfine = copy.deepcopy(md) -mdfine.results = [] -mdfine.hydrology.steps_per_step = 1 -mdfine.timestepping.time_step = 0.2 -mdfine = solve(mdfine, 'Transient') - -field_names = ['SedimentWaterHead1', 'EplWaterHead1', 'SedimentHeadResidual1', - 'SedimentWaterHead4', 'EplWaterHead4', 'SedimentHeadResidual4', - 'SedimentWaterHead5', 'EplWaterHead5', 'SedimentHeadResidual5', - 'SedimentWaterHead9', 'EplWaterHead9', 'SedimentHeadResidual9', - 'EplWaterHead10', 'EplWaterHeadSubstep10', 'SedimentWaterHead10', - 'SedimentWaterHeadSubstep10'] -field_tolerances = [1e-13, 1e-13, 1e-13, - 1e-13, 1e-13, 1e-13, - 1e-13, 5e-12, 1e-11, - 1e-13, 5e-12, 1e-11, - 1e-13, 1e-13, 1e-13, - 1e-13] -field_values = [mdfine.results.TransientSolution[0].SedimentHead, - mdfine.results.TransientSolution[0].EplHead, - mdfine.results.TransientSolution[0].SedimentHeadResidual, - mdfine.results.TransientSolution[3].SedimentHead, - mdfine.results.TransientSolution[3].EplHead, - mdfine.results.TransientSolution[3].SedimentHeadResidual, - mdfine.results.TransientSolution[4].SedimentHead, - mdfine.results.TransientSolution[4].EplHead, - mdfine.results.TransientSolution[4].SedimentHeadResidual, - mdfine.results.TransientSolution[8].SedimentHead, - mdfine.results.TransientSolution[8].EplHead, - mdfine.results.TransientSolution[8].SedimentHeadResidual, - md.results.TransientSolution[-1].EplHead, - md.results.TransientSolution[-1].EplHeadSubstep, - md.results.TransientSolution[-1].SedimentHead, - md.results.TransientSolution[-1].SedimentHeadSubstep] Index: sm/trunk-jpl/test/NightlyRun/test334.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.m (revision 24586) +++ (revision ) @@ -1,34 +1,0 @@ -%Test Name: SquareSheetConstrainedExtrudedHydrologyDC -md=triangle(model(),'../Exp/Square.exp',100000.); -md=setmask(md,'',''); -md.transient=deactivateall(md.transient); -md.transient.ishydrology=1; -md=parameterize(md,'../Par/IceCube.par'); -md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',1); -md.hydrology=(hydrologydc); -md.hydrology=initialize(md.hydrology,md); -md.hydrology.isefficientlayer=0; -md.hydrology.sedimentlimit_flag=1; -md.hydrology.sedimentlimit=8000.0; -md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices, ... - 1); -md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1); -md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1); -pos=find(md.mesh.y==0); -md.hydrology.spcsediment_head(pos)=0.0; -md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1); -md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1); -md.hydrology.sediment_transmitivity= 3.0*ones(md.mesh.numberofvertices,1); -md.timestepping.time_step=0; -md.timestepping.final_time=1.0; -md=extrude(md,3,1.1); -md=solve(md,'Hydrology'); - -%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: sm/trunk-jpl/test/NightlyRun/test334.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.py (revision 24586) +++ (revision ) @@ -1,48 +1,0 @@ -#Test Name: SquareSheetConstrainedExtrudedHydrologyDC -import numpy as np -from model import * -from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from transient import * -from setflowequation import * -from solve import * - - -from generic import generic - -md = triangle(model(), '../Exp/Square.exp', 100000.) -md = setmask(md, '', '') -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) - -md.hydrology.isefficientlayer = 0 -md.hydrology.sedimentlimit_flag = 1 -md.hydrology.sedimentlimit = 8000.0 -md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) -md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head[np.where(md.mesh.y == 0)] = 0.0 - -md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate = 0.0 * np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity = 3.0 * np.ones((md.mesh.numberofvertices)) - -md.timestepping.time_step = 0 -md.timestepping.final_time = 1.0 -md.extrude(3, 1.) -md = solve(md, 'Hydrology') - -#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: sm/trunk-jpl/test/NightlyRun/test335.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.m (revision 24586) +++ (revision ) @@ -1,73 +1,0 @@ -%Test Name: SquareSheetExtrudedHydrologyDCTwoLayers -md=triangle(model(),'../Exp/Square.exp',100000.); -md=setmask(md,'',''); -md.transient=deactivateall(md.transient); -md.transient.ishydrology=1; -md.transient.issmb=1; -md=parameterize(md,'../Par/IceCube.par'); -md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',1); -md.hydrology=(hydrologydc); -md.hydrology=initialize(md.hydrology,md); -md.hydrology.isefficientlayer=1; -md.hydrology.sedimentlimit_flag=1; -md.hydrology.transfer_flag = 0; -md.hydrology.sedimentlimit=800.0; -md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1); -md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1); -md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1); -md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1); -md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1); -md.hydrology.sediment_transmitivity=3*ones(md.mesh.numberofvertices,1); - -md.initialization.epl_head=0.0*ones(md.mesh.numberofvertices,1); -md.initialization.epl_thickness=1.0*ones(md.mesh.numberofvertices,1); -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=30; -md.hydrology.epl_initial_thickness=1; -md.hydrology.epl_colapse_thickness=1.0e-3; -md.hydrology.epl_thick_comp=1; -md.hydrology.epl_max_thickness=1; -md.timestepping.time_step=0.2; -md.timestepping.final_time=2.0; - -%md.verbose.solution=1; -md=extrude(md,3,1.1); -md=solve(md,'Transient'); - -%store=md.constants.g*md.hydrology.sediment_porosity* ... -% md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility) - -%sed=ones(1,size(md.results.HydrologySolution,2)); -%epl=ones(1,size(md.results.HydrologySolution,2)); -%res=ones(1,size(md.results.HydrologySolution,2)); -%input=ones(1,size(md.results.HydrologySolution,2)); -%for i= 1:size(md.results.HydrologySolution,2) -% sed(i)=mean(md.results.HydrologySolution(i).SedimentHead); -% res(i)=mean(md.results.HydrologySolution(i).SedimentHeadResidual); -% epl(i)=mean(md.results.HydrologySolution(i).EplHead); -% input(i)=2.0*(i*0.2); -%end - -%Fields and tolerances to track changes -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, 2e-11,... - 1e-13, 5e-12, 2e-11}; -field_values={md.results.TransientSolution(1).SedimentHead, ... - md.results.TransientSolution(1).EplHead,... - md.results.TransientSolution(1).SedimentHeadResidual,... - md.results.TransientSolution(4).SedimentHead,... - md.results.TransientSolution(4).EplHead,... - md.results.TransientSolution(4).SedimentHeadResidual, ... - md.results.TransientSolution(5).SedimentHead,... - md.results.TransientSolution(5).EplHead,... - md.results.TransientSolution(5).SedimentHeadResidual, ... - md.results.TransientSolution(9).SedimentHead,... - md.results.TransientSolution(9).EplHead,... - md.results.TransientSolution(9).SedimentHeadResidual}; Index: sm/trunk-jpl/test/NightlyRun/test335.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.py (revision 24586) +++ (revision ) @@ -1,72 +1,0 @@ -#Test Name: SquareSheetExtrudedHydrologyDCTwoLayers -import numpy as np -from model import * -from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from transient import * -from setflowequation import * -from solve import * - - -from generic import generic - -md = triangle(model(), '../Exp/Square.exp', 100000.) -md = setmask(md, '', '') -md = parameterize(md, '../Par/IceCube.py') -md.transient = transient.setallnullparameters(md.transient) -md.transient.ishydrology = True -md.transient.issmb = True -md = setflowequation(md, 'SSA', 'all') -md.cluster = generic('name', gethostname(), 'np', 1) -md.hydrology = hydrologydc() -md.hydrology = md.hydrology.initialize(md) - -md.hydrology.isefficientlayer = 1 -md.hydrology.sedimentlimit_flag = 1 -md.hydrology.transfer_flag = 0 -md.hydrology.sedimentlimit = 800.0 -md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) -md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity = 3 * np.ones((md.mesh.numberofvertices)) - -md.initialization.epl_head = np.zeros((md.mesh.numberofvertices)) -md.initialization.epl_thickness = np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head = np.nan * np.ones((md.mesh.numberofvertices)) -md.hydrology.mask_eplactive_node = np.zeros((md.mesh.numberofvertices)) -md.hydrology.epl_conductivity = 30 -md.hydrology.epl_initial_thickness = 1 -md.hydrology.epl_colapse_thickness = 1.0e-3 -md.hydrology.epl_thick_comp = 1 -md.hydrology.epl_max_thickness = 1 -md.timestepping.time_step = 0.2 -md.timestepping.final_time = 2.0 - -md.extrude(3, 1.) -md = solve(md, 'Transient') - -#Fields and tolerances to track changes -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, 2e-11, - 1e-13, 5e-12, 2e-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]