source: issm/oecreview/Archive/19101-20495/ISSM-19337-19338.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 15.8 KB
RevLine 
[20498]1Index: ../trunk-jpl/test/NightlyRun/test125.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test125.m (revision 0)
4+++ ../trunk-jpl/test/NightlyRun/test125.m (revision 19338)
5@@ -0,0 +1,48 @@
6+%Test Name: SquareShelfConstrainedRestartTranSSA2d
7+md=triangle(model(),'../Exp/Square.exp',150000.);
8+md=setmask(md,'all','');
9+md=parameterize(md,'../Par/SquareShelfConstrained.par');
10+md=setflowequation(md,'SSA','all');
11+md.cluster=generic('name',oshostname(),'np',1);
12+md.transient.requested_outputs={'IceVolume','TotalSmb'};
13+
14+md.verbose=verbose('solution',true);
15+md.settings.recording_frequency=5;
16+
17+% time steps and resolution
18+md.timestepping.final_time=8;
19+
20+md=solve(md,TransientSolutionEnum());
21+md2=solve(md,TransientSolutionEnum(),'restart',1);
22+
23+%Fields and tolerances to track changes
24+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'};
25+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
26+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
27+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
28+field_values={...
29+ (md.results.TransientSolution(6).Vx)-(md2.results.TransientSolution(1).Vx),...
30+ (md.results.TransientSolution(6).Vy)-(md2.results.TransientSolution(1).Vy),...
31+ (md.results.TransientSolution(6).Vel)-(md2.results.TransientSolution(1).Vel),...
32+ (md.results.TransientSolution(6).TotalSmb)-(md2.results.TransientSolution(1).TotalSmb),...
33+ (md.results.TransientSolution(6).Base)-(md2.results.TransientSolution(1).Base),...
34+ (md.results.TransientSolution(6).Surface)-(md2.results.TransientSolution(1).Surface),...
35+ (md.results.TransientSolution(6).Thickness)-(md2.results.TransientSolution(1).Thickness),...
36+ (md.results.TransientSolution(6).IceVolume)-(md2.results.TransientSolution(1).IceVolume),...
37+ (md.results.TransientSolution(7).Vx)-(md2.results.TransientSolution(2).Vx),...
38+ (md.results.TransientSolution(7).Vy)-(md2.results.TransientSolution(2).Vy),...
39+ (md.results.TransientSolution(7).Vel)-(md2.results.TransientSolution(2).Vel),...
40+ (md.results.TransientSolution(7).TotalSmb)-(md2.results.TransientSolution(2).TotalSmb),...
41+ (md.results.TransientSolution(7).Base)-(md2.results.TransientSolution(2).Base),...
42+ (md.results.TransientSolution(7).Surface)-(md2.results.TransientSolution(2).Surface),...
43+ (md.results.TransientSolution(7).Thickness)-(md2.results.TransientSolution(2).Thickness),...
44+ (md.results.TransientSolution(7).IceVolume)-(md2.results.TransientSolution(2).IceVolume),...
45+ (md.results.TransientSolution(8).Vx)-(md2.results.TransientSolution(3).Vx),...
46+ (md.results.TransientSolution(8).Vy)-(md2.results.TransientSolution(3).Vy),...
47+ (md.results.TransientSolution(8).Vel)-(md2.results.TransientSolution(3).Vel),...
48+ (md.results.TransientSolution(8).TotalSmb)-(md2.results.TransientSolution(3).TotalSmb),...
49+ (md.results.TransientSolution(8).Base)-(md2.results.TransientSolution(3).Base),...
50+ (md.results.TransientSolution(8).Surface)-(md2.results.TransientSolution(3).Surface),...
51+ (md.results.TransientSolution(8).Thickness)-(md2.results.TransientSolution(3).Thickness),...
52+ (md.results.TransientSolution(8).IceVolume)-(md2.results.TransientSolution(3).IceVolume),...
53+ };
54Index: ../trunk-jpl/test/NightlyRun/test126.m
55===================================================================
56--- ../trunk-jpl/test/NightlyRun/test126.m (revision 0)
57+++ ../trunk-jpl/test/NightlyRun/test126.m (revision 19338)
58@@ -0,0 +1,56 @@
59+%Test Name: SquareShelfConstrainedRestartTranHO3d
60+md=triangle(model(),'../Exp/Square.exp',150000.);
61+md=setmask(md,'all','');
62+md=parameterize(md,'../Par/SquareShelfConstrained.par');
63+md.cluster=generic('name',oshostname(),'np',1);
64+md=extrude(md,3,1.);
65+md=setflowequation(md,'HO','all');
66+md.transient.requested_outputs={'IceVolume','TotalSmb'};
67+
68+md.verbose=verbose('solution',true);
69+md.settings.recording_frequency=5;
70+
71+% time steps and resolution
72+md.timestepping.final_time=8;
73+
74+md=solve(md,TransientSolutionEnum());
75+md2=solve(md,TransientSolutionEnum(),'restart',1);
76+
77+%Fields and tolerances to track changes
78+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'};
79+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
80+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
81+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
82+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
83+field_values={...
84+ (md.results.TransientSolution(6).Vx)-(md2.results.TransientSolution(1).Vx),...
85+ (md.results.TransientSolution(6).Vy)-(md2.results.TransientSolution(1).Vy),...
86+ (md.results.TransientSolution(6).Vel)-(md2.results.TransientSolution(1).Vel),...
87+ (md.results.TransientSolution(6).TotalSmb)-(md2.results.TransientSolution(1).TotalSmb),...
88+ (md.results.TransientSolution(6).Base)-(md2.results.TransientSolution(1).Base),...
89+ (md.results.TransientSolution(6).Surface)-(md2.results.TransientSolution(1).Surface),...
90+ (md.results.TransientSolution(6).Thickness)-(md2.results.TransientSolution(1).Thickness),...
91+ (md.results.TransientSolution(6).IceVolume)-(md2.results.TransientSolution(1).IceVolume),...
92+ (md.results.TransientSolution(6).Temperature)-(md2.results.TransientSolution(1).Temperature),...
93+ (md.results.TransientSolution(6).Pressure)-(md2.results.TransientSolution(1).Pressure),...
94+ (md.results.TransientSolution(7).Vx)-(md2.results.TransientSolution(2).Vx),...
95+ (md.results.TransientSolution(7).Vy)-(md2.results.TransientSolution(2).Vy),...
96+ (md.results.TransientSolution(7).Vel)-(md2.results.TransientSolution(2).Vel),...
97+ (md.results.TransientSolution(7).TotalSmb)-(md2.results.TransientSolution(2).TotalSmb),...
98+ (md.results.TransientSolution(7).Base)-(md2.results.TransientSolution(2).Base),...
99+ (md.results.TransientSolution(7).Surface)-(md2.results.TransientSolution(2).Surface),...
100+ (md.results.TransientSolution(7).Thickness)-(md2.results.TransientSolution(2).Thickness),...
101+ (md.results.TransientSolution(7).IceVolume)-(md2.results.TransientSolution(2).IceVolume),...
102+ (md.results.TransientSolution(7).Temperature)-(md2.results.TransientSolution(2).Temperature),...
103+ (md.results.TransientSolution(7).Pressure)-(md2.results.TransientSolution(2).Pressure),...
104+ (md.results.TransientSolution(8).Vx)-(md2.results.TransientSolution(3).Vx),...
105+ (md.results.TransientSolution(8).Vy)-(md2.results.TransientSolution(3).Vy),...
106+ (md.results.TransientSolution(8).Vel)-(md2.results.TransientSolution(3).Vel),...
107+ (md.results.TransientSolution(8).TotalSmb)-(md2.results.TransientSolution(3).TotalSmb),...
108+ (md.results.TransientSolution(8).Base)-(md2.results.TransientSolution(3).Base),...
109+ (md.results.TransientSolution(8).Surface)-(md2.results.TransientSolution(3).Surface),...
110+ (md.results.TransientSolution(8).Thickness)-(md2.results.TransientSolution(3).Thickness),...
111+ (md.results.TransientSolution(8).IceVolume)-(md2.results.TransientSolution(3).IceVolume),...
112+ (md.results.TransientSolution(8).Temperature)-(md2.results.TransientSolution(3).Temperature),...
113+ (md.results.TransientSolution(8).Pressure)-(md2.results.TransientSolution(3).Pressure),...
114+ };
115Index: ../trunk-jpl/test/NightlyRun/test125.py
116===================================================================
117--- ../trunk-jpl/test/NightlyRun/test125.py (revision 0)
118+++ ../trunk-jpl/test/NightlyRun/test125.py (revision 19338)
119@@ -0,0 +1,63 @@
120+#Test Name: SquareShelfConstrainedRestartTranSSA2d
121+from model import *
122+from triangle import *
123+from setmask import *
124+from parameterize import *
125+from setflowequation import *
126+from EnumDefinitions import *
127+from solve import *
128+from MatlabFuncs import *
129+from massfluxatgate import massfluxatgate
130+from generic import generic
131+import copy
132+
133+md=triangle(model(),'../Exp/Square.exp',150000.)
134+md=setmask(md,'all','')
135+md=parameterize(md,'../Par/SquareShelfConstrained.py')
136+md=setflowequation(md,'SSA','all')
137+md.cluster=generic('name',oshostname(),'np',1)
138+md.transient.requested_outputs=['IceVolume','TotalSmb']
139+
140+md.verbose=verbose('solution',1);
141+md.settings.recording_frequency=5
142+
143+# time steps and resolution
144+md.timestepping.final_time=8
145+
146+md=solve(md,TransientSolutionEnum())
147+md2=copy.deepcopy(md)
148+md=solve(md,TransientSolutionEnum(),'restart',1)
149+
150+#Fields and tolerances to track changes
151+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'];
152+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
153+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
154+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
155+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
156+field_values=[\
157+ md2.results.TransientSolution[5].Vx-md.results.TransientSolution[0].Vx,\
158+ md2.results.TransientSolution[5].Vy-md.results.TransientSolution[0].Vy,\
159+ md2.results.TransientSolution[5].Vel-md.results.TransientSolution[0].Vel,\
160+ md2.results.TransientSolution[5].TotalSmb-md.results.TransientSolution[0].TotalSmb,\
161+ md2.results.TransientSolution[5].Base-md.results.TransientSolution[0].Base,\
162+ md2.results.TransientSolution[5].Surface-md.results.TransientSolution[0].Surface,\
163+ md2.results.TransientSolution[5].Thickness-md.results.TransientSolution[0].Thickness,\
164+ md2.results.TransientSolution[5].IceVolume-md.results.TransientSolution[0].IceVolume,\
165+ md2.results.TransientSolution[6].Vx-md.results.TransientSolution[1].Vx,\
166+ md2.results.TransientSolution[6].Vy-md.results.TransientSolution[1].Vy,\
167+ md2.results.TransientSolution[6].Vel-md.results.TransientSolution[1].Vel,\
168+ md2.results.TransientSolution[6].TotalSmb-md.results.TransientSolution[1].TotalSmb,\
169+ md2.results.TransientSolution[6].Base-md.results.TransientSolution[1].Base,\
170+ md2.results.TransientSolution[6].Surface-md.results.TransientSolution[1].Surface,\
171+ md2.results.TransientSolution[6].Thickness-md.results.TransientSolution[1].Thickness,\
172+ md2.results.TransientSolution[6].IceVolume-md.results.TransientSolution[1].IceVolume,\
173+ md2.results.TransientSolution[7].Vx-md.results.TransientSolution[2].Vx,\
174+ md2.results.TransientSolution[7].Vy-md.results.TransientSolution[2].Vy,\
175+ md2.results.TransientSolution[7].Vel-md.results.TransientSolution[2].Vel,\
176+ md2.results.TransientSolution[7].TotalSmb-md.results.TransientSolution[2].TotalSmb,\
177+ md2.results.TransientSolution[7].Base-md.results.TransientSolution[2].Base,\
178+ md2.results.TransientSolution[7].Surface-md.results.TransientSolution[2].Surface,\
179+ md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[2].Thickness,\
180+ md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[2].IceVolume\
181+ ]
182+
183Index: ../trunk-jpl/test/NightlyRun/test126.py
184===================================================================
185--- ../trunk-jpl/test/NightlyRun/test126.py (revision 0)
186+++ ../trunk-jpl/test/NightlyRun/test126.py (revision 19338)
187@@ -0,0 +1,71 @@
188+#Test Name: SquareShelfConstrainedRestartTranHO3d
189+from model import *
190+from triangle import *
191+from setmask import *
192+from parameterize import *
193+from setflowequation import *
194+from EnumDefinitions import *
195+from solve import *
196+from MatlabFuncs import *
197+from massfluxatgate import massfluxatgate
198+from generic import generic
199+import copy
200+
201+md=triangle(model(),'../Exp/Square.exp',150000.)
202+md=setmask(md,'all','')
203+md=parameterize(md,'../Par/SquareShelfConstrained.py')
204+md.cluster=generic('name',oshostname(),'np',1)
205+md.transient.requested_outputs=['IceVolume','TotalSmb']
206+md.extrude(3,1.)
207+md=setflowequation(md,'HO','all')
208+
209+md.verbose=verbose('solution',1);
210+md.settings.recording_frequency=5
211+
212+# time steps and resolution
213+md.timestepping.final_time=8
214+
215+md=solve(md,TransientSolutionEnum())
216+md2=copy.deepcopy(md)
217+md=solve(md,TransientSolutionEnum(),'restart',1)
218+
219+#Fields and tolerances to track changes
220+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'];
221+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
222+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
223+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
224+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
225+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
226+field_values=[\
227+ md2.results.TransientSolution[5].Vx-md.results.TransientSolution[0].Vx,\
228+ md2.results.TransientSolution[5].Vy-md.results.TransientSolution[0].Vy,\
229+ md2.results.TransientSolution[5].Vel-md.results.TransientSolution[0].Vel,\
230+ md2.results.TransientSolution[5].TotalSmb-md.results.TransientSolution[0].TotalSmb,\
231+ md2.results.TransientSolution[5].Base-md.results.TransientSolution[0].Base,\
232+ md2.results.TransientSolution[5].Surface-md.results.TransientSolution[0].Surface,\
233+ md2.results.TransientSolution[5].Thickness-md.results.TransientSolution[0].Thickness,\
234+ md2.results.TransientSolution[5].IceVolume-md.results.TransientSolution[0].IceVolume,\
235+ md2.results.TransientSolution[5].Temperature-md.results.TransientSolution[0].Temperature,\
236+ md2.results.TransientSolution[5].Pressure-md.results.TransientSolution[0].Pressure,\
237+ md2.results.TransientSolution[6].Vx-md.results.TransientSolution[1].Vx,\
238+ md2.results.TransientSolution[6].Vy-md.results.TransientSolution[1].Vy,\
239+ md2.results.TransientSolution[6].Vel-md.results.TransientSolution[1].Vel,\
240+ md2.results.TransientSolution[6].TotalSmb-md.results.TransientSolution[1].TotalSmb,\
241+ md2.results.TransientSolution[6].Base-md.results.TransientSolution[1].Base,\
242+ md2.results.TransientSolution[6].Surface-md.results.TransientSolution[1].Surface,\
243+ md2.results.TransientSolution[6].Thickness-md.results.TransientSolution[1].Thickness,\
244+ md2.results.TransientSolution[6].IceVolume-md.results.TransientSolution[1].IceVolume,\
245+ md2.results.TransientSolution[6].Temperature-md.results.TransientSolution[1].Temperature,\
246+ md2.results.TransientSolution[6].Pressure-md.results.TransientSolution[1].Pressure,\
247+ md2.results.TransientSolution[7].Vx-md.results.TransientSolution[2].Vx,\
248+ md2.results.TransientSolution[7].Vy-md.results.TransientSolution[2].Vy,\
249+ md2.results.TransientSolution[7].Vel-md.results.TransientSolution[2].Vel,\
250+ md2.results.TransientSolution[7].TotalSmb-md.results.TransientSolution[2].TotalSmb,\
251+ md2.results.TransientSolution[7].Base-md.results.TransientSolution[2].Base,\
252+ md2.results.TransientSolution[7].Surface-md.results.TransientSolution[2].Surface,\
253+ md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[2].Thickness,\
254+ md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[2].IceVolume,\
255+ md2.results.TransientSolution[7].Temperature-md.results.TransientSolution[2].Temperature,\
256+ md2.results.TransientSolution[7].Pressure-md.results.TransientSolution[2].Pressure\
257+ ]
258+
259Index: ../trunk-jpl/test/Archives/Archive125.nc
260===================================================================
261Cannot display: file marked as a binary type.
262svn:mime-type = application/octet-stream
263
264Property changes on: ../trunk-jpl/test/Archives/Archive125.nc
265___________________________________________________________________
266Added: svn:mime-type
267 + application/octet-stream
268
269Index: ../trunk-jpl/test/Archives/Archive126.nc
270===================================================================
271Cannot display: file marked as a binary type.
272svn:mime-type = application/octet-stream
273
274Property changes on: ../trunk-jpl/test/Archives/Archive126.nc
275___________________________________________________________________
276Added: svn:mime-type
277 + application/octet-stream
278
Note: See TracBrowser for help on using the repository browser.