Index: ../trunk-jpl/test/NightlyRun/test125.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test125.py (revision 23761) +++ ../trunk-jpl/test/NightlyRun/test125.py (revision 23762) @@ -19,10 +19,11 @@ md.transient.requested_outputs=['IceVolume','TotalSmb'] md.verbose=verbose('solution',1) -md.settings.recording_frequency=5 +md.settings.recording_frequency=4 # time steps and resolution -md.timestepping.final_time=8 +md.timestepping.final_time=19 +md.settings.output_frequency=2 md=solve(md,'Transient') md2=copy.deepcopy(md) @@ -35,14 +36,6 @@ 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[5].Vx,\ - md2.results.TransientSolution[5].Vy-md.results.TransientSolution[5].Vy,\ - md2.results.TransientSolution[5].Vel-md.results.TransientSolution[5].Vel,\ - md2.results.TransientSolution[5].TotalSmb-md.results.TransientSolution[5].TotalSmb,\ - md2.results.TransientSolution[5].Base-md.results.TransientSolution[5].Base,\ - md2.results.TransientSolution[5].Surface-md.results.TransientSolution[5].Surface,\ - md2.results.TransientSolution[5].Thickness-md.results.TransientSolution[5].Thickness,\ - md2.results.TransientSolution[5].IceVolume-md.results.TransientSolution[5].IceVolume,\ md2.results.TransientSolution[6].Vx-md.results.TransientSolution[6].Vx,\ md2.results.TransientSolution[6].Vy-md.results.TransientSolution[6].Vy,\ md2.results.TransientSolution[6].Vel-md.results.TransientSolution[6].Vel,\ @@ -58,6 +51,14 @@ md2.results.TransientSolution[7].Base-md.results.TransientSolution[7].Base,\ md2.results.TransientSolution[7].Surface-md.results.TransientSolution[7].Surface,\ md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[7].Thickness,\ - md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[7].IceVolume\ + md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[7].IceVolume,\ + md2.results.TransientSolution[8].Vx-md.results.TransientSolution[8].Vx,\ + md2.results.TransientSolution[8].Vy-md.results.TransientSolution[8].Vy,\ + md2.results.TransientSolution[8].Vel-md.results.TransientSolution[8].Vel,\ + md2.results.TransientSolution[8].TotalSmb-md.results.TransientSolution[8].TotalSmb,\ + md2.results.TransientSolution[8].Base-md.results.TransientSolution[8].Base,\ + md2.results.TransientSolution[8].Surface-md.results.TransientSolution[8].Surface,\ + md2.results.TransientSolution[8].Thickness-md.results.TransientSolution[8].Thickness,\ + md2.results.TransientSolution[8].IceVolume-md.results.TransientSolution[8].IceVolume\ ] Index: ../trunk-jpl/test/NightlyRun/test125.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test125.m (revision 23761) +++ ../trunk-jpl/test/NightlyRun/test125.m (revision 23762) @@ -7,10 +7,11 @@ md.transient.requested_outputs={'IceVolume','TotalSmb'}; md.verbose=verbose('solution',true); -md.settings.recording_frequency=5; +md.settings.recording_frequency=4; % time steps and resolution -md.timestepping.final_time=8; +md.timestepping.final_time=19; +md.settings.output_frequency=2; md=solve(md,'Transient'); md2=solve(md,'Transient','restart',1); @@ -21,14 +22,6 @@ 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(6).Vx),... - (md.results.TransientSolution(6).Vy)-(md2.results.TransientSolution(6).Vy),... - (md.results.TransientSolution(6).Vel)-(md2.results.TransientSolution(6).Vel),... - (md.results.TransientSolution(6).TotalSmb)-(md2.results.TransientSolution(6).TotalSmb),... - (md.results.TransientSolution(6).Base)-(md2.results.TransientSolution(6).Base),... - (md.results.TransientSolution(6).Surface)-(md2.results.TransientSolution(6).Surface),... - (md.results.TransientSolution(6).Thickness)-(md2.results.TransientSolution(6).Thickness),... - (md.results.TransientSolution(6).IceVolume)-(md2.results.TransientSolution(6).IceVolume),... (md.results.TransientSolution(7).Vx)-(md2.results.TransientSolution(7).Vx),... (md.results.TransientSolution(7).Vy)-(md2.results.TransientSolution(7).Vy),... (md.results.TransientSolution(7).Vel)-(md2.results.TransientSolution(7).Vel),... @@ -45,4 +38,12 @@ (md.results.TransientSolution(8).Surface)-(md2.results.TransientSolution(8).Surface),... (md.results.TransientSolution(8).Thickness)-(md2.results.TransientSolution(8).Thickness),... (md.results.TransientSolution(8).IceVolume)-(md2.results.TransientSolution(8).IceVolume),... + (md.results.TransientSolution(9).Vx)-(md2.results.TransientSolution(9).Vx),... + (md.results.TransientSolution(9).Vy)-(md2.results.TransientSolution(9).Vy),... + (md.results.TransientSolution(9).Vel)-(md2.results.TransientSolution(9).Vel),... + (md.results.TransientSolution(9).TotalSmb)-(md2.results.TransientSolution(9).TotalSmb),... + (md.results.TransientSolution(9).Base)-(md2.results.TransientSolution(9).Base),... + (md.results.TransientSolution(9).Surface)-(md2.results.TransientSolution(9).Surface),... + (md.results.TransientSolution(9).Thickness)-(md2.results.TransientSolution(9).Thickness),... + (md.results.TransientSolution(9).IceVolume)-(md2.results.TransientSolution(9).IceVolume),... };