[24307] | 1 | Index: ../trunk-jpl/test/NightlyRun/test125.py
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/test/NightlyRun/test125.py (revision 23761)
|
---|
| 4 | +++ ../trunk-jpl/test/NightlyRun/test125.py (revision 23762)
|
---|
| 5 | @@ -19,10 +19,11 @@
|
---|
| 6 | md.transient.requested_outputs=['IceVolume','TotalSmb']
|
---|
| 7 |
|
---|
| 8 | md.verbose=verbose('solution',1)
|
---|
| 9 | -md.settings.recording_frequency=5
|
---|
| 10 | +md.settings.recording_frequency=4
|
---|
| 11 |
|
---|
| 12 | # time steps and resolution
|
---|
| 13 | -md.timestepping.final_time=8
|
---|
| 14 | +md.timestepping.final_time=19
|
---|
| 15 | +md.settings.output_frequency=2
|
---|
| 16 |
|
---|
| 17 | md=solve(md,'Transient')
|
---|
| 18 | md2=copy.deepcopy(md)
|
---|
| 19 | @@ -35,14 +36,6 @@
|
---|
| 20 | 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
|
---|
| 21 | 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
|
---|
| 22 | field_values=[\
|
---|
| 23 | - md2.results.TransientSolution[5].Vx-md.results.TransientSolution[5].Vx,\
|
---|
| 24 | - md2.results.TransientSolution[5].Vy-md.results.TransientSolution[5].Vy,\
|
---|
| 25 | - md2.results.TransientSolution[5].Vel-md.results.TransientSolution[5].Vel,\
|
---|
| 26 | - md2.results.TransientSolution[5].TotalSmb-md.results.TransientSolution[5].TotalSmb,\
|
---|
| 27 | - md2.results.TransientSolution[5].Base-md.results.TransientSolution[5].Base,\
|
---|
| 28 | - md2.results.TransientSolution[5].Surface-md.results.TransientSolution[5].Surface,\
|
---|
| 29 | - md2.results.TransientSolution[5].Thickness-md.results.TransientSolution[5].Thickness,\
|
---|
| 30 | - md2.results.TransientSolution[5].IceVolume-md.results.TransientSolution[5].IceVolume,\
|
---|
| 31 | md2.results.TransientSolution[6].Vx-md.results.TransientSolution[6].Vx,\
|
---|
| 32 | md2.results.TransientSolution[6].Vy-md.results.TransientSolution[6].Vy,\
|
---|
| 33 | md2.results.TransientSolution[6].Vel-md.results.TransientSolution[6].Vel,\
|
---|
| 34 | @@ -58,6 +51,14 @@
|
---|
| 35 | md2.results.TransientSolution[7].Base-md.results.TransientSolution[7].Base,\
|
---|
| 36 | md2.results.TransientSolution[7].Surface-md.results.TransientSolution[7].Surface,\
|
---|
| 37 | md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[7].Thickness,\
|
---|
| 38 | - md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[7].IceVolume\
|
---|
| 39 | + md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[7].IceVolume,\
|
---|
| 40 | + md2.results.TransientSolution[8].Vx-md.results.TransientSolution[8].Vx,\
|
---|
| 41 | + md2.results.TransientSolution[8].Vy-md.results.TransientSolution[8].Vy,\
|
---|
| 42 | + md2.results.TransientSolution[8].Vel-md.results.TransientSolution[8].Vel,\
|
---|
| 43 | + md2.results.TransientSolution[8].TotalSmb-md.results.TransientSolution[8].TotalSmb,\
|
---|
| 44 | + md2.results.TransientSolution[8].Base-md.results.TransientSolution[8].Base,\
|
---|
| 45 | + md2.results.TransientSolution[8].Surface-md.results.TransientSolution[8].Surface,\
|
---|
| 46 | + md2.results.TransientSolution[8].Thickness-md.results.TransientSolution[8].Thickness,\
|
---|
| 47 | + md2.results.TransientSolution[8].IceVolume-md.results.TransientSolution[8].IceVolume\
|
---|
| 48 | ]
|
---|
| 49 |
|
---|
| 50 | Index: ../trunk-jpl/test/NightlyRun/test125.m
|
---|
| 51 | ===================================================================
|
---|
| 52 | --- ../trunk-jpl/test/NightlyRun/test125.m (revision 23761)
|
---|
| 53 | +++ ../trunk-jpl/test/NightlyRun/test125.m (revision 23762)
|
---|
| 54 | @@ -7,10 +7,11 @@
|
---|
| 55 | md.transient.requested_outputs={'IceVolume','TotalSmb'};
|
---|
| 56 |
|
---|
| 57 | md.verbose=verbose('solution',true);
|
---|
| 58 | -md.settings.recording_frequency=5;
|
---|
| 59 | +md.settings.recording_frequency=4;
|
---|
| 60 |
|
---|
| 61 | % time steps and resolution
|
---|
| 62 | -md.timestepping.final_time=8;
|
---|
| 63 | +md.timestepping.final_time=19;
|
---|
| 64 | +md.settings.output_frequency=2;
|
---|
| 65 |
|
---|
| 66 | md=solve(md,'Transient');
|
---|
| 67 | md2=solve(md,'Transient','restart',1);
|
---|
| 68 | @@ -21,14 +22,6 @@
|
---|
| 69 | 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
|
---|
| 70 | 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
|
---|
| 71 | field_values={...
|
---|
| 72 | - (md.results.TransientSolution(6).Vx)-(md2.results.TransientSolution(6).Vx),...
|
---|
| 73 | - (md.results.TransientSolution(6).Vy)-(md2.results.TransientSolution(6).Vy),...
|
---|
| 74 | - (md.results.TransientSolution(6).Vel)-(md2.results.TransientSolution(6).Vel),...
|
---|
| 75 | - (md.results.TransientSolution(6).TotalSmb)-(md2.results.TransientSolution(6).TotalSmb),...
|
---|
| 76 | - (md.results.TransientSolution(6).Base)-(md2.results.TransientSolution(6).Base),...
|
---|
| 77 | - (md.results.TransientSolution(6).Surface)-(md2.results.TransientSolution(6).Surface),...
|
---|
| 78 | - (md.results.TransientSolution(6).Thickness)-(md2.results.TransientSolution(6).Thickness),...
|
---|
| 79 | - (md.results.TransientSolution(6).IceVolume)-(md2.results.TransientSolution(6).IceVolume),...
|
---|
| 80 | (md.results.TransientSolution(7).Vx)-(md2.results.TransientSolution(7).Vx),...
|
---|
| 81 | (md.results.TransientSolution(7).Vy)-(md2.results.TransientSolution(7).Vy),...
|
---|
| 82 | (md.results.TransientSolution(7).Vel)-(md2.results.TransientSolution(7).Vel),...
|
---|
| 83 | @@ -45,4 +38,12 @@
|
---|
| 84 | (md.results.TransientSolution(8).Surface)-(md2.results.TransientSolution(8).Surface),...
|
---|
| 85 | (md.results.TransientSolution(8).Thickness)-(md2.results.TransientSolution(8).Thickness),...
|
---|
| 86 | (md.results.TransientSolution(8).IceVolume)-(md2.results.TransientSolution(8).IceVolume),...
|
---|
| 87 | + (md.results.TransientSolution(9).Vx)-(md2.results.TransientSolution(9).Vx),...
|
---|
| 88 | + (md.results.TransientSolution(9).Vy)-(md2.results.TransientSolution(9).Vy),...
|
---|
| 89 | + (md.results.TransientSolution(9).Vel)-(md2.results.TransientSolution(9).Vel),...
|
---|
| 90 | + (md.results.TransientSolution(9).TotalSmb)-(md2.results.TransientSolution(9).TotalSmb),...
|
---|
| 91 | + (md.results.TransientSolution(9).Base)-(md2.results.TransientSolution(9).Base),...
|
---|
| 92 | + (md.results.TransientSolution(9).Surface)-(md2.results.TransientSolution(9).Surface),...
|
---|
| 93 | + (md.results.TransientSolution(9).Thickness)-(md2.results.TransientSolution(9).Thickness),...
|
---|
| 94 | + (md.results.TransientSolution(9).IceVolume)-(md2.results.TransientSolution(9).IceVolume),...
|
---|
| 95 | };
|
---|