Index: /issm/trunk-jpl/test/NightlyRun/test125.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test125.m (revision 19338) +++ /issm/trunk-jpl/test/NightlyRun/test125.m (revision 19338) @@ -0,0 +1,48 @@ +%Test Name: SquareShelfConstrainedRestartTranSSA2d +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=setflowequation(md,'SSA','all'); +md.cluster=generic('name',oshostname(),'np',1); +md.transient.requested_outputs={'IceVolume','TotalSmb'}; + +md.verbose=verbose('solution',true); +md.settings.recording_frequency=5; + +% time steps and resolution +md.timestepping.final_time=8; + +md=solve(md,TransientSolutionEnum()); +md2=solve(md,TransientSolutionEnum(),'restart',1); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3'}; +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_values={... + (md.results.TransientSolution(6).Vx)-(md2.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(6).Vy)-(md2.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(6).Vel)-(md2.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(6).TotalSmb)-(md2.results.TransientSolution(1).TotalSmb),... + (md.results.TransientSolution(6).Base)-(md2.results.TransientSolution(1).Base),... + (md.results.TransientSolution(6).Surface)-(md2.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(6).Thickness)-(md2.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(6).IceVolume)-(md2.results.TransientSolution(1).IceVolume),... + (md.results.TransientSolution(7).Vx)-(md2.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(7).Vy)-(md2.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(7).Vel)-(md2.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(7).TotalSmb)-(md2.results.TransientSolution(2).TotalSmb),... + (md.results.TransientSolution(7).Base)-(md2.results.TransientSolution(2).Base),... + (md.results.TransientSolution(7).Surface)-(md2.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(7).Thickness)-(md2.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(7).IceVolume)-(md2.results.TransientSolution(2).IceVolume),... + (md.results.TransientSolution(8).Vx)-(md2.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(8).Vy)-(md2.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(8).Vel)-(md2.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(8).TotalSmb)-(md2.results.TransientSolution(3).TotalSmb),... + (md.results.TransientSolution(8).Base)-(md2.results.TransientSolution(3).Base),... + (md.results.TransientSolution(8).Surface)-(md2.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(8).Thickness)-(md2.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(8).IceVolume)-(md2.results.TransientSolution(3).IceVolume),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test125.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test125.py (revision 19338) +++ /issm/trunk-jpl/test/NightlyRun/test125.py (revision 19338) @@ -0,0 +1,63 @@ +#Test Name: SquareShelfConstrainedRestartTranSSA2d +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * +from massfluxatgate import massfluxatgate +from generic import generic +import copy + +md=triangle(model(),'../Exp/Square.exp',150000.) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md=setflowequation(md,'SSA','all') +md.cluster=generic('name',oshostname(),'np',1) +md.transient.requested_outputs=['IceVolume','TotalSmb'] + +md.verbose=verbose('solution',1); +md.settings.recording_frequency=5 + +# time steps and resolution +md.timestepping.final_time=8 + +md=solve(md,TransientSolutionEnum()) +md2=copy.deepcopy(md) +md=solve(md,TransientSolutionEnum(),'restart',1) + +#Fields and tolerances to track changes +field_names =['Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3']; +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_values=[\ + md2.results.TransientSolution[5].Vx-md.results.TransientSolution[0].Vx,\ + md2.results.TransientSolution[5].Vy-md.results.TransientSolution[0].Vy,\ + md2.results.TransientSolution[5].Vel-md.results.TransientSolution[0].Vel,\ + md2.results.TransientSolution[5].TotalSmb-md.results.TransientSolution[0].TotalSmb,\ + md2.results.TransientSolution[5].Base-md.results.TransientSolution[0].Base,\ + md2.results.TransientSolution[5].Surface-md.results.TransientSolution[0].Surface,\ + md2.results.TransientSolution[5].Thickness-md.results.TransientSolution[0].Thickness,\ + md2.results.TransientSolution[5].IceVolume-md.results.TransientSolution[0].IceVolume,\ + md2.results.TransientSolution[6].Vx-md.results.TransientSolution[1].Vx,\ + md2.results.TransientSolution[6].Vy-md.results.TransientSolution[1].Vy,\ + md2.results.TransientSolution[6].Vel-md.results.TransientSolution[1].Vel,\ + md2.results.TransientSolution[6].TotalSmb-md.results.TransientSolution[1].TotalSmb,\ + md2.results.TransientSolution[6].Base-md.results.TransientSolution[1].Base,\ + md2.results.TransientSolution[6].Surface-md.results.TransientSolution[1].Surface,\ + md2.results.TransientSolution[6].Thickness-md.results.TransientSolution[1].Thickness,\ + md2.results.TransientSolution[6].IceVolume-md.results.TransientSolution[1].IceVolume,\ + md2.results.TransientSolution[7].Vx-md.results.TransientSolution[2].Vx,\ + md2.results.TransientSolution[7].Vy-md.results.TransientSolution[2].Vy,\ + md2.results.TransientSolution[7].Vel-md.results.TransientSolution[2].Vel,\ + md2.results.TransientSolution[7].TotalSmb-md.results.TransientSolution[2].TotalSmb,\ + md2.results.TransientSolution[7].Base-md.results.TransientSolution[2].Base,\ + md2.results.TransientSolution[7].Surface-md.results.TransientSolution[2].Surface,\ + md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[2].Thickness,\ + md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[2].IceVolume\ + ] + Index: /issm/trunk-jpl/test/NightlyRun/test126.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test126.m (revision 19338) +++ /issm/trunk-jpl/test/NightlyRun/test126.m (revision 19338) @@ -0,0 +1,56 @@ +%Test Name: SquareShelfConstrainedRestartTranHO3d +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md.cluster=generic('name',oshostname(),'np',1); +md=extrude(md,3,1.); +md=setflowequation(md,'HO','all'); +md.transient.requested_outputs={'IceVolume','TotalSmb'}; + +md.verbose=verbose('solution',true); +md.settings.recording_frequency=5; + +% time steps and resolution +md.timestepping.final_time=8; + +md=solve(md,TransientSolutionEnum()); +md2=solve(md,TransientSolutionEnum(),'restart',1); + +%Fields and tolerances to track changes +field_names ={'Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Temperature1','Pressure1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Temperature2','Pressure2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3','Temperature3','Pressure3'}; +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,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_values={... + (md.results.TransientSolution(6).Vx)-(md2.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(6).Vy)-(md2.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(6).Vel)-(md2.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(6).TotalSmb)-(md2.results.TransientSolution(1).TotalSmb),... + (md.results.TransientSolution(6).Base)-(md2.results.TransientSolution(1).Base),... + (md.results.TransientSolution(6).Surface)-(md2.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(6).Thickness)-(md2.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(6).IceVolume)-(md2.results.TransientSolution(1).IceVolume),... + (md.results.TransientSolution(6).Temperature)-(md2.results.TransientSolution(1).Temperature),... + (md.results.TransientSolution(6).Pressure)-(md2.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(7).Vx)-(md2.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(7).Vy)-(md2.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(7).Vel)-(md2.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(7).TotalSmb)-(md2.results.TransientSolution(2).TotalSmb),... + (md.results.TransientSolution(7).Base)-(md2.results.TransientSolution(2).Base),... + (md.results.TransientSolution(7).Surface)-(md2.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(7).Thickness)-(md2.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(7).IceVolume)-(md2.results.TransientSolution(2).IceVolume),... + (md.results.TransientSolution(7).Temperature)-(md2.results.TransientSolution(2).Temperature),... + (md.results.TransientSolution(7).Pressure)-(md2.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(8).Vx)-(md2.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(8).Vy)-(md2.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(8).Vel)-(md2.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(8).TotalSmb)-(md2.results.TransientSolution(3).TotalSmb),... + (md.results.TransientSolution(8).Base)-(md2.results.TransientSolution(3).Base),... + (md.results.TransientSolution(8).Surface)-(md2.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(8).Thickness)-(md2.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(8).IceVolume)-(md2.results.TransientSolution(3).IceVolume),... + (md.results.TransientSolution(8).Temperature)-(md2.results.TransientSolution(3).Temperature),... + (md.results.TransientSolution(8).Pressure)-(md2.results.TransientSolution(3).Pressure),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test126.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test126.py (revision 19338) +++ /issm/trunk-jpl/test/NightlyRun/test126.py (revision 19338) @@ -0,0 +1,71 @@ +#Test Name: SquareShelfConstrainedRestartTranHO3d +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * +from massfluxatgate import massfluxatgate +from generic import generic +import copy + +md=triangle(model(),'../Exp/Square.exp',150000.) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelfConstrained.py') +md.cluster=generic('name',oshostname(),'np',1) +md.transient.requested_outputs=['IceVolume','TotalSmb'] +md.extrude(3,1.) +md=setflowequation(md,'HO','all') + +md.verbose=verbose('solution',1); +md.settings.recording_frequency=5 + +# time steps and resolution +md.timestepping.final_time=8 + +md=solve(md,TransientSolutionEnum()) +md2=copy.deepcopy(md) +md=solve(md,TransientSolutionEnum(),'restart',1) + +#Fields and tolerances to track changes +field_names =['Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Temperature1','Pressure1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Temperature2','Pressure2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3','Temperature3','Pressure3']; +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,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md2.results.TransientSolution[5].Vx-md.results.TransientSolution[0].Vx,\ + md2.results.TransientSolution[5].Vy-md.results.TransientSolution[0].Vy,\ + md2.results.TransientSolution[5].Vel-md.results.TransientSolution[0].Vel,\ + md2.results.TransientSolution[5].TotalSmb-md.results.TransientSolution[0].TotalSmb,\ + md2.results.TransientSolution[5].Base-md.results.TransientSolution[0].Base,\ + md2.results.TransientSolution[5].Surface-md.results.TransientSolution[0].Surface,\ + md2.results.TransientSolution[5].Thickness-md.results.TransientSolution[0].Thickness,\ + md2.results.TransientSolution[5].IceVolume-md.results.TransientSolution[0].IceVolume,\ + md2.results.TransientSolution[5].Temperature-md.results.TransientSolution[0].Temperature,\ + md2.results.TransientSolution[5].Pressure-md.results.TransientSolution[0].Pressure,\ + md2.results.TransientSolution[6].Vx-md.results.TransientSolution[1].Vx,\ + md2.results.TransientSolution[6].Vy-md.results.TransientSolution[1].Vy,\ + md2.results.TransientSolution[6].Vel-md.results.TransientSolution[1].Vel,\ + md2.results.TransientSolution[6].TotalSmb-md.results.TransientSolution[1].TotalSmb,\ + md2.results.TransientSolution[6].Base-md.results.TransientSolution[1].Base,\ + md2.results.TransientSolution[6].Surface-md.results.TransientSolution[1].Surface,\ + md2.results.TransientSolution[6].Thickness-md.results.TransientSolution[1].Thickness,\ + md2.results.TransientSolution[6].IceVolume-md.results.TransientSolution[1].IceVolume,\ + md2.results.TransientSolution[6].Temperature-md.results.TransientSolution[1].Temperature,\ + md2.results.TransientSolution[6].Pressure-md.results.TransientSolution[1].Pressure,\ + md2.results.TransientSolution[7].Vx-md.results.TransientSolution[2].Vx,\ + md2.results.TransientSolution[7].Vy-md.results.TransientSolution[2].Vy,\ + md2.results.TransientSolution[7].Vel-md.results.TransientSolution[2].Vel,\ + md2.results.TransientSolution[7].TotalSmb-md.results.TransientSolution[2].TotalSmb,\ + md2.results.TransientSolution[7].Base-md.results.TransientSolution[2].Base,\ + md2.results.TransientSolution[7].Surface-md.results.TransientSolution[2].Surface,\ + md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[2].Thickness,\ + md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[2].IceVolume,\ + md2.results.TransientSolution[7].Temperature-md.results.TransientSolution[2].Temperature,\ + md2.results.TransientSolution[7].Pressure-md.results.TransientSolution[2].Pressure\ + ] +