source: issm/oecreview/Archive/16133-16554/ISSM-16471-16472.diff@ 16556

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

NEW: added Archive/16133-16554
File size: 5.0 KB
RevLine 
[16556]1Index: ../trunk-jpl/test/NightlyRun/test325.py
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test325.py (revision 16471)
4+++ ../trunk-jpl/test/NightlyRun/test325.py (revision 16472)
5@@ -14,16 +14,19 @@
6 md.extrude(3,1.)
7 md=setflowequation(md,'SSA','all')
8 md.timestepping.time_step=0.
9-md.cluster=generic('name',oshostname(),'np',3)
10 md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1))
11 md.initialization.watercolumn=numpy.zeros((md.mesh.numberofvertices,1))
12-md=solve(md,EnthalpySolutionEnum())
13+md.thermal.isenthalpy = 1
14+md.thermal.isdynamicbasalspc = 1
15
16+md.cluster=generic('name',oshostname(),'np',3)
17+md=solve(md,ThermalSolutionEnum())
18+
19 #Fields and tolerances to track changes
20 field_names =['Enthalpy','Waterfraction','Temperature']
21 field_tolerances=[1e-13,1e-13,1e-13]
22 field_values=[\
23- md.results.EnthalpySolution.Enthalpy,\
24- md.results.EnthalpySolution.Waterfraction,\
25- md.results.EnthalpySolution.Temperature,\
26+ md.results.ThermalSolution.Enthalpy,\
27+ md.results.ThermalSolution.Waterfraction,\
28+ md.results.ThermalSolution.Temperature,\
29 ]
30Index: ../trunk-jpl/test/NightlyRun/test120.m
31===================================================================
32--- ../trunk-jpl/test/NightlyRun/test120.m (revision 16471)
33+++ ../trunk-jpl/test/NightlyRun/test120.m (revision 16472)
34@@ -4,16 +4,19 @@
35 md=extrude(md,3,1.);
36 md=setflowequation(md,'SSA','all');
37 md.timestepping.time_step=0;
38-md.cluster=generic('name',oshostname(),'np',3);
39 md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
40 md.initialization.watercolumn=zeros(md.mesh.numberofvertices,1);
41-md=solve(md,EnthalpySolutionEnum());
42+md.thermal.isenthalpy = 1;
43+md.thermal.isdynamicbasalspc = 1;
44
45+md.cluster=generic('name',oshostname(),'np',3);
46+md=solve(md,ThermalSolutionEnum());
47+
48 %Fields and tolerances to track changes
49 field_names ={'Enthalpy','Waterfraction','Temperature'};
50 field_tolerances={1e-13,1.45e-10,1e-13};
51 field_values={...
52- (md.results.EnthalpySolution.Enthalpy),...
53- (md.results.EnthalpySolution.Waterfraction),...
54- (md.results.EnthalpySolution.Temperature),...
55+ (md.results.ThermalSolution.Enthalpy),...
56+ (md.results.ThermalSolution.Waterfraction),...
57+ (md.results.ThermalSolution.Temperature),...
58 };
59Index: ../trunk-jpl/test/NightlyRun/test325.m
60===================================================================
61--- ../trunk-jpl/test/NightlyRun/test325.m (revision 16471)
62+++ ../trunk-jpl/test/NightlyRun/test325.m (revision 16472)
63@@ -4,16 +4,19 @@
64 md=extrude(md,3,1.);
65 md=setflowequation(md,'SSA','all');
66 md.timestepping.time_step=0.;
67-md.cluster=generic('name',oshostname(),'np',3);
68 md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
69 md.initialization.watercolumn=zeros(md.mesh.numberofvertices,1);
70-md=solve(md,EnthalpySolutionEnum());
71+md.thermal.isenthalpy = 1;
72+md.thermal.isdynamicbasalspc = 1;
73
74+md.cluster=generic('name',oshostname(),'np',3);
75+md=solve(md,ThermalSolutionEnum());
76+
77 %Fields and tolerances to track changes
78 field_names ={'Enthalpy','Waterfraction','Temperature'};
79 field_tolerances={1e-13,1e-13,1e-13};
80 field_values={...
81- (md.results.EnthalpySolution.Enthalpy),...
82- (md.results.EnthalpySolution.Waterfraction),...
83- (md.results.EnthalpySolution.Temperature),...
84+ (md.results.ThermalSolution.Enthalpy),...
85+ (md.results.ThermalSolution.Waterfraction),...
86+ (md.results.ThermalSolution.Temperature),...
87 };
88Index: ../trunk-jpl/test/NightlyRun/test411.py
89===================================================================
90--- ../trunk-jpl/test/NightlyRun/test411.py (revision 16471)
91+++ ../trunk-jpl/test/NightlyRun/test411.py (revision 16472)
92@@ -14,7 +14,7 @@
93 md.extrude(3,2.)
94 md=setflowequation(md,'HO','all')
95 md.cluster=generic('name',oshostname(),'np',3)
96-md.timestepping.time_step=0
97+md.timestepping.time_step=0.
98 md=solve(md,SteadystateSolutionEnum())
99
100 #Fields and tolerances to track changes
101Index: ../trunk-jpl/test/NightlyRun/test120.py
102===================================================================
103--- ../trunk-jpl/test/NightlyRun/test120.py (revision 16471)
104+++ ../trunk-jpl/test/NightlyRun/test120.py (revision 16472)
105@@ -14,16 +14,19 @@
106 md.extrude(3,1.)
107 md=setflowequation(md,'SSA','all')
108 md.timestepping.time_step=0
109-md.cluster=generic('name',oshostname(),'np',3)
110 md.initialization.waterfraction=numpy.zeros(md.mesh.numberofvertices)
111 md.initialization.watercolumn=numpy.zeros(md.mesh.numberofvertices)
112-md=solve(md,EnthalpySolutionEnum())
113+md.thermal.isenthalpy = 1;
114+md.thermal.isdynamicbasalspc = 1;
115
116+md.cluster=generic('name',oshostname(),'np',3)
117+md=solve(md,ThermalSolutionEnum())
118+
119 #Fields and tolerances to track changes
120 field_names =['Enthalpy','Waterfraction','Temperature']
121 field_tolerances=[1e-13,1.45e-10,1e-13]
122 field_values=[\
123- md.results.EnthalpySolution.Enthalpy,\
124- md.results.EnthalpySolution.Waterfraction,\
125- md.results.EnthalpySolution.Temperature,\
126+ md.results.ThermalSolution.Enthalpy,\
127+ md.results.ThermalSolution.Waterfraction,\
128+ md.results.ThermalSolution.Temperature,\
129 ]
Note: See TracBrowser for help on using the repository browser.