source: issm/oecreview/Archive/12678-13393/ISSM-12780-12781.diff@ 14312

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

Added 12678-13393
File size: 5.3 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m (revision 12780)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m (revision 12781)
5@@ -11,14 +11,15 @@
6 md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y;
7 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
8 md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos);
9+md.transient.requested_outputs=TotalSmbEnum();
10 md.cluster=generic('name',oshostname(),'np',3);
11 md=solve(md,TransientSolutionEnum);
12
13 %Fields and tolerances to track changes
14-field_names ={'Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3'};
15-field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
16- 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,...
17- 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
18+field_names ={'Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb1','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb1'};
19+field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
20+ 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
21+ 1e-09,5e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
22
23 field_values={...
24 (md.results.TransientSolution(1).Vx),...
25@@ -30,6 +31,7 @@
26 (md.results.TransientSolution(1).Thickness),...
27 (md.results.TransientSolution(1).Temperature),...
28 (md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
29+ (md.results.TransientSolution(1).TotalSmb),...
30 (md.results.TransientSolution(2).Vx),...
31 (md.results.TransientSolution(2).Vy),...
32 (md.results.TransientSolution(2).Vz),...
33@@ -39,6 +41,7 @@
34 (md.results.TransientSolution(2).Thickness),...
35 (md.results.TransientSolution(2).Temperature),...
36 (md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
37+ (md.results.TransientSolution(2).TotalSmb),...
38 (md.results.TransientSolution(3).Vx),...
39 (md.results.TransientSolution(3).Vy),...
40 (md.results.TransientSolution(3).Vz),...
41@@ -48,4 +51,5 @@
42 (md.results.TransientSolution(3).Thickness),...
43 (md.results.TransientSolution(3).Temperature),...
44 (md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
45+ (md.results.TransientSolution(3).TotalSmb),...
46 };
47Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m
48===================================================================
49--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 12780)
50+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 12781)
51@@ -10,12 +10,13 @@
52 md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y;
53 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
54 md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos);
55+md.transient.requested_outputs=TotalSmbEnum();
56 md.cluster=generic('name',oshostname(),'np',3);
57 md=solve(md,TransientSolutionEnum);
58
59 %Fields and tolerances to track changes
60-field_names ={'Vx1','Vy1','Vel1','Bed1','Surface1','Thickness1','SMB1','Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3'};
61-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
62+field_names ={'Vx1','Vy1','Vel1','Bed1','Surface1','Thickness1','SMB1','TotalSmb1','Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','TotalSmb2','Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3','TotalSmb3'};
63+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
64 field_values={...
65 (md.results.TransientSolution(1).Vx),...
66 (md.results.TransientSolution(1).Vy),...
67@@ -24,12 +25,14 @@
68 (md.results.TransientSolution(1).Surface),...
69 (md.results.TransientSolution(1).Thickness),...
70 (md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
71+ (md.results.TransientSolution(1).TotalSmb),...
72 (md.results.TransientSolution(2).Vx),...
73 (md.results.TransientSolution(2).Vy),...
74 (md.results.TransientSolution(2).Vel),...
75 (md.results.TransientSolution(2).Bed),...
76 (md.results.TransientSolution(2).Surface),...
77 (md.results.TransientSolution(2).Thickness),...
78+ (md.results.TransientSolution(2).TotalSmb),...
79 (md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
80 (md.results.TransientSolution(3).Vx),...
81 (md.results.TransientSolution(3).Vy),...
82@@ -38,4 +41,5 @@
83 (md.results.TransientSolution(3).Surface),...
84 (md.results.TransientSolution(3).Thickness),...
85 (md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
86+ (md.results.TransientSolution(3).TotalSmb),...
87 };
Note: See TracBrowser for help on using the repository browser.