source: issm/oecreview/Archive/21724-22754/ISSM-21824-21825.diff

Last change on this file was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 3.8 KB
RevLine 
[22755]1Index: ../trunk-jpl/test/NightlyRun/test426.py
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test426.py (revision 21824)
4+++ ../trunk-jpl/test/NightlyRun/test426.py (revision 21825)
5@@ -17,40 +17,43 @@
6 md.geometry.thickness[:]=1000.
7 md.geometry.surface=md.geometry.base+md.geometry.thickness
8 md.smb.mass_balance[:]=100.
9-md.extrude(3,1.)
10 md=setflowequation(md,'SSA','all')
11 md.transient.isstressbalance=False
12 md.transient.isgroundingline=True
13 md.groundingline.migration='AggressiveMigration'
14-md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation']
15+md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation','IceMass']
16+md.extrude(3,1.)
17 md.cluster=generic('name',gethostname(),'np',3)
18
19 md=solve(md,'Transient')
20
21 #Fields and tolerances to track changes
22-field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1',
23- 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2',
24- 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3',]
25+field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceMass1',
26+ 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceMass2',
27+ 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceMass3']
28
29-field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,
30- 1e-11,1e-10,1e-11,3e-11,2e-12,5e-12,
31- 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12]
32+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,
33+ 1e-11,1e-10,1e-11,3e-11,2e-12,5e-12,2e-12,
34+ 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12,2e-12]
35
36 field_values=[md.results.TransientSolution[0].Base,
37- md.results.TransientSolution[0].Surface,
38- md.results.TransientSolution[0].Thickness,
39- md.results.TransientSolution[0].MaskGroundediceLevelset,
40- md.results.TransientSolution[0].IceVolume,
41- md.results.TransientSolution[0].IceVolumeAboveFloatation,
42- md.results.TransientSolution[1].Base,
43- md.results.TransientSolution[1].Surface,
44- md.results.TransientSolution[1].Thickness,
45- md.results.TransientSolution[1].MaskGroundediceLevelset,
46- md.results.TransientSolution[1].IceVolume,
47- md.results.TransientSolution[1].IceVolumeAboveFloatation,
48- md.results.TransientSolution[2].Base,
49- md.results.TransientSolution[2].Surface,
50- md.results.TransientSolution[2].Thickness,
51- md.results.TransientSolution[2].MaskGroundediceLevelset,
52- md.results.TransientSolution[2].IceVolume,
53- md.results.TransientSolution[2].IceVolumeAboveFloatation]
54+ md.results.TransientSolution[0].Surface,
55+ md.results.TransientSolution[0].Thickness,
56+ md.results.TransientSolution[0].MaskGroundediceLevelset,
57+ md.results.TransientSolution[0].IceVolume,
58+ md.results.TransientSolution[0].IceVolumeAboveFloatation,
59+ md.results.TransientSolution[0].IceMass,
60+ md.results.TransientSolution[1].Base,
61+ md.results.TransientSolution[1].Surface,
62+ md.results.TransientSolution[1].Thickness,
63+ md.results.TransientSolution[1].MaskGroundediceLevelset,
64+ md.results.TransientSolution[1].IceVolume,
65+ md.results.TransientSolution[1].IceVolumeAboveFloatation,
66+ md.results.TransientSolution[1].IceMass,
67+ md.results.TransientSolution[2].Base,
68+ md.results.TransientSolution[2].Surface,
69+ md.results.TransientSolution[2].Thickness,
70+ md.results.TransientSolution[2].MaskGroundediceLevelset,
71+ md.results.TransientSolution[2].IceVolume,
72+ md.results.TransientSolution[2].IceVolumeAboveFloatation,
73+ md.results.TransientSolution[2].IceMass]
Note: See TracBrowser for help on using the repository browser.