source: issm/oecreview/Archive/16133-16554/ISSM-16307-16308.diff@ 16556

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

NEW: added Archive/16133-16554
File size: 6.6 KB
RevLine 
[16556]1Index: ../trunk-jpl/test/NightlyRun/test511.py
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test511.py (revision 16307)
4+++ ../trunk-jpl/test/NightlyRun/test511.py (revision 16308)
5@@ -25,7 +25,7 @@
6 md.inversion.min_parameters=10.**6*numpy.ones((md.mesh.numberofvertices,1))
7 md.inversion.max_parameters=2.*10**9*numpy.ones((md.mesh.numberofvertices,1))
8 md.inversion.nsteps=2
9-md.inversion.cost_functions=101
10+md.inversion.cost_functions=[101]
11 md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
12 md.inversion.gradient_scaling=10.**8*numpy.ones((md.inversion.nsteps,1))
13 md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1))
14Index: ../trunk-jpl/test/NightlyRun/test212.py
15===================================================================
16--- ../trunk-jpl/test/NightlyRun/test212.py (revision 16307)
17+++ ../trunk-jpl/test/NightlyRun/test212.py (revision 16308)
18@@ -21,7 +21,7 @@
19 md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
20 md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
21 md.inversion.nsteps=2
22-md.inversion.cost_functions=101
23+md.inversion.cost_functions=[101]
24 md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
25 md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
26 md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
27Index: ../trunk-jpl/test/NightlyRun/test611.py
28===================================================================
29--- ../trunk-jpl/test/NightlyRun/test611.py (revision 16307)
30+++ ../trunk-jpl/test/NightlyRun/test611.py (revision 16308)
31@@ -21,7 +21,7 @@
32 md.inversion.thickness_obs=md.geometry.thickness
33 md.inversion.min_parameters=-50.*numpy.ones((md.mesh.numberofvertices,1))
34 md.inversion.max_parameters=50.*numpy.ones((md.mesh.numberofvertices,1))
35-md.inversion.cost_functions=201
36+md.inversion.cost_functions=[201]
37 md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
38 md.inversion.gradient_scaling=10./md.constants.yts*numpy.ones((md.inversion.nsteps,1))
39 md.inversion.maxiter_per_step=4*numpy.ones((md.inversion.nsteps,1))
40Index: ../trunk-jpl/test/NightlyRun/test213.py
41===================================================================
42--- ../trunk-jpl/test/NightlyRun/test213.py (revision 16307)
43+++ ../trunk-jpl/test/NightlyRun/test213.py (revision 16308)
44@@ -22,7 +22,7 @@
45 md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
46 md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
47 md.inversion.nsteps=2
48-md.inversion.cost_functions=101.
49+md.inversion.cost_functions=[101]
50 md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
51 md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
52 md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
53Index: ../trunk-jpl/test/NightlyRun/test612.py
54===================================================================
55--- ../trunk-jpl/test/NightlyRun/test612.py (revision 16307)
56+++ ../trunk-jpl/test/NightlyRun/test612.py (revision 16308)
57@@ -23,7 +23,7 @@
58 md.inversion.thickness_obs=md.geometry.thickness
59 md.inversion.min_parameters=-50.*numpy.ones((md.mesh.numberofvertices,1))
60 md.inversion.max_parameters=50.*numpy.ones((md.mesh.numberofvertices,1))
61-md.inversion.cost_functions=201
62+md.inversion.cost_functions=[201]
63 md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
64 md.inversion.gradient_scaling=10./md.constants.yts*numpy.ones((md.inversion.nsteps,1))
65 md.inversion.maxiter_per_step=4*numpy.ones((md.inversion.nsteps,1))
66Index: ../trunk-jpl/test/NightlyRun/test214.py
67===================================================================
68--- ../trunk-jpl/test/NightlyRun/test214.py (revision 16307)
69+++ ../trunk-jpl/test/NightlyRun/test214.py (revision 16308)
70@@ -22,7 +22,7 @@
71 md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
72 md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
73 md.inversion.nsteps=2
74-md.inversion.cost_functions=101.
75+md.inversion.cost_functions=[101]
76 md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
77 md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
78 md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
79Index: ../trunk-jpl/test/NightlyRun/test613.py
80===================================================================
81--- ../trunk-jpl/test/NightlyRun/test613.py (revision 16307)
82+++ ../trunk-jpl/test/NightlyRun/test613.py (revision 16308)
83@@ -30,7 +30,7 @@
84 md.inversion.gradient_scaling=numpy.hstack((10./md.constants.yts*numpy.ones((md.inversion.nsteps,1)),10./md.constants.yts*numpy.ones((md.inversion.nsteps,1))))
85 md.inversion.min_parameters=numpy.hstack((-2000.*numpy.ones((md.mesh.numberofvertices,1)),-2000.*numpy.ones((md.mesh.numberofvertices,1))))
86 md.inversion.max_parameters=numpy.hstack((+2000.*numpy.ones((md.mesh.numberofvertices,1)),+2000.*numpy.ones((md.mesh.numberofvertices,1))))
87-md.inversion.cost_functions=201
88+md.inversion.cost_functions=[201]
89 md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
90 md.inversion.maxiter_per_step=4*numpy.ones((md.inversion.nsteps,1))
91 md.inversion.step_threshold=0.99*numpy.ones((md.inversion.nsteps,1))
92Index: ../trunk-jpl/test/NightlyRun/test272.py
93===================================================================
94--- ../trunk-jpl/test/NightlyRun/test272.py (revision 16307)
95+++ ../trunk-jpl/test/NightlyRun/test272.py (revision 16308)
96@@ -21,7 +21,7 @@
97 md.inversion.min_parameters=10**-13*numpy.ones((md.mesh.numberofvertices,1))
98 md.inversion.max_parameters=numpy.ones((md.mesh.numberofvertices,1))
99 md.inversion.nsteps=2
100-md.inversion.cost_functions=101.
101+md.inversion.cost_functions=[101]
102 md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
103 md.inversion.gradient_scaling=0.9*numpy.ones((md.inversion.nsteps,1))
104 md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1))
105Index: ../trunk-jpl/test/NightlyRun/test215.py
106===================================================================
107--- ../trunk-jpl/test/NightlyRun/test215.py (revision 16307)
108+++ ../trunk-jpl/test/NightlyRun/test215.py (revision 16308)
109@@ -22,7 +22,7 @@
110 md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
111 md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
112 md.inversion.nsteps=2
113-md.inversion.cost_functions=101.
114+md.inversion.cost_functions=[101]
115 md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
116 md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
117 md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
Note: See TracBrowser for help on using the repository browser.