source: issm/oecreview/Archive/13393-13976/ISSM-13661-13662.diff

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

preparing oecreview for 13393-13976'
File size: 9.9 KB
RevLine 
[13980]1Index: ../trunk-jpl/test/NightlyRun/test512.py
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test512.py (revision 0)
4+++ ../trunk-jpl/test/NightlyRun/test512.py (revision 13662)
5@@ -0,0 +1,46 @@
6+import numpy
7+from model import *
8+from triangle import *
9+from setmask import *
10+from parameterize import *
11+from setflowequation import *
12+from EnumDefinitions import *
13+from solve import *
14+from MatlabFuncs import *
15+
16+md=triangle(model(),'../Exp/Pig.exp',20000.)
17+md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
18+md=parameterize(md,'../Par/Pig.py')
19+md.extrude(3,1.)
20+md=setflowequation(md,'pattyn','all')
21+
22+# control parameters
23+md.inversion.iscontrol=1
24+md.inversion.control_parameters=['FrictionCoefficient']
25+md.inversion.min_parameters=1.*numpy.ones((md.mesh.numberofvertices,1))
26+md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
27+md.inversion.nsteps=2
28+md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
29+md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
30+md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
31+md.inversion.gradient_scaling=3.*numpy.ones((md.inversion.nsteps,1))
32+md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1))
33+md.inversion.step_threshold=2.99*numpy.ones((md.inversion.nsteps,1))
34+md.inversion.vx_obs=md.initialization.vx
35+md.inversion.vy_obs=md.initialization.vy
36+
37+md.cluster=generic('name',oshostname(),'np',3)
38+md=solve(md,DiagnosticSolutionEnum())
39+
40+# Fields and tolerances to track changes
41+field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy']
42+field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11]
43+field_values=[\
44+ md.results['DiagnosticSolution'][1]['Gradient1'],\
45+ md.results['DiagnosticSolution'][1]['J'],\
46+ md.results['DiagnosticSolution'][1]['FrictionCoefficient'],\
47+ md.results['DiagnosticSolution'][1]['Pressure'],\
48+ md.results['DiagnosticSolution'][1]['Vel'],\
49+ md.results['DiagnosticSolution'][1]['Vx'],\
50+ md.results['DiagnosticSolution'][1]['Vy']
51+]
52Index: ../trunk-jpl/test/NightlyRun/test510.m
53===================================================================
54--- ../trunk-jpl/test/NightlyRun/test510.m (revision 13661)
55+++ ../trunk-jpl/test/NightlyRun/test510.m (revision 13662)
56@@ -9,8 +9,7 @@
57
58 %Fields and tolerances to track changes
59 field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
60-field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06
61-};
62+field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06};
63 field_values={...
64 (md.results.SteadystateSolution.Vx),...
65 (md.results.SteadystateSolution.Vy),...
66Index: ../trunk-jpl/test/NightlyRun/test513.py
67===================================================================
68--- ../trunk-jpl/test/NightlyRun/test513.py (revision 0)
69+++ ../trunk-jpl/test/NightlyRun/test513.py (revision 13662)
70@@ -0,0 +1,50 @@
71+from model import *
72+from triangle import *
73+from setmask import *
74+from parameterize import *
75+from setflowequation import *
76+from EnumDefinitions import *
77+from solve import *
78+from MatlabFuncs import *
79+
80+md=triangle(model(),'../Exp/Pig.exp',30000.)
81+md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
82+md=parameterize(md,'../Par/Pig.py')
83+md.extrude(3,1)
84+md=setflowequation(md,'macayeal','all')
85+
86+# control parameters
87+md.inversion.iscontrol=1
88+md.inversion.control_parameters=['FrictionCoefficient']
89+md.inversion.min_parameters=1.*numpy.ones((md.mesh.numberofvertices,1))
90+md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
91+md.inversion.nsteps=2
92+md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
93+md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
94+md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
95+md.inversion.gradient_scaling=3.*numpy.ones((md.inversion.nsteps,1))
96+md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1))
97+md.inversion.step_threshold=0.99*numpy.ones((md.inversion.nsteps,1))
98+md.inversion.vx_obs=md.initialization.vx
99+md.inversion.vy_obs=md.initialization.vy
100+md.timestepping.time_step=0
101+
102+md.thermal.penalty_lock=5
103+md.cluster=generic('name',oshostname(),'np',3)
104+md=solve(md,SteadystateSolutionEnum())
105+
106+# Fields and tolerances to track changes
107+field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate']
108+field_tolerances=[1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06]
109+field_values=[\
110+ md.results['SteadystateSolution'][1]['Gradient1'],\
111+ md.results['SteadystateSolution'][1]['J'],\
112+ md.results['SteadystateSolution'][1]['FrictionCoefficient'],\
113+ md.results['SteadystateSolution'][1]['Pressure'],\
114+ md.results['SteadystateSolution'][1]['Vel'],\
115+ md.results['SteadystateSolution'][1]['Vx'],\
116+ md.results['SteadystateSolution'][1]['Vy'],\
117+ md.results['SteadystateSolution'][1]['Vz'],\
118+ md.results['SteadystateSolution'][1]['Temperature'],\
119+ md.results['SteadystateSolution'][1]['BasalforcingsMeltingRate']
120+]
121Index: ../trunk-jpl/test/NightlyRun/test512.m
122===================================================================
123--- ../trunk-jpl/test/NightlyRun/test512.m (revision 13661)
124+++ ../trunk-jpl/test/NightlyRun/test512.m (revision 13662)
125@@ -21,7 +21,7 @@
126 md=solve(md,DiagnosticSolutionEnum);
127
128 %Fields and tolerances to track changes
129-field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'};
130+field_names ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'};
131 field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11};
132 field_values={...
133 (md.results.DiagnosticSolution.Gradient1),...
134Index: ../trunk-jpl/test/NightlyRun/test513.m
135===================================================================
136--- ../trunk-jpl/test/NightlyRun/test513.m (revision 13661)
137+++ ../trunk-jpl/test/NightlyRun/test513.m (revision 13662)
138@@ -23,7 +23,7 @@
139 md=solve(md,SteadystateSolutionEnum);
140
141 %Fields and tolerances to track changes
142-field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'};
143+field_names ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'};
144 field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06};
145 field_values={...
146 (md.results.SteadystateSolution.Gradient1),...
147Index: ../trunk-jpl/test/NightlyRun/test515.py
148===================================================================
149--- ../trunk-jpl/test/NightlyRun/test515.py (revision 0)
150+++ ../trunk-jpl/test/NightlyRun/test515.py (revision 13662)
151@@ -0,0 +1,32 @@
152+from model import *
153+from triangle import *
154+from setmask import *
155+from parameterize import *
156+from setflowequation import *
157+from EnumDefinitions import *
158+from solve import *
159+from MatlabFuncs import *
160+
161+md=triangle(model(),'../Exp/Pig.exp',30000)
162+md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
163+md=parameterize(md,'../Par/Pig.py')
164+md.extrude(3,1)
165+md=setflowequation(md,'pattyn','all')
166+md.thermal.stabilization=2
167+md.cluster=generic('name',oshostname(),'np',3)
168+md.transient.isdiagnostic=0
169+md.transient.isprognostic=0
170+md.transient.isthermal=1
171+md.transient.isgroundingline=0
172+md=solve(md,TransientSolutionEnum())
173+
174+# Fields and tolerances to track changes
175+field_names =['Temperature1','BasalforcingsMeltingRate1', \
176+ 'Temperature2','BasalforcingsMeltingRate2']
177+field_tolerances=[1e-13,1e-8,1e-13,1e-8]
178+field_values=[\
179+ md.results['TransientSolution'][1]['Temperature'],\
180+ md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\
181+ md.results['TransientSolution'][2]['Temperature'],\
182+ md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\
183+ ]
184Index: ../trunk-jpl/test/NightlyRun/test510.py
185===================================================================
186--- ../trunk-jpl/test/NightlyRun/test510.py (revision 0)
187+++ ../trunk-jpl/test/NightlyRun/test510.py (revision 13662)
188@@ -0,0 +1,30 @@
189+from model import *
190+from triangle import *
191+from setmask import *
192+from parameterize import *
193+from setflowequation import *
194+from EnumDefinitions import *
195+from solve import *
196+from MatlabFuncs import *
197+
198+md=triangle(model(),'../Exp/Pig.exp',20000)
199+md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
200+md=parameterize(md,'../Par/Pig.py')
201+md.extrude(2,1)
202+md=setflowequation(md,'stokes','all')
203+md.cluster=generic('name',oshostname(),'np',3)
204+md.timestepping.time_step=0
205+md=solve(md,SteadystateSolutionEnum())
206+
207+# Fields and tolerances to track changes
208+field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate']
209+field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06]
210+field_values=[\
211+ md.results['SteadystateSolution'][1]['Vx'],\
212+ md.results['SteadystateSolution'][1]['Vy'],\
213+ md.results['SteadystateSolution'][1]['Vz'],\
214+ md.results['SteadystateSolution'][1]['Vel'],\
215+ md.results['SteadystateSolution'][1]['Pressure'],\
216+ md.results['SteadystateSolution'][1]['Temperature'],\
217+ md.results['SteadystateSolution'][1]['BasalforcingsMeltingRate'],\
218+ ]
219Index: ../trunk-jpl/test/NightlyRun/test514.m
220===================================================================
221--- ../trunk-jpl/test/NightlyRun/test514.m (revision 13661)
222+++ ../trunk-jpl/test/NightlyRun/test514.m (revision 13662)
223@@ -43,8 +43,8 @@
224 y7=md2.mesh.y;
225
226 %Fields and tolerances to track changes
227-field_names ={'x1' 'y1' 'x2' 'y2' 'x3' 'y3' 'x4' 'y4' 'x5' 'y5' 'x6' 'y6' 'x7' 'y7' };
228-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};
229+field_names ={'x1y1x2y2x3y3x4y4x5y5x6y6' 'x7y7' };
230+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};
231 field_values={...
232 x1, y1,...
233 y2, y2,...
Note: See TracBrowser for help on using the repository browser.