source: issm/oecreview/Archive/16554-17801/ISSM-17467-17468.diff@ 17802

Last change on this file since 17802 was 17802, checked in by Mathieu Morlighem, 11 years ago

Added archives
File size: 11.3 KB
RevLine 
[17802]1Index: ../trunk-jpl/test/NightlyRun/test801.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test801.m (revision 17467)
4+++ ../trunk-jpl/test/NightlyRun/test801.m (revision 17468)
5@@ -1,26 +1,26 @@
6-md=triangle(model(),'../Exp/Square.exp',50000)
7-md=setmask(md,'','')
8-md=parameterize(md,'../Par/ValleyGlacierShelf.py')
9-md=setflowequation(md,'SSA','all')
10-md.cluster=generic('name',oshostname(),'np',3)
11+md=triangle(model(),'../Exp/Square.exp',50000);
12+md=setmask(md,'','');
13+md=parameterize(md,'../Par/ValleyGlacierShelf.py');
14+md=setflowequation(md,'SSA','all');
15+md.cluster=generic('name',oshostname(),'np',3);
16
17-%Transient
18-md.transient.isstressbalance=1
19-md.transient.islevelset=1
20-md.transient.ismasstransport=1
21-md.transient.isthermal=0
22-md.transient.isgroundingline=1
23-md.transient.isgia=0
24+%Transient;
25+md.transient.isstressbalance=1;
26+md.transient.islevelset=1;
27+md.transient.ismasstransport=1;
28+md.transient.isthermal=0;
29+md.transient.isgroundingline=1;
30+md.transient.isgia=0;
31
32-md=solve(md,TransientSolutionEnum())
33+md=solve(md,TransientSolutionEnum());
34
35 %Fields and tolerances to track changes
36 field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1',...
37 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',...
38- 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'}
39+ 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'};
40 field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,...
41 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,...
42- 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}
43+ 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
44 field_values={...
45 md.results.TransientSolution(1).Vx,...
46 md.results.TransientSolution(1).Vy,...
47@@ -43,4 +43,4 @@
48 md.results.TransientSolution(3).Thickness,...
49 md.results.TransientSolution(3).Surface,...
50 md.results.TransientSolution(3).MaskIceLevelset,...
51- }
52+ };
53Index: ../trunk-jpl/test/NightlyRun/test802.m
54===================================================================
55--- ../trunk-jpl/test/NightlyRun/test802.m (revision 17467)
56+++ ../trunk-jpl/test/NightlyRun/test802.m (revision 17468)
57@@ -1,31 +1,31 @@
58-md=triangle(model(),'../Exp/Square.exp',50000)
59-md=setmask(md,'','')
60-md=parameterize(md,'../Par/ValleyGlacierShelf.py')
61-md=extrude(md,3,2.)
62-md=setflowequation(md,'SSA','all')
63-md.cluster=generic('name',oshostname(),'np',3)
64+md=triangle(model(),'../Exp/Square.exp',50000);
65+md=setmask(md,'','');
66+md=parameterize(md,'../Par/ValleyGlacierShelf.py');
67+md=extrude(md,3,2.);
68+md=setflowequation(md,'SSA','all');
69+md.cluster=generic('name',oshostname(),'np',3);
70
71 %Thermal model
72-pos_surf=find(md.mesh.vertexonsurface)
73-md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf)
74+pos_surf=find(md.mesh.vertexonsurface);
75+md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf);
76
77 %Transient
78-md.transient.isstressbalance=1
79-md.transient.islevelset=1
80-md.transient.ismasstransport=1
81-md.transient.isthermal=1
82-md.transient.isgroundingline=1
83-md.transient.isgia=0
84+md.transient.isstressbalance=1;
85+md.transient.islevelset=1;
86+md.transient.ismasstransport=1;
87+md.transient.isthermal=1;
88+md.transient.isgroundingline=1;
89+md.transient.isgia=0;
90
91-md=solve(md,TransientSolutionEnum())
92+md=solve(md,TransientSolutionEnum());
93
94 %Fields and tolerances to track changes
95 field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Temperature1',...
96 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Temperature2',...
97- 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Temperature3'}
98+ 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Temperature3'};
99 field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,...
100 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
101- 1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}
102+ 1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11};
103 field_values={...
104 md.results.TransientSolution(1).Vx,...
105 md.results.TransientSolution(1).Vy,...
106@@ -51,4 +51,4 @@
107 md.results.TransientSolution(3).Surface,...
108 md.results.TransientSolution(3).MaskIceLevelset,...
109 md.results.TransientSolution(3).Temperature,...
110- }
111+ };
112Index: ../trunk-jpl/test/NightlyRun/test803.m
113===================================================================
114--- ../trunk-jpl/test/NightlyRun/test803.m (revision 17467)
115+++ ../trunk-jpl/test/NightlyRun/test803.m (revision 17468)
116@@ -1,32 +1,32 @@
117-md=triangle(model(),'../Exp/Square.exp',50000)
118-md=setmask(md,'','')
119-md=parameterize(md,'../Par/ValleyGlacierShelf.py')
120-md=extrude(md,3,2.)
121-md=setflowequation(md,'HO','all')
122-md.cluster=generic('name',oshostname(),'np',3)
123+md=triangle(model(),'../Exp/Square.exp',50000);
124+md=setmask(md,'','');
125+md=parameterize(md,'../Par/ValleyGlacierShelf.py');
126+md=extrude(md,3,2.);
127+md=setflowequation(md,'HO','all');
128+md.cluster=generic('name',oshostname(),'np',3);
129
130 %Thermal model
131-pos_surf=find(md.mesh.vertexonsurface)
132-md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf)
133-md.thermal.isenthalpy=1
134+pos_surf=find(md.mesh.vertexonsurface);
135+md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf);
136+md.thermal.isenthalpy=1;
137
138 %Transient
139-md.transient.isstressbalance=1
140-md.transient.islevelset=1
141-md.transient.ismasstransport=1
142-md.transient.isthermal=1
143-md.transient.isgroundingline=1
144-md.transient.isgia=0
145+md.transient.isstressbalance=1;
146+md.transient.islevelset=1;
147+md.transient.ismasstransport=1;
148+md.transient.isthermal=1;
149+md.transient.isgroundingline=1;
150+md.transient.isgia=0;
151
152-md=solve(md,TransientSolutionEnum())
153+md=solve(md,TransientSolutionEnum());
154
155 %Fields and tolerances to track changes
156 field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Enthalpy1','Watercolumn1',...
157 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Enthalpy2','Watercolumn2',...
158- 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'}
159+ 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'};
160 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
161 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
162- 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}
163+ 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
164 field_values={...
165 md.results.TransientSolution(1).Vx,...
166 md.results.TransientSolution(1).Vy,...
167@@ -55,4 +55,4 @@
168 md.results.TransientSolution(3).MaskIceLevelset,...
169 md.results.TransientSolution(3).Enthalpy,...
170 md.results.TransientSolution(3).Watercolumn,...
171- }
172+ };
173Index: ../trunk-jpl/test/NightlyRun/test804.m
174===================================================================
175--- ../trunk-jpl/test/NightlyRun/test804.m (revision 17467)
176+++ ../trunk-jpl/test/NightlyRun/test804.m (revision 17468)
177@@ -1,28 +1,28 @@
178-md=triangle(model(),'../Exp/Square.exp',50000)
179-md=setmask(md,'','')
180-md=parameterize(md,'../Par/ValleyGlacierShelf.py')
181-md=setflowequation(md,'SIA','all')
182-md.cluster=generic('name',oshostname(),'np',3)
183+md=triangle(model(),'../Exp/Square.exp',50000);
184+md=setmask(md,'','');
185+md=parameterize(md,'../Par/ValleyGlacierShelf.py');
186+md=setflowequation(md,'SIA','all');
187+md.cluster=generic('name',oshostname(),'np',3);
188
189 %Transient
190-md.transient.isstressbalance=1
191-md.transient.islevelset=1
192-md.transient.ismasstransport=1
193-md.transient.isthermal=0
194-md.transient.isgroundingline=1
195-md.transient.isgia=0
196+md.transient.isstressbalance=1;
197+md.transient.islevelset=1;
198+md.transient.ismasstransport=1;
199+md.transient.isthermal=0;
200+md.transient.isgroundingline=1;
201+md.transient.isgia=0;
202
203-md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1)
204+md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1);
205
206-md=solve(md,TransientSolutionEnum())
207+md=solve(md,TransientSolutionEnum());
208
209 %Fields and tolerances to track changes
210 field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1',...
211 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',...
212- 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'}
213+ 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'};
214 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
215 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
216- 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}
217+ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
218 field_values={...
219 md.results.TransientSolution(1).Vx,...
220 md.results.TransientSolution(1).Vy,...
221@@ -45,4 +45,4 @@
222 md.results.TransientSolution(3).Thickness,...
223 md.results.TransientSolution(3).Surface,...
224 md.results.TransientSolution(3).MaskIceLevelset,...
225- }
226+ };
227Index: ../trunk-jpl/test/NightlyRun/test805.m
228===================================================================
229--- ../trunk-jpl/test/NightlyRun/test805.m (revision 17467)
230+++ ../trunk-jpl/test/NightlyRun/test805.m (revision 17468)
231@@ -1,34 +1,34 @@
232-md=triangle(model(),'../Exp/Square.exp',50000)
233-md=setmask(md,'','')
234-md=parameterize(md,'../Par/ValleyGlacierShelf.py')
235-md=extrude(md,3,2.)
236-md=setflowequation(md,'HO','all')
237-md.cluster=generic('name',oshostname(),'np',3)
238+md=triangle(model(),'../Exp/Square.exp',50000);
239+md=setmask(md,'','');
240+md=parameterize(md,'../Par/ValleyGlacierShelf.py');
241+md=extrude(md,3,2.);
242+md=setflowequation(md,'HO','all');
243+md.cluster=generic('name',oshostname(),'np',3);
244
245 %Thermal model
246-pos_surf=find(md.mesh.vertexonsurface)
247-md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf)
248-md.thermal.isenthalpy=1
249+pos_surf=find(md.mesh.vertexonsurface);
250+md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf);
251+md.thermal.isenthalpy=1;
252
253 %Transient
254-md.transient.isstressbalance=1
255-md.transient.islevelset=1
256-md.transient.ismasstransport=1
257-md.transient.isthermal=1
258-md.transient.isgroundingline=1
259-md.transient.isgia=0
260+md.transient.isstressbalance=1;
261+md.transient.islevelset=1;
262+md.transient.ismasstransport=1;
263+md.transient.isthermal=1;
264+md.transient.isgroundingline=1;
265+md.transient.isgia=0;
266
267-md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1)
268+md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1);
269
270-md=solve(md,TransientSolutionEnum())
271+md=solve(md,TransientSolutionEnum());
272
273 %Fields and tolerances to track changes
274 field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Enthalpy1','Watercolumn1',...
275 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Enthalpy2','Watercolumn2',...
276- 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'}
277+ 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'};
278 field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,...
279 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
280- 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}
281+ 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
282 field_values={...
283 md.results.TransientSolution(1).Vx,...
284 md.results.TransientSolution(1).Vy,...
285@@ -57,4 +57,4 @@
286 md.results.TransientSolution(3).MaskIceLevelset,...
287 md.results.TransientSolution(3).Enthalpy,...
288 md.results.TransientSolution(3).Watercolumn,...
289- }
290+ };
Note: See TracBrowser for help on using the repository browser.