Changeset 16560 for issm/trunk/test/NightlyRun/test214.py

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test214.py (modified) (2 diffs)

issm/trunk/test/NightlyRun/test214.py

@@ -23 +23 @@
 md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
 md.inversion.nsteps=2
-md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
+md.inversion.cost_functions=[101]
 md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
 md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
@@ -43 +43 @@
         md.results.StressbalanceSolution.Gradient1,\
         md.results.StressbalanceSolution.J,\
-        md.results.StressbalanceSolution.MaterialsRheologyB,\
+        md.results.StressbalanceSolution.MaterialsRheologyBbar,\
         md.results.StressbalanceSolution.Pressure,\
         md.results.StressbalanceSolution.Vel,\