source: issm/oecreview/Archive/12678-13393/ISSM-12807-12808.diff

Last change on this file was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 5.7 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test110.m
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test110.m (revision 12807)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test110.m (revision 12808)
5@@ -3,14 +3,15 @@
6 md=parameterize(md,'../Par/SquareShelfConstrained.par');
7 md=setflowequation(md,'macayeal','all');
8 md.cluster=generic('name',oshostname(),'np',3);
9+md.transient.requested_outputs=IceVolumeEnum();
10
11 md=solve(md,TransientSolutionEnum);
12
13 %Fields and tolerances to track changes
14-field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'};
15-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
16- 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
17- 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
18+field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Volume3'};
19+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
20+ 1e-13,1e-13,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,1e-13,1e-13};
22 field_values={...
23 (md.results.TransientSolution(1).Vx),...
24 (md.results.TransientSolution(1).Vy),...
25@@ -19,6 +20,7 @@
26 (md.results.TransientSolution(1).Bed),...
27 (md.results.TransientSolution(1).Surface),...
28 (md.results.TransientSolution(1).Thickness),...
29+ (md.results.TransientSolution(1).IceVolume),...
30 (md.results.TransientSolution(2).Vx),...
31 (md.results.TransientSolution(2).Vy),...
32 (md.results.TransientSolution(2).Vel),...
33@@ -26,6 +28,7 @@
34 (md.results.TransientSolution(2).Bed),...
35 (md.results.TransientSolution(2).Surface),...
36 (md.results.TransientSolution(2).Thickness),...
37+ (md.results.TransientSolution(2).IceVolume),...
38 (md.results.TransientSolution(3).Vx),...
39 (md.results.TransientSolution(3).Vy),...
40 (md.results.TransientSolution(3).Vel),...
41@@ -33,4 +36,5 @@
42 (md.results.TransientSolution(3).Bed),...
43 (md.results.TransientSolution(3).Surface),...
44 (md.results.TransientSolution(3).Thickness),...
45+ (md.results.TransientSolution(3).IceVolume),...
46 };
47Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test111.m
48===================================================================
49--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test111.m (revision 12807)
50+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test111.m (revision 12808)
51@@ -4,17 +4,18 @@
52 md=extrude(md,3,1);
53 md=setflowequation(md,'pattyn','all');
54 md.cluster=generic('name',oshostname(),'np',3);
55+md.transient.requested_outputs=IceVolumeEnum();
56 md=solve(md,TransientSolutionEnum);
57
58 %Fields and tolerances to track changes
59 field_names={...
60- 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
61- 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
62- 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
63+ 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsMeltingRate1','Volume1', ...
64+ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2','Volume2', ...
65+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3','Volume3'};
66 field_tolerances={...
67- 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,...
68- 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,...
69- 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05};
70+ 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,...
71+ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,...
72+ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13};
73 field_values={...
74 (md.results.TransientSolution(1).Vx),...
75 (md.results.TransientSolution(1).Vy),...
76@@ -26,6 +27,7 @@
77 (md.results.TransientSolution(1).Thickness),...
78 (md.results.TransientSolution(1).Temperature),...
79 (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
80+ (md.results.TransientSolution(1).IceVolume),...
81 (md.results.TransientSolution(2).Vx),...
82 (md.results.TransientSolution(2).Vy),...
83 (md.results.TransientSolution(2).Vz),...
84@@ -36,6 +38,7 @@
85 (md.results.TransientSolution(2).Thickness),...
86 (md.results.TransientSolution(2).Temperature),...
87 (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
88+ (md.results.TransientSolution(2).IceVolume),...
89 (md.results.TransientSolution(3).Vx),...
90 (md.results.TransientSolution(3).Vy),...
91 (md.results.TransientSolution(3).Vz),...
92@@ -46,4 +49,5 @@
93 (md.results.TransientSolution(3).Thickness),...
94 (md.results.TransientSolution(3).Temperature),...
95 (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
96+ (md.results.TransientSolution(3).IceVolume),...
97 };
98Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive110.mat
99===================================================================
100Cannot display: file marked as a binary type.
101svn:mime-type = application/octet-stream
102Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive111.mat
103===================================================================
104Cannot display: file marked as a binary type.
105svn:mime-type = application/octet-stream
Note: See TracBrowser for help on using the repository browser.