source: issm/oecreview/Archive/16133-16554/ISSM-16362-16363.diff@ 16556

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

NEW: added Archive/16133-16554
File size: 45.5 KB
RevLine 
[16556]1Index: ../trunk-jpl/test/NightlyRun/test426.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test426.m (revision 16362)
4+++ ../trunk-jpl/test/NightlyRun/test426.m (revision 16363)
5@@ -13,7 +13,7 @@
6 md.transient.isstressbalance=0;
7 md.transient.isgroundingline=1;
8 md.groundingline.migration='AgressiveMigration';
9-md.transient.requested_outputs=[IceVolumeEnum();IceVolumeAboveFloatationEnum()];
10+md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'};
11 md.cluster=generic('name',oshostname(),'np',3);
12
13 md=solve(md,TransientSolutionEnum());
14Index: ../trunk-jpl/test/NightlyRun/test328.m
15===================================================================
16--- ../trunk-jpl/test/NightlyRun/test328.m (revision 16362)
17+++ ../trunk-jpl/test/NightlyRun/test328.m (revision 16363)
18@@ -7,7 +7,7 @@
19 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
20 md.surfaceforcings.href=md.geometry.surface;
21 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
22-md.transient.requested_outputs=TotalSmbEnum();
23+md.transient.requested_outputs={'TotalSmb'};
24 md.cluster=generic('name',oshostname(),'np',3);
25 md=solve(md,TransientSolutionEnum());
26
27Index: ../trunk-jpl/test/NightlyRun/test3001.m
28===================================================================
29--- ../trunk-jpl/test/NightlyRun/test3001.m (revision 16362)
30+++ ../trunk-jpl/test/NightlyRun/test3001.m (revision 16363)
31@@ -3,7 +3,7 @@
32 md=parameterize(md,'../Par/SquareShelfConstrained.par');
33 md=setflowequation(md,'SSA','all');
34 md.cluster=generic('name',oshostname(),'np',1);
35-md.stressbalance.requested_outputs=StressTensorEnum();
36+md.stressbalance.requested_outputs={'StressTensor'};
37 md.autodiff.isautodiff=true;
38 md.toolkits.DefaultAnalysis=issmgslsolver();
39
40Index: ../trunk-jpl/test/NightlyRun/test3103.py
41===================================================================
42--- ../trunk-jpl/test/NightlyRun/test3103.py (revision 16362)
43+++ ../trunk-jpl/test/NightlyRun/test3103.py (revision 16363)
44@@ -13,7 +13,7 @@
45 md.extrude(3,2.)
46 md=setflowequation(md,'HO','all')
47 md.cluster=generic('name',oshostname(),'np',3)
48-md.stressbalance.requested_outputs=StressTensorEnum()
49+md.stressbalance.requested_outputs=['StressTensor']
50 md.toolkits.DefaultAnalysis=issmmumpssolver()
51 md.autodiff.isautodiff=True
52 md=solve(md,StressbalanceSolutionEnum())
53Index: ../trunk-jpl/test/NightlyRun/test3010.m
54===================================================================
55--- ../trunk-jpl/test/NightlyRun/test3010.m (revision 16362)
56+++ ../trunk-jpl/test/NightlyRun/test3010.m (revision 16363)
57@@ -3,7 +3,7 @@
58 md=parameterize(md,'../Par/SquareShelfConstrained.par');
59 md=setflowequation(md,'SSA','all');
60 md.cluster=generic('name',oshostname(),'np',1);
61-md.transient.requested_outputs=IceVolumeEnum();
62+md.transient.requested_outputs={'IceVolume'};
63
64 md.autodiff.isautodiff=true;
65 md.verbose=verbose('autodiff',true);
66Index: ../trunk-jpl/test/NightlyRun/test329.py
67===================================================================
68--- ../trunk-jpl/test/NightlyRun/test329.py (revision 16362)
69+++ ../trunk-jpl/test/NightlyRun/test329.py (revision 16363)
70@@ -19,7 +19,7 @@
71 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
72 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
73 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
74-md.transient.requested_outputs=TotalSmbEnum()
75+md.transient.requested_outputs=['TotalSmb']
76 md.cluster=generic('name',oshostname(),'np',3)
77 md=solve(md,TransientSolutionEnum())
78
79Index: ../trunk-jpl/test/NightlyRun/test329.m
80===================================================================
81--- ../trunk-jpl/test/NightlyRun/test329.m (revision 16362)
82+++ ../trunk-jpl/test/NightlyRun/test329.m (revision 16363)
83@@ -8,7 +8,7 @@
84 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
85 md.surfaceforcings.href=md.geometry.surface;
86 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
87-md.transient.requested_outputs=TotalSmbEnum();
88+md.transient.requested_outputs={'TotalSmb'};
89 md.cluster=generic('name',oshostname(),'np',3);
90 md=solve(md,TransientSolutionEnum());
91
92Index: ../trunk-jpl/test/NightlyRun/test101.m
93===================================================================
94--- ../trunk-jpl/test/NightlyRun/test101.m (revision 16362)
95+++ ../trunk-jpl/test/NightlyRun/test101.m (revision 16363)
96@@ -3,7 +3,8 @@
97 md=parameterize(md,'../Par/SquareShelfConstrained.par');
98 md=setflowequation(md,'SSA','all');
99 md.cluster=generic('name',oshostname(),'np',3);
100-md.stressbalance.requested_outputs=StressTensorEnum();
101+md.stressbalance.requested_outputs={'StressTensor'};
102+md.verbose=verbose('11111111');
103 md=solve(md,StressbalanceSolutionEnum());
104
105 %Fields and tolerances to track changes
106Index: ../trunk-jpl/test/NightlyRun/android.m
107===================================================================
108--- ../trunk-jpl/test/NightlyRun/android.m (revision 16362)
109+++ ../trunk-jpl/test/NightlyRun/android.m (revision 16363)
110@@ -4,7 +4,7 @@
111 md=setflowequation(md,'SSA','all');
112 md.cluster=generic('name',oshostname(),'np',3);
113 md.verbose=verbose('mprocessor',true,'module',true,'solution',true,'solver',true,'convergence',true,'control',true,'qmu',true,'autodiff',true);
114-md.stressbalance.requested_outputs=StressTensorEnum();
115+md.stressbalance.requested_outputs={'StressTensor'};
116 md=solve(md,StressbalanceSolutionEnum());
117
118
119Index: ../trunk-jpl/test/NightlyRun/test3020.m
120===================================================================
121--- ../trunk-jpl/test/NightlyRun/test3020.m (revision 16362)
122+++ ../trunk-jpl/test/NightlyRun/test3020.m (revision 16363)
123@@ -7,7 +7,7 @@
124 md=parameterize(md,'../Par/SquareShelfConstrained.par');
125 md=setflowequation(md,'SSA','all');
126 md.cluster=generic('name',oshostname(),'np',1);
127-md.transient.requested_outputs=[IceVolumeEnum();MaxVelEnum()];
128+md.transient.requested_outputs={'IceVolume','MaxVelEnum'};
129 md.verbose=verbose('autodiff',true);
130 md.stressbalance.restol=1e-4;
131 md.toolkits.DefaultAnalysis=issmgslsolver();
132Index: ../trunk-jpl/test/NightlyRun/test3101.m
133===================================================================
134--- ../trunk-jpl/test/NightlyRun/test3101.m (revision 16362)
135+++ ../trunk-jpl/test/NightlyRun/test3101.m (revision 16363)
136@@ -3,7 +3,7 @@
137 md=parameterize(md,'../Par/SquareShelfConstrained.par');
138 md=setflowequation(md,'SSA','all');
139 md.cluster=generic('name',oshostname(),'np',3);
140-md.stressbalance.requested_outputs=StressTensorEnum();
141+md.stressbalance.requested_outputs={'StressTensor'};
142 md.autodiff.isautodiff=true;
143 md.toolkits.DefaultAnalysis=issmmumpssolver();
144
145Index: ../trunk-jpl/test/NightlyRun/test3003.m
146===================================================================
147--- ../trunk-jpl/test/NightlyRun/test3003.m (revision 16362)
148+++ ../trunk-jpl/test/NightlyRun/test3003.m (revision 16363)
149@@ -4,7 +4,7 @@
150 md=extrude(md,3,2.);
151 md=setflowequation(md,'HO','all');
152 md.cluster=generic('name',oshostname(),'np',1);
153-md.stressbalance.requested_outputs=StressTensorEnum();
154+md.stressbalance.requested_outputs={'StressTensor'};
155 md.autodiff.isautodiff=true;
156 md.toolkits.DefaultAnalysis=issmgslsolver();
157 md.verbose=verbose('autodiff',true);
158Index: ../trunk-jpl/test/NightlyRun/test110.m
159===================================================================
160--- ../trunk-jpl/test/NightlyRun/test110.m (revision 16362)
161+++ ../trunk-jpl/test/NightlyRun/test110.m (revision 16363)
162@@ -3,7 +3,7 @@
163 md=parameterize(md,'../Par/SquareShelfConstrained.par');
164 md=setflowequation(md,'SSA','all');
165 md.cluster=generic('name',oshostname(),'np',3);
166-md.transient.requested_outputs=IceVolumeEnum();
167+md.transient.requested_outputs={'IceVolume'};
168
169 md=solve(md,TransientSolutionEnum());
170
171Index: ../trunk-jpl/test/NightlyRun/test3110.m
172===================================================================
173--- ../trunk-jpl/test/NightlyRun/test3110.m (revision 16362)
174+++ ../trunk-jpl/test/NightlyRun/test3110.m (revision 16363)
175@@ -3,7 +3,7 @@
176 md=parameterize(md,'../Par/SquareShelfConstrained.par');
177 md=setflowequation(md,'SSA','all');
178 md.cluster=generic('name',oshostname(),'np',3);
179-md.transient.requested_outputs=IceVolumeEnum();
180+md.transient.requested_outputs={'IceVolume'};
181
182 md.autodiff.isautodiff=true;
183 md.verbose=verbose('autodiff',true);
184Index: ../trunk-jpl/test/NightlyRun/test3001.py
185===================================================================
186--- ../trunk-jpl/test/NightlyRun/test3001.py (revision 16362)
187+++ ../trunk-jpl/test/NightlyRun/test3001.py (revision 16363)
188@@ -12,7 +12,7 @@
189 md=parameterize(md,'../Par/SquareShelfConstrained.py')
190 md=setflowequation(md,'SSA','all')
191 md.cluster=generic('name',oshostname(),'np',1)
192-md.stressbalance.requested_outputs=StressTensorEnum()
193+md.stressbalance.requested_outputs=['StressTensor']
194 md.toolkits.DefaultAnalysis=issmgslsolver()
195 md.autodiff.isautodiff=True
196 md=solve(md,StressbalanceSolutionEnum())
197Index: ../trunk-jpl/test/NightlyRun/test3015.py
198===================================================================
199--- ../trunk-jpl/test/NightlyRun/test3015.py (revision 16362)
200+++ ../trunk-jpl/test/NightlyRun/test3015.py (revision 16363)
201@@ -21,7 +21,7 @@
202 md=parameterize(md,'../Par/SquareShelfConstrained.py')
203 md=setflowequation(md,'SSA','all')
204 md.cluster=generic('name',oshostname(),'np',3)
205-md.masstransport.requested_outputs=IceVolumeEnum()
206+md.masstransport.requested_outputs=['IceVolume']
207 md.verbose=verbose('autodiff',True)
208 md.toolkits.DefaultAnalysis=issmgslsolver()
209
210Index: ../trunk-jpl/test/NightlyRun/test3021.m
211===================================================================
212--- ../trunk-jpl/test/NightlyRun/test3021.m (revision 16362)
213+++ ../trunk-jpl/test/NightlyRun/test3021.m (revision 16363)
214@@ -3,7 +3,7 @@
215 md=parameterize(md,'../Par/SquareShelfConstrained.par');
216 md=setflowequation(md,'SSA','all');
217 md.cluster=generic('name',oshostname(),'np',3);
218-md.stressbalance.requested_outputs=StressTensorEnum();
219+md.stressbalance.requested_outputs={'StressTensor'};
220 md.autodiff.isautodiff=false;
221 md.toolkits.DefaultAnalysis=issmsolver();
222 md.verbose=verbose('1111111');
223Index: ../trunk-jpl/test/NightlyRun/test111.m
224===================================================================
225--- ../trunk-jpl/test/NightlyRun/test111.m (revision 16362)
226+++ ../trunk-jpl/test/NightlyRun/test111.m (revision 16363)
227@@ -4,7 +4,7 @@
228 md=extrude(md,3,1.);
229 md=setflowequation(md,'HO','all');
230 md.cluster=generic('name',oshostname(),'np',3);
231-md.transient.requested_outputs=IceVolumeEnum();
232+md.transient.requested_outputs={'IceVolume'};
233 md=solve(md,TransientSolutionEnum());
234
235 %Fields and tolerances to track changes
236Index: ../trunk-jpl/test/NightlyRun/test234.m
237===================================================================
238--- ../trunk-jpl/test/NightlyRun/test234.m (revision 16362)
239+++ ../trunk-jpl/test/NightlyRun/test234.m (revision 16363)
240@@ -56,7 +56,7 @@
241 md.qmu.isdakota=1;
242
243 md.stressbalance.reltol=10^-5; %tighten for qmu analyses
244-md.transient.requested_outputs=IceVolumeEnum();
245+md.transient.requested_outputs={'IceVolume'};
246
247 %solve
248 md=solve(md,TransientSolutionEnum(),'overwrite','y');
249Index: ../trunk-jpl/test/NightlyRun/test3010.py
250===================================================================
251--- ../trunk-jpl/test/NightlyRun/test3010.py (revision 16362)
252+++ ../trunk-jpl/test/NightlyRun/test3010.py (revision 16363)
253@@ -13,7 +13,7 @@
254 md=setflowequation(md,'SSA','all')
255 md.cluster=generic('name',oshostname(),'np',1)
256 md.toolkits.DefaultAnalysis=issmgslsolver()
257-md.transient.requested_outputs=IceVolumeEnum()
258+md.transient.requested_outputs=['IceVolume']
259
260 md.autodiff.isautodiff=True
261 md=solve(md,TransientSolutionEnum())
262Index: ../trunk-jpl/test/NightlyRun/test101.py
263===================================================================
264--- ../trunk-jpl/test/NightlyRun/test101.py (revision 16362)
265+++ ../trunk-jpl/test/NightlyRun/test101.py (revision 16363)
266@@ -12,7 +12,7 @@
267 md=parameterize(md,'../Par/SquareShelfConstrained.py')
268 md=setflowequation(md,'SSA','all')
269 md.cluster=generic('name',oshostname(),'np',3)
270-md.stressbalance.requested_outputs=StressTensorEnum()
271+md.stressbalance.requested_outputs=['StressTensor']
272 md=solve(md,StressbalanceSolutionEnum())
273
274 #Fields and tolerances to track changes
275Index: ../trunk-jpl/test/NightlyRun/test103.m
276===================================================================
277--- ../trunk-jpl/test/NightlyRun/test103.m (revision 16362)
278+++ ../trunk-jpl/test/NightlyRun/test103.m (revision 16363)
279@@ -4,7 +4,7 @@
280 md=extrude(md,3,2.);
281 md=setflowequation(md,'HO','all');
282 md.cluster=generic('name',oshostname(),'np',3);
283-md.stressbalance.requested_outputs=StressTensorEnum();
284+md.stressbalance.requested_outputs={'StressTensor'};
285 md=solve(md,StressbalanceSolutionEnum());
286
287 %Fields and tolerances to track changes
288Index: ../trunk-jpl/test/NightlyRun/test424.py
289===================================================================
290--- ../trunk-jpl/test/NightlyRun/test424.py (revision 16362)
291+++ ../trunk-jpl/test/NightlyRun/test424.py (revision 16363)
292@@ -22,7 +22,7 @@
293 md.transient.isstressbalance=False
294 md.transient.isgroundingline=True
295 md.groundingline.migration='AgressiveMigration'
296-md.transient.requested_outputs=[IceVolumeEnum(),IceVolumeAboveFloatationEnum()]
297+md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation']
298
299 md.cluster=generic('name',oshostname(),'np',3)
300 md=solve(md,TransientSolutionEnum())
301Index: ../trunk-jpl/test/NightlyRun/test3103.m
302===================================================================
303--- ../trunk-jpl/test/NightlyRun/test3103.m (revision 16362)
304+++ ../trunk-jpl/test/NightlyRun/test3103.m (revision 16363)
305@@ -4,7 +4,7 @@
306 md=extrude(md,3,2.);
307 md=setflowequation(md,'HO','all');
308 md.cluster=generic('name',oshostname(),'np',3);
309-md.stressbalance.requested_outputs=StressTensorEnum();
310+md.stressbalance.requested_outputs={'StressTensor'};
311 md.autodiff.isautodiff=true;
312 md.toolkits.DefaultAnalysis=issmmumpssolver();
313 md.verbose=verbose('autodiff',true);
314Index: ../trunk-jpl/test/NightlyRun/test110.py
315===================================================================
316--- ../trunk-jpl/test/NightlyRun/test110.py (revision 16362)
317+++ ../trunk-jpl/test/NightlyRun/test110.py (revision 16363)
318@@ -12,7 +12,7 @@
319 md=parameterize(md,'../Par/SquareShelfConstrained.py')
320 md=setflowequation(md,'SSA','all')
321 md.cluster=generic('name',oshostname(),'np',3)
322-md.transient.requested_outputs=IceVolumeEnum()
323+md.transient.requested_outputs=['IceVolume']
324
325 md=solve(md,TransientSolutionEnum())
326
327Index: ../trunk-jpl/test/NightlyRun/test235.m
328===================================================================
329--- ../trunk-jpl/test/NightlyRun/test235.m (revision 16362)
330+++ ../trunk-jpl/test/NightlyRun/test235.m (revision 16363)
331@@ -51,7 +51,7 @@
332 md.qmu.isdakota=1;
333
334 md.stressbalance.reltol=10^-5; %tighten for qmu analyses
335-md.transient.requested_outputs=IceVolumeEnum();
336+md.transient.requested_outputs={'IceVolume'};
337
338 %solve
339 md=solve(md,TransientSolutionEnum(),'overwrite','y');
340Index: ../trunk-jpl/test/NightlyRun/test3101.py
341===================================================================
342--- ../trunk-jpl/test/NightlyRun/test3101.py (revision 16362)
343+++ ../trunk-jpl/test/NightlyRun/test3101.py (revision 16363)
344@@ -12,7 +12,7 @@
345 md=parameterize(md,'../Par/SquareShelfConstrained.py')
346 md=setflowequation(md,'SSA','all')
347 md.cluster=generic('name',oshostname(),'np',3)
348-md.stressbalance.requested_outputs=StressTensorEnum()
349+md.stressbalance.requested_outputs=['StressTensor']
350 md.toolkits.DefaultAnalysis=issmmumpssolver()
351 md.autodiff.isautodiff=True
352 md=solve(md,StressbalanceSolutionEnum())
353Index: ../trunk-jpl/test/NightlyRun/test3020.py
354===================================================================
355--- ../trunk-jpl/test/NightlyRun/test3020.py (revision 16362)
356+++ ../trunk-jpl/test/NightlyRun/test3020.py (revision 16363)
357@@ -21,7 +21,7 @@
358 md=parameterize(md,'../Par/SquareShelfConstrained.py')
359 md=setflowequation(md,'SSA','all')
360 md.cluster=generic('name',oshostname(),'np',1)
361-md.transient.requested_outputs=[IceVolumeEnum(),MaxVelEnum()]
362+md.transient.requested_outputs=['IceVolume','MaxVel']
363 md.verbose=verbose('autodiff',True)
364 md.stressbalance.restol=0.000001
365 md.toolkits.DefaultAnalysis=issmgslsolver()
366Index: ../trunk-jpl/test/NightlyRun/test3015.m
367===================================================================
368--- ../trunk-jpl/test/NightlyRun/test3015.m (revision 16362)
369+++ ../trunk-jpl/test/NightlyRun/test3015.m (revision 16363)
370@@ -7,7 +7,7 @@
371 md=parameterize(md,'../Par/SquareShelfConstrained.par');
372 md=setflowequation(md,'SSA','all');
373 md.cluster=generic('name',oshostname(),'np',1);
374-md.masstransport.requested_outputs=IceVolumeEnum();
375+md.masstransport.requested_outputs={'IceVolume'};
376 md.verbose=verbose('autodiff',true);
377 md.toolkits.DefaultAnalysis=issmgslsolver();
378
379Index: ../trunk-jpl/test/NightlyRun/test111.py
380===================================================================
381--- ../trunk-jpl/test/NightlyRun/test111.py (revision 16362)
382+++ ../trunk-jpl/test/NightlyRun/test111.py (revision 16363)
383@@ -13,7 +13,7 @@
384 md.extrude(3,1.)
385 md=setflowequation(md,'HO','all')
386 md.cluster=generic('name',oshostname(),'np',3)
387-md.transient.requested_outputs=IceVolumeEnum()
388+md.transient.requested_outputs=['IceVolume']
389 md=solve(md,TransientSolutionEnum())
390
391 #Fields and tolerances to track changes
392Index: ../trunk-jpl/test/NightlyRun/test424.m
393===================================================================
394--- ../trunk-jpl/test/NightlyRun/test424.m (revision 16362)
395+++ ../trunk-jpl/test/NightlyRun/test424.m (revision 16363)
396@@ -12,7 +12,7 @@
397 md.transient.isstressbalance=0;
398 md.transient.isgroundingline=1;
399 md.groundingline.migration='AgressiveMigration';
400-md.transient.requested_outputs=[IceVolumeEnum();IceVolumeAboveFloatationEnum()];
401+md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'};
402
403 md.cluster=generic('name',oshostname(),'np',3);
404 md=solve(md,TransientSolutionEnum());
405Index: ../trunk-jpl/test/NightlyRun/test3110.py
406===================================================================
407--- ../trunk-jpl/test/NightlyRun/test3110.py (revision 16362)
408+++ ../trunk-jpl/test/NightlyRun/test3110.py (revision 16363)
409@@ -13,7 +13,7 @@
410 md=setflowequation(md,'SSA','all')
411 md.cluster=generic('name',oshostname(),'np',3)
412 md.toolkits.DefaultAnalysis=issmmumpssolver()
413-md.transient.requested_outputs=IceVolumeEnum()
414+md.transient.requested_outputs=['IceVolume']
415
416 md.autodiff.isautodiff=True
417 md=solve(md,TransientSolutionEnum())
418Index: ../trunk-jpl/test/NightlyRun/test3003.py
419===================================================================
420--- ../trunk-jpl/test/NightlyRun/test3003.py (revision 16362)
421+++ ../trunk-jpl/test/NightlyRun/test3003.py (revision 16363)
422@@ -13,7 +13,7 @@
423 md.extrude(3,2.)
424 md=setflowequation(md,'HO','all')
425 md.cluster=generic('name',oshostname(),'np',1)
426-md.stressbalance.requested_outputs=StressTensorEnum()
427+md.stressbalance.requested_outputs=['StressTensor']
428 md.toolkits.DefaultAnalysis=issmgslsolver()
429 md.autodiff.isautodiff=True
430 md=solve(md,StressbalanceSolutionEnum())
431Index: ../trunk-jpl/test/NightlyRun/test103.py
432===================================================================
433--- ../trunk-jpl/test/NightlyRun/test103.py (revision 16362)
434+++ ../trunk-jpl/test/NightlyRun/test103.py (revision 16363)
435@@ -13,7 +13,7 @@
436 md.extrude(3,2.)
437 md=setflowequation(md,'HO','all')
438 md.cluster=generic('name',oshostname(),'np',3)
439-md.stressbalance.requested_outputs=StressTensorEnum()
440+md.stressbalance.requested_outputs=['StressTensor']
441 md=solve(md,StressbalanceSolutionEnum())
442
443 #Fields and tolerances to track changes
444Index: ../trunk-jpl/test/NightlyRun/test426.py
445===================================================================
446--- ../trunk-jpl/test/NightlyRun/test426.py (revision 16362)
447+++ ../trunk-jpl/test/NightlyRun/test426.py (revision 16363)
448@@ -23,7 +23,7 @@
449 md.transient.isstressbalance=False
450 md.transient.isgroundingline=True
451 md.groundingline.migration='AgressiveMigration'
452-md.transient.requested_outputs=[IceVolumeEnum(),IceVolumeAboveFloatationEnum()]
453+md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation']
454 md.cluster=generic('name',oshostname(),'np',3)
455
456 md=solve(md,TransientSolutionEnum())
457Index: ../trunk-jpl/test/NightlyRun/test328.py
458===================================================================
459--- ../trunk-jpl/test/NightlyRun/test328.py (revision 16362)
460+++ ../trunk-jpl/test/NightlyRun/test328.py (revision 16363)
461@@ -16,7 +16,7 @@
462 md.surfaceforcings.issmbgradients=1
463 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
464 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
465-md.transient.requested_outputs=TotalSmbEnum()
466+md.transient.requested_outputs=['TotalSmb']
467 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
468 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
469 md.cluster=generic('name',oshostname(),'np',3)
470Index: ../trunk-jpl/src/c/analyses/transient_core.cpp
471===================================================================
472--- ../trunk-jpl/src/c/analyses/transient_core.cpp (revision 16362)
473+++ ../trunk-jpl/src/c/analyses/transient_core.cpp (revision 16363)
474@@ -19,6 +19,7 @@
475 void transient_core(FemModel* femmodel){
476
477 /*parameters: */
478+ int i;
479 IssmDouble starttime,finaltime,dt,yts;
480 bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isenthalpy,isdelta18o,isgia;
481 bool save_results,dakota_analysis;
482@@ -26,8 +27,9 @@
483 int output_frequency;
484 int meshtype,groundingline_migration;
485 int numoutputs = 0;
486- int *requested_outputs = NULL;
487+ char** requested_outputs = NULL;
488
489+
490 /*intermediary: */
491 int step;
492 IssmDouble time;
493@@ -183,6 +185,6 @@
494
495 femmodel->RequestedDependentsx();
496
497- /*Free ressources:*/
498- xDelete<int>(requested_outputs);
499+ /*Free ressources:*/
500+ if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
501 }
502Index: ../trunk-jpl/src/c/analyses/masstransport_core.cpp
503===================================================================
504--- ../trunk-jpl/src/c/analyses/masstransport_core.cpp (revision 16362)
505+++ ../trunk-jpl/src/c/analyses/masstransport_core.cpp (revision 16363)
506@@ -12,10 +12,11 @@
507 void masstransport_core(FemModel* femmodel){
508
509 /*parameters: */
510+ int i;
511 bool save_results;
512 bool issmbgradients,ispdd,isdelta18o,isFS,isfreesurface,dakota_analysis;
513 int solution_type;
514- int *requested_outputs = NULL;
515+ char** requested_outputs = NULL;
516 int numoutputs = 0;
517
518 /*activate configuration*/
519@@ -76,5 +77,5 @@
520 if(solution_type==MasstransportSolutionEnum)femmodel->RequestedDependentsx();
521
522 /*Free ressources:*/
523- xDelete<int>(requested_outputs);
524+ if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
525 }
526Index: ../trunk-jpl/src/c/analyses/stressbalance_core.cpp
527===================================================================
528--- ../trunk-jpl/src/c/analyses/stressbalance_core.cpp (revision 16362)
529+++ ../trunk-jpl/src/c/analyses/stressbalance_core.cpp (revision 16363)
530@@ -20,8 +20,10 @@
531 int newton;
532 int solution_type;
533 int numoutputs = 0;
534- int *requested_outputs = NULL;
535+ char** requested_outputs = NULL;
536+ int i;
537
538+
539 /* recover parameters:*/
540 femmodel->parameters->FindParam(&meshtype,MeshTypeEnum);
541 femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum);
542@@ -95,6 +97,6 @@
543
544 if(solution_type==StressbalanceSolutionEnum)femmodel->RequestedDependentsx();
545
546- /*Free ressources:*/
547- xDelete<int>(requested_outputs);
548+ /*Free ressources:*/
549+ if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
550 }
551Index: ../trunk-jpl/src/c/analyses/steadystate_core.cpp
552===================================================================
553--- ../trunk-jpl/src/c/analyses/steadystate_core.cpp (revision 16362)
554+++ ../trunk-jpl/src/c/analyses/steadystate_core.cpp (revision 16363)
555@@ -20,6 +20,7 @@
556 void steadystate_core(FemModel* femmodel){
557
558 /*intermediary: */
559+ int i;
560 int step;
561 Vector<IssmDouble>* ug = NULL;
562 Vector<IssmDouble>* ug_old = NULL;
563@@ -31,7 +32,7 @@
564 int maxiter;
565 IssmDouble reltol;
566 int numoutputs = 0;
567- int *requested_outputs = NULL;
568+ char** requested_outputs = NULL;
569
570 /* recover parameters:*/
571 femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
572@@ -101,8 +102,8 @@
573 delete tg_old;
574 delete ug_old;
575 delete tg;
576- delete ug;
577- xDelete<int>(requested_outputs);
578+ delete ug;
579+ if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
580 }
581 bool steadystateconvergence(Vector<IssmDouble>* tg,Vector<IssmDouble>* tg_old,Vector<IssmDouble>* ug,Vector<IssmDouble>* ug_old,IssmDouble reltol){
582
583Index: ../trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateParametersStressbalance.cpp
584===================================================================
585--- ../trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateParametersStressbalance.cpp (revision 16362)
586+++ ../trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateParametersStressbalance.cpp (revision 16363)
587@@ -11,7 +11,7 @@
588
589 /*Intermediaries*/
590 int numoutputs;
591- IssmDouble *requestedoutputs = NULL;
592+ char** requestedoutputs = NULL;
593
594 /*Get parameters: */
595 Parameters *parameters=*pparameters;
596@@ -34,10 +34,10 @@
597 parameters->AddObject(iomodel->CopyConstantObject(StressbalanceViscosityOvershootEnum));
598
599 /*Requested outputs*/
600- iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,StressbalanceRequestedOutputsEnum);
601+ iomodel->FetchData(&requestedoutputs,&numoutputs,StressbalanceRequestedOutputsEnum);
602 parameters->AddObject(new IntParam(StressbalanceNumRequestedOutputsEnum,numoutputs));
603- if(numoutputs)parameters->AddObject(new IntVecParam(StressbalanceRequestedOutputsEnum,requestedoutputs,numoutputs));
604- iomodel->DeleteData(requestedoutputs,StressbalanceRequestedOutputsEnum);
605+ if(numoutputs)parameters->AddObject(new StringArrayParam(StressbalanceRequestedOutputsEnum,requestedoutputs,numoutputs));
606+ iomodel->DeleteData(&requestedoutputs,numoutputs,StressbalanceRequestedOutputsEnum);
607
608 /*Assign output pointer: */
609 *pparameters = parameters;
610Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
611===================================================================
612--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 16362)
613+++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 16363)
614@@ -20,7 +20,7 @@
615 int i,j,m,k;
616 int numoutputs,meshtype;
617 Parameters *parameters = NULL;
618- IssmDouble *requestedoutputs = NULL;
619+ char** requestedoutputs = NULL;
620 IssmDouble time;
621 bool ispdd,isdelta18o;
622
623@@ -135,20 +135,21 @@
624 /*By default, save all results*/
625 parameters->AddObject(new BoolParam(SaveResultsEnum,true));
626
627- iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,TransientRequestedOutputsEnum);
628+ /*Requested outputs */
629+ iomodel->FetchData(&requestedoutputs,&numoutputs,TransientRequestedOutputsEnum);
630 parameters->AddObject(new IntParam(TransientNumRequestedOutputsEnum,numoutputs));
631- if(numoutputs)parameters->AddObject(new IntVecParam(TransientRequestedOutputsEnum,requestedoutputs,numoutputs));
632- iomodel->DeleteData(requestedoutputs,TransientRequestedOutputsEnum);
633+ if(numoutputs)parameters->AddObject(new StringArrayParam(TransientRequestedOutputsEnum,requestedoutputs,numoutputs));
634+ iomodel->DeleteData(&requestedoutputs,numoutputs,TransientRequestedOutputsEnum);
635
636- iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,SteadystateRequestedOutputsEnum);
637+ iomodel->FetchData(&requestedoutputs,&numoutputs,SteadystateRequestedOutputsEnum);
638 parameters->AddObject(new IntParam(SteadystateNumRequestedOutputsEnum,numoutputs));
639- if(numoutputs)parameters->AddObject(new IntVecParam(SteadystateRequestedOutputsEnum,requestedoutputs,numoutputs));
640- iomodel->DeleteData(requestedoutputs,SteadystateRequestedOutputsEnum);
641+ if(numoutputs)parameters->AddObject(new StringArrayParam(SteadystateRequestedOutputsEnum,requestedoutputs,numoutputs));
642+ iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum);
643
644- iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,MasstransportRequestedOutputsEnum);
645+ iomodel->FetchData(&requestedoutputs,&numoutputs,MasstransportRequestedOutputsEnum);
646 parameters->AddObject(new IntParam(MasstransportNumRequestedOutputsEnum,numoutputs));
647- if(numoutputs)parameters->AddObject(new IntVecParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs));
648- iomodel->DeleteData(requestedoutputs,MasstransportRequestedOutputsEnum);
649+ if(numoutputs)parameters->AddObject(new StringArrayParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs));
650+ iomodel->DeleteData(&requestedoutputs,numoutputs,MasstransportRequestedOutputsEnum);
651
652 /*Deal with mass flux segments: {{{*/
653 iomodel->FetchData(&qmu_mass_flux_present,QmuMassFluxSegmentsPresentEnum);
654Index: ../trunk-jpl/src/c/classes/FemModel.cpp
655===================================================================
656--- ../trunk-jpl/src/c/classes/FemModel.cpp (revision 16362)
657+++ ../trunk-jpl/src/c/classes/FemModel.cpp (revision 16363)
658@@ -469,9 +469,9 @@
659
660 }
661 /*}}}*/
662-void FemModel::RequestedOutputsx(int* requested_outputs, int numoutputs){/*{{{*/
663+void FemModel::RequestedOutputsx(char** requested_outputs, int numoutputs){/*{{{*/
664
665- int output_enum;
666+ char* output_string;
667 int step;
668 IssmDouble time;
669 IssmDouble output_value;
670@@ -484,34 +484,28 @@
671 /*retrieve Inputs*/
672 if(numoutputs){
673 for(int i=0;i<numoutputs;i++){
674- output_enum=requested_outputs[i];
675+ output_string=requested_outputs[i];
676
677- switch(output_enum){
678+ if (strcmp(output_string,"IceVolume")==0){
679+ Responsex(&output_value,output_string);
680+ results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeEnum,reCast<IssmPDouble>(output_value),step,time));
681
682- case IceVolumeEnum:
683- Responsex(&output_value,"IceVolume");
684- results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeEnum,reCast<IssmPDouble>(output_value),step,time));
685- break;
686- case IceVolumeAboveFloatationEnum:
687- Responsex(&output_value,"IceVolumeAboveFloatation");
688- results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeAboveFloatationEnum,reCast<IssmPDouble>(output_value),step,time));
689- break;
690- case TotalSmbEnum:
691- Responsex(&output_value,"TotalSmb");
692- results->AddObject(new GenericExternalResult<double>(results->Size()+1,TotalSmbEnum,reCast<IssmPDouble>(output_value),step,time));
693- break;
694- case MaxVelEnum:
695- Responsex(&output_value,"MaxVel");
696- results->AddObject(new GenericExternalResult<double>(results->Size()+1,MaxVelEnum,reCast<IssmPDouble>(output_value),step,time));
697- break;
698- default:
699- /*create this output in the element inputs, and then transfer to results:*/
700- for(int j=0;j<elements->Size();j++){
701- element=(Element*)elements->GetObjectByOffset(j);
702- element->RequestedOutput(output_enum,step,time);
703- }
704- break;
705 }
706+ else if (strcmp(output_string,"TotalSmb")==0){
707+ Responsex(&output_value,output_string);
708+ results->AddObject(new GenericExternalResult<double>(results->Size()+1,TotalSmbEnum,reCast<IssmPDouble>(output_value),step,time));
709+ }
710+ else if (strcmp(output_string,"MaxVel")==0){
711+ Responsex(&output_value,output_string);
712+ results->AddObject(new GenericExternalResult<double>(results->Size()+1,MaxVelEnum,reCast<IssmPDouble>(output_value),step,time));
713+ }
714+ else{
715+ /*create this output in the element inputs, and then transfer to results:*/
716+ for(int j=0;j<elements->Size();j++){
717+ element=(Element*)elements->GetObjectByOffset(j);
718+ element->RequestedOutput(StringToEnumx(output_string),step,time);
719+ }
720+ }
721 }
722 }
723 }
724Index: ../trunk-jpl/src/c/classes/IoModel.h
725===================================================================
726--- ../trunk-jpl/src/c/classes/IoModel.h (revision 16362)
727+++ ../trunk-jpl/src/c/classes/IoModel.h (revision 16363)
728@@ -66,6 +66,7 @@
729 IssmDouble *Data(int dataenum);
730 void DeleteData(int num,...);
731 void DeleteData(IssmDouble* vector, int dataenum);
732+ void DeleteData(char*** pstringarray, int numstrings, int dataenum);
733 void FetchConstants(void);
734 void FetchData(bool* pboolean,int data_enum);
735 void FetchData(int* pinteger,int data_enum);
736Index: ../trunk-jpl/src/c/classes/IoModel.cpp
737===================================================================
738--- ../trunk-jpl/src/c/classes/IoModel.cpp (revision 16362)
739+++ ../trunk-jpl/src/c/classes/IoModel.cpp (revision 16363)
740@@ -339,6 +339,21 @@
741 if(vector)if (!this->independents[dataenum]) xDelete<IssmDouble>(vector);
742
743 } /*}}}*/
744+/*FUNCTION IoModel::DeleteData(char*** pstringarray, int numstrings, int dataenum) {{{*/
745+void IoModel::DeleteData(char*** pstringarray, int numstrings, int dataenum){
746+
747+ int i;
748+ char** stringarray=*pstringarray;
749+
750+ if (numstrings){
751+ for (i=0;i<numstrings;i++){
752+ char* string=stringarray[i];
753+ xDelete<char>(string);
754+ }
755+ xDelete<char*>(stringarray);
756+ }
757+ *pstringarray=NULL;
758+} /*}}}*/
759 /*FUNCTION IoModel::FetchConstants{{{*/
760 void IoModel::FetchConstants(void){
761
762Index: ../trunk-jpl/src/c/classes/FemModel.h
763===================================================================
764--- ../trunk-jpl/src/c/classes/FemModel.h (revision 16362)
765+++ ../trunk-jpl/src/c/classes/FemModel.h (revision 16363)
766@@ -81,7 +81,7 @@
767 #ifdef _HAVE_DAKOTA_
768 void DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses);
769 #endif
770- void RequestedOutputsx(int* requested_outputs, int numoutputs);
771+ void RequestedOutputsx(char** requested_outputs, int numoutputs);
772 void RequestedDependentsx(void);
773 void Responsex(IssmDouble* presponse,int response_descriptor_enum);
774 void Responsex(IssmDouble* presponse,const char* response_descriptor);
775Index: ../trunk-jpl/src/m/classes/transient.py
776===================================================================
777--- ../trunk-jpl/src/m/classes/transient.py (revision 16362)
778+++ ../trunk-jpl/src/m/classes/transient.py (revision 16363)
779@@ -17,7 +17,7 @@
780 self.isthermal = False
781 self.isgroundingline = False
782 self.isgia = False
783- self.requested_outputs = float('NaN')
784+ self.requested_outputs = []
785
786 #set defaults
787 self.setdefaultparameters()
788@@ -55,7 +55,7 @@
789 md = checkfield(md,'transient.isthermal','numel',[1],'values',[0,1])
790 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0,1])
791 md = checkfield(md,'transient.isgia','numel',[1],'values',[0,1])
792- md = checkfield(md,'transient.requested_outputs','size',[float('NaN')])
793+ md = checkfield(md,'transient.requested_outputs','size',[1, float('NaN')])
794
795
796 return md
797@@ -66,6 +66,6 @@
798 WriteData(fid,'object',self,'fieldname','isthermal','format','Boolean')
799 WriteData(fid,'object',self,'fieldname','isgroundingline','format','Boolean')
800 WriteData(fid,'object',self,'fieldname','isgia','format','Boolean')
801- WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3)
802+ WriteData(fid,'object',self,'fieldname','requested_outputs','format','StringArray')
803 # }}}
804
805Index: ../trunk-jpl/src/m/classes/steadystate.m
806===================================================================
807--- ../trunk-jpl/src/m/classes/steadystate.m (revision 16362)
808+++ ../trunk-jpl/src/m/classes/steadystate.m (revision 16363)
809@@ -7,7 +7,7 @@
810 properties (SetAccess=public)
811 reltol = 0;
812 maxiter = 0;
813- requested_outputs = NaN;
814+ requested_outputs = {};
815 end
816 methods
817 function obj = steadystate(varargin) % {{{
818@@ -49,7 +49,7 @@
819 function marshall(obj,md,fid) % {{{
820 WriteData(fid,'object',obj,'fieldname','reltol','format','Double');
821 WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer');
822- WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
823+ WriteData(fid,'object',obj,'fieldname','requested_outputs','format','StringArray');
824 end % }}}
825 end
826 end
827Index: ../trunk-jpl/src/m/classes/transient.m
828===================================================================
829--- ../trunk-jpl/src/m/classes/transient.m (revision 16362)
830+++ ../trunk-jpl/src/m/classes/transient.m (revision 16363)
831@@ -11,7 +11,7 @@
832 isgroundingline = 0;
833 isgia = 0;
834 isdamage = 0;
835- requested_outputs = NaN;
836+ requested_outputs = {};
837 end
838 methods
839 function obj = transient(varargin) % {{{
840@@ -44,7 +44,7 @@
841 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0 1]);
842 md = checkfield(md,'transient.isgia','numel',[1],'values',[0 1]);
843 md = checkfield(md,'transient.isdamage','numel',[1],'values',[0 1]);
844- md = checkfield(md,'transient.requested_outputs','size',[NaN 1]);
845+ md = checkfield(md,'transient.requested_outputs','size',[1 NaN]);
846
847 end % }}}
848 function disp(obj) % {{{
849@@ -66,7 +66,7 @@
850 WriteData(fid,'object',obj,'fieldname','isgroundingline','format','Boolean');
851 WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean');
852 WriteData(fid,'object',obj,'fieldname','isdamage','format','Boolean');
853- WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
854+ WriteData(fid,'object',obj,'fieldname','requested_outputs','format','StringArray');
855 end % }}}
856 end
857 end
858Index: ../trunk-jpl/src/m/classes/masstransport.py
859===================================================================
860--- ../trunk-jpl/src/m/classes/masstransport.py (revision 16362)
861+++ ../trunk-jpl/src/m/classes/masstransport.py (revision 16363)
862@@ -20,7 +20,7 @@
863 self.stabilization = 0
864 self.vertex_pairing = float('NaN')
865 self.penalty_factor = 0
866- self.requested_outputs = float('NaN')
867+ self.requested_outputs = []
868
869 #set defaults
870 self.setdefaultparameters()
871@@ -65,7 +65,7 @@
872 md = checkfield(md,'masstransport.stabilization','values',[0,1,2,3])
873 md = checkfield(md,'masstransport.min_thickness','>',0)
874 if not md.masstransport.requested_outputs:
875- md = checkfield(md,'masstransport.requested_outputs','size',[float('NaN'),1])
876+ md = checkfield(md,'masstransport.requested_outputs','size',[1, float('NaN')])
877
878 return md
879 # }}}
880@@ -77,5 +77,5 @@
881 WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
882 WriteData(fid,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3)
883 WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double')
884- WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
885+ WriteData(fid,'object',self,'fieldname','requested_outputs','format','StringArray');
886 # }}}
887Index: ../trunk-jpl/src/m/classes/snowpack.m
888===================================================================
889--- ../trunk-jpl/src/m/classes/snowpack.m (revision 16362)
890+++ ../trunk-jpl/src/m/classes/snowpack.m (revision 16363)
891@@ -470,7 +470,7 @@
892 WriteData(fid,'object',obj,'class','snowpack','fieldname','rift_penalty_lock','format','Integer');
893 WriteData(fid,'object',obj,'class','snowpack','fieldname','rift_penalty_threshold','format','Integer');
894 WriteData(fid,'object',obj,'class','snowpack','fieldname','referential','format','DoubleMat','mattype',1);
895- WriteData(fid,'object',obj,'class','snowpack','fieldname','requested_outputs','format','DoubleMat','mattype',3);
896+ WriteData(fid,'object',obj,'class','snowpack','fieldname','requested_outputs','format','StringArray');
897 WriteData(fid,'data',obj.loadingforce(:,1),'format','DoubleMat','mattype',1,'enum',LoadingforceXEnum);
898 WriteData(fid,'data',obj.loadingforce(:,2),'format','DoubleMat','mattype',1,'enum',LoadingforceYEnum);
899 WriteData(fid,'data',obj.loadingforce(:,3),'format','DoubleMat','mattype',1,'enum',LoadingforceZEnum);
900Index: ../trunk-jpl/src/m/classes/stressbalance.py
901===================================================================
902--- ../trunk-jpl/src/m/classes/stressbalance.py (revision 16362)
903+++ ../trunk-jpl/src/m/classes/stressbalance.py (revision 16363)
904@@ -33,7 +33,7 @@
905 self.rift_penalty_threshold = 0
906 self.referential = float('NaN')
907 self.loadingforce = float('NaN')
908- self.requested_outputs = float('NaN')
909+ self.requested_outputs = []
910
911 #set defaults
912 self.setdefaultparameters()
913@@ -123,7 +123,7 @@
914 md = checkfield(md,'stressbalance.referential','size',[md.mesh.numberofvertices,6])
915 md = checkfield(md,'stressbalance.loadingforce','size',[md.mesh.numberofvertices,3])
916 if not md.stressbalance.requested_outputs:
917- md = checkfield(md,'stressbalance.requested_outputs','size',[float('NaN'),1])
918+ md = checkfield(md,'stressbalance.requested_outputs','size',[1, float('NaN')])
919
920 #singular solution
921 # if ~any((~isnan(md.stressbalance.spcvx)+~isnan(md.stressbalance.spcvy))==2),
922@@ -171,7 +171,7 @@
923 WriteData(fid,'object',self,'class','stressbalance','fieldname','rift_penalty_lock','format','Integer')
924 WriteData(fid,'object',self,'class','stressbalance','fieldname','rift_penalty_threshold','format','Integer')
925 WriteData(fid,'object',self,'class','stressbalance','fieldname','referential','format','DoubleMat','mattype',1)
926- WriteData(fid,'object',self,'class','stressbalance','fieldname','requested_outputs','format','DoubleMat','mattype',3)
927+ WriteData(fid,'object',self,'class','stressbalance','fieldname','requested_outputs','format','StringArray')
928 WriteData(fid,'data',self.loadingforce[:,0],'format','DoubleMat','mattype',1,'enum',LoadingforceXEnum())
929 WriteData(fid,'data',self.loadingforce[:,1],'format','DoubleMat','mattype',1,'enum',LoadingforceYEnum())
930 WriteData(fid,'data',self.loadingforce[:,2],'format','DoubleMat','mattype',1,'enum',LoadingforceZEnum())
931Index: ../trunk-jpl/src/m/classes/steadystate.py
932===================================================================
933--- ../trunk-jpl/src/m/classes/steadystate.py (revision 16362)
934+++ ../trunk-jpl/src/m/classes/steadystate.py (revision 16363)
935@@ -15,7 +15,7 @@
936 def __init__(self): # {{{
937 self.reltol = 0
938 self.maxiter = 0
939- self.requested_outputs = float('NaN')
940+ self.requested_outputs = []
941
942 #set defaults
943 self.setdefaultparameters()
944@@ -55,5 +55,5 @@
945 def marshall(self,md,fid): # {{{
946 WriteData(fid,'object',self,'fieldname','reltol','format','Double')
947 WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
948- WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3)
949+ WriteData(fid,'object',self,'fieldname','requested_outputs','format','StringArray')
950 # }}}
951Index: ../trunk-jpl/src/m/classes/stressbalance.m
952===================================================================
953--- ../trunk-jpl/src/m/classes/stressbalance.m (revision 16362)
954+++ ../trunk-jpl/src/m/classes/stressbalance.m (revision 16363)
955@@ -22,7 +22,7 @@
956 rift_penalty_threshold = 0;
957 referential = NaN;
958 loadingforce = NaN;
959- requested_outputs = NaN;
960+ requested_outputs = {};
961 end
962 methods
963 function obj = stressbalance(varargin) % {{{
964@@ -91,7 +91,7 @@
965 md = checkfield(md,'stressbalance.referential','size',[md.mesh.numberofvertices 6]);
966 md = checkfield(md,'stressbalance.loadingforce','size',[md.mesh.numberofvertices 3]);
967 if ~isempty(md.stressbalance.requested_outputs),
968- md = checkfield(md,'stressbalance.requested_outputs','size',[NaN 1]);
969+ md = checkfield(md,'stressbalance.requested_outputs','size',[1 NaN]);
970 end
971
972 %singular solution
973@@ -171,7 +171,7 @@
974 WriteData(fid,'object',obj,'class','stressbalance','fieldname','rift_penalty_lock','format','Integer');
975 WriteData(fid,'object',obj,'class','stressbalance','fieldname','rift_penalty_threshold','format','Integer');
976 WriteData(fid,'object',obj,'class','stressbalance','fieldname','referential','format','DoubleMat','mattype',1);
977- WriteData(fid,'object',obj,'class','stressbalance','fieldname','requested_outputs','format','DoubleMat','mattype',3);
978+ WriteData(fid,'object',obj,'class','stressbalance','fieldname','requested_outputs','format','StringArray');
979 WriteData(fid,'data',obj.loadingforce(:,1),'format','DoubleMat','mattype',1,'enum',LoadingforceXEnum);
980 WriteData(fid,'data',obj.loadingforce(:,2),'format','DoubleMat','mattype',1,'enum',LoadingforceYEnum);
981 WriteData(fid,'data',obj.loadingforce(:,3),'format','DoubleMat','mattype',1,'enum',LoadingforceZEnum);
982Index: ../trunk-jpl/src/m/classes/masstransport.m
983===================================================================
984--- ../trunk-jpl/src/m/classes/masstransport.m (revision 16362)
985+++ ../trunk-jpl/src/m/classes/masstransport.m (revision 16363)
986@@ -12,7 +12,7 @@
987 stabilization = 0;
988 vertex_pairing = NaN;
989 penalty_factor = 0;
990- requested_outputs = NaN;
991+ requested_outputs = {};
992 end
993 methods (Static)
994 function obj = loadobj(obj) % {{{
995@@ -84,7 +84,7 @@
996 md = checkfield(md,'masstransport.stabilization','values',[0 1 2 3]);
997 md = checkfield(md,'masstransport.min_thickness','>',0);
998 if ~isempty(md.masstransport.requested_outputs),
999- md = checkfield(md,'masstransport.requested_outputs','size',[NaN 1]);
1000+ md = checkfield(md,'masstransport.requested_outputs','size',[1 NaN]);
1001 end
1002
1003 end % }}}
1004@@ -110,7 +110,7 @@
1005 WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');
1006 WriteData(fid,'object',obj,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);
1007 WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double');
1008- WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
1009+ WriteData(fid,'object',obj,'fieldname','requested_outputs','format','StringArray');
1010 end % }}}
1011 end
1012 end
Note: See TracBrowser for help on using the repository browser.