source: issm/oecreview/Archive/23390-24306/ISSM-24241-24242.diff@ 24307

Last change on this file since 24307 was 24307, checked in by Mathieu Morlighem, 5 years ago

NEW: adding Archive/23390-24306
File size: 7.8 KB
RevLine 
[24307]1Index: ../trunk-jpl/test/NightlyRun/test334.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test334.m (revision 24241)
4+++ ../trunk-jpl/test/NightlyRun/test334.m (revision 24242)
5@@ -31,4 +31,4 @@
6 %analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity))
7 field_names ={'SedimentWaterHead','SedimentHeadResidual'};
8 field_tolerances={1e-13, 3e-10};
9-field_values={md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual};
10+field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual};
11Index: ../trunk-jpl/test/NightlyRun/test335.m
12===================================================================
13--- ../trunk-jpl/test/NightlyRun/test335.m (revision 24241)
14+++ ../trunk-jpl/test/NightlyRun/test335.m (revision 24242)
15@@ -11,6 +11,7 @@
16 md.hydrology=initialize(md.hydrology,md);
17 md.hydrology.isefficientlayer=1;
18 md.hydrology.sedimentlimit_flag=1;
19+md.hydrology.transfer_flag = 0;
20 md.hydrology.sedimentlimit=800.0;
21 md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
22 md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1);
23@@ -51,22 +52,22 @@
24
25 %Fields and tolerances to track changes
26 field_names ={'SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1',...
27- 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',...
28- 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',...
29- 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9'};
30+ 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',...
31+ 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',...
32+ 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9'};
33 field_tolerances={1e-13, 1e-13, 1e-13,...
34- 1e-13, 1e-13, 1e-13,...
35- 1e-13, 5e-12, 2e-11,...
36- 1e-13, 5e-12, 2e-11};
37-field_values={md.results.TransientSolution(1).SedimentHeadHydrostep, ...
38- md.results.TransientSolution(1).EplHeadHydrostep,...
39- md.results.TransientSolution(1).SedimentHeadResidual,...
40- md.results.TransientSolution(4).SedimentHeadHydrostep,...
41- md.results.TransientSolution(4).EplHeadHydrostep,...
42- md.results.TransientSolution(4).SedimentHeadResidual, ...
43- md.results.TransientSolution(5).SedimentHeadHydrostep,...
44- md.results.TransientSolution(5).EplHeadHydrostep,...
45- md.results.TransientSolution(5).SedimentHeadResidual, ...
46- md.results.TransientSolution(9).SedimentHeadHydrostep,...
47- md.results.TransientSolution(9).EplHeadHydrostep,...
48- md.results.TransientSolution(9).SedimentHeadResidual};
49+ 1e-13, 1e-13, 1e-13,...
50+ 1e-13, 5e-12, 2e-11,...
51+ 1e-13, 5e-12, 2e-11};
52+field_values={md.results.TransientSolution(1).SedimentHead, ...
53+ md.results.TransientSolution(1).EplHead,...
54+ md.results.TransientSolution(1).SedimentHeadResidual,...
55+ md.results.TransientSolution(4).SedimentHead,...
56+ md.results.TransientSolution(4).EplHead,...
57+ md.results.TransientSolution(4).SedimentHeadResidual, ...
58+ md.results.TransientSolution(5).SedimentHead,...
59+ md.results.TransientSolution(5).EplHead,...
60+ md.results.TransientSolution(5).SedimentHeadResidual, ...
61+ md.results.TransientSolution(9).SedimentHead,...
62+ md.results.TransientSolution(9).EplHead,...
63+ md.results.TransientSolution(9).SedimentHeadResidual};
64Index: ../trunk-jpl/test/NightlyRun/test330.m
65===================================================================
66--- ../trunk-jpl/test/NightlyRun/test330.m (revision 24241)
67+++ ../trunk-jpl/test/NightlyRun/test330.m (revision 24242)
68@@ -41,8 +41,8 @@
69 %fields to track, results can also be found in
70 %Wang 2009 Fig 6b (jouranl of Hydrology)
71 field_names={'SedimentWaterHead1',...
72- 'SedimentWaterHead2'};
73+ 'SedimentWaterHead2'};
74 field_tolerances={1e-13,...
75- 1e-13};
76-field_values={md.results.TransientSolution(11).SedimentHeadHydrostep,...
77- md.results.TransientSolution(31).SedimentHeadHydrostep};
78+ 1e-13};
79+field_values={md.results.TransientSolution(11).SedimentHead,...
80+ md.results.TransientSolution(31).SedimentHead};
81Index: ../trunk-jpl/test/NightlyRun/test332.m
82===================================================================
83--- ../trunk-jpl/test/NightlyRun/test332.m (revision 24241)
84+++ ../trunk-jpl/test/NightlyRun/test332.m (revision 24242)
85@@ -29,4 +29,4 @@
86 %analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity))
87 field_names ={'SedimentWaterHead','SedimentHeadResidual'};
88 field_tolerances={1e-13, 3e-10};
89-field_values={md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual};
90+field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual};
91Index: ../trunk-jpl/test/NightlyRun/test333.m
92===================================================================
93--- ../trunk-jpl/test/NightlyRun/test333.m (revision 24241)
94+++ ../trunk-jpl/test/NightlyRun/test333.m (revision 24242)
95@@ -12,6 +12,7 @@
96 md.hydrology.isefficientlayer=1;
97 md.hydrology.sedimentlimit_flag=1;
98 md.hydrology.sedimentlimit=800.0;
99+md.hydrology.transfer_flag = 0
100 md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
101 md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1);
102 md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
103@@ -53,23 +54,25 @@
104 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',...
105 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',...
106 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9',...
107- 'EplWaterHead10'};
108+ 'EplWaterHead10', 'EplWaterHeadSubstep10', 'SedimentWaterHead10',...
109+ 'SedimentWaterHeadSubstep10'};
110 field_tolerances={...
111- 1e-13, 1e-13, 1e-13,...
112- 1e-13, 1e-13, 1e-13,...
113- 1e-13, 5e-12, 1e-11,...
114- 1e-13, 5e-12, 1e-11,...
115- 1e-13};
116+ 1e-13, 1e-13, 1e-13,...
117+ 1e-13, 1e-13, 1e-13,...
118+ 1e-13, 5e-12, 1e-11,...
119+ 1e-13, 5e-12, 1e-11,...
120+ 1e-13, 1e-13, 1e-13,...
121+ 1e-13};
122 field_values={mdfine.results.TransientSolution(1).SedimentHeadHydrostep, ...
123- mdfine.results.TransientSolution(1).EplHeadHydrostep,...
124- mdfine.results.TransientSolution(1).SedimentHeadResidual,...
125- mdfine.results.TransientSolution(4).SedimentHeadHydrostep,...
126- mdfine.results.TransientSolution(4).EplHeadHydrostep,...
127- mdfine.results.TransientSolution(4).SedimentHeadResidual, ...
128- mdfine.results.TransientSolution(5).SedimentHeadHydrostep,...
129- mdfine.results.TransientSolution(5).EplHeadHydrostep,...
130- mdfine.results.TransientSolution(5).SedimentHeadResidual, ...
131- mdfine.results.TransientSolution(9).SedimentHeadHydrostep,...
132- mdfine.results.TransientSolution(9).EplHeadHydrostep,...
133- mdfine.results.TransientSolution(9).SedimentHeadResidual,...
134+ mdfine.results.TransientSolution(1).EplHeadHydrostep,...
135+ mdfine.results.TransientSolution(1).SedimentHeadResidual,...
136+ mdfine.results.TransientSolution(4).SedimentHeadHydrostep,...
137+ mdfine.results.TransientSolution(4).EplHeadHydrostep,...
138+ mdfine.results.TransientSolution(4).SedimentHeadResidual, ...
139+ mdfine.results.TransientSolution(5).SedimentHeadHydrostep,...
140+ mdfine.results.TransientSolution(5).EplHeadHydrostep,...
141+ mdfine.results.TransientSolution(5).SedimentHeadResidual, ...
142+ mdfine.results.TransientSolution(9).SedimentHeadHydrostep,...
143+ mdfine.results.TransientSolution(9).EplHeadHydrostep,...
144+ mdfine.results.TransientSolution(9).SedimentHeadResidual,...
145 md.results.TransientSolution(1).EplHead};
Note: See TracBrowser for help on using the repository browser.