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

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

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

issm/trunk/test/NightlyRun/test214.py

@@ -1 +1 @@
 #Test Name: SquareShelfCMBHO
-from MatlabFuncs import *
+
 from model import *
-from numpy import *
+from socket import gethostname
+import numpy as np
 from triangle import *
 from setmask import *
@@ -21 +22 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
-md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
+md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices))
+md.inversion.max_parameters=2.*1e9*np.ones((md.mesh.numberofvertices))
 md.inversion.nsteps=2
 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))
-md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
-md.inversion.step_threshold=0.3*ones((md.inversion.nsteps,1))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
+md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps))
+md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
+md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps))
 md.inversion.vx_obs=md.initialization.vx
 md.inversion.vy_obs=md.initialization.vy
 
 
-md.cluster=generic('name',oshostname(),'np',3)
+md.cluster=generic('name',gethostname(),'np',3)
 md=solve(md,'Stressbalance')
 
@@ -41 +42 @@
 field_names     =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy']
 field_tolerances=[1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08]
-field_values=[\
-        md.results.StressbalanceSolution.Gradient1,\
-        md.results.StressbalanceSolution.J,\
-        md.results.StressbalanceSolution.MaterialsRheologyBbar,\
-        md.results.StressbalanceSolution.Pressure,\
-        md.results.StressbalanceSolution.Vel,\
-        md.results.StressbalanceSolution.Vx,\
-        md.results.StressbalanceSolution.Vy
-]
+field_values=[md.results.StressbalanceSolution.Gradient1,
+                                                        md.results.StressbalanceSolution.J,
+                                                        md.results.StressbalanceSolution.MaterialsRheologyBbar,
+                                                        md.results.StressbalanceSolution.Pressure,
+                                                        md.results.StressbalanceSolution.Vel,
+                                                        md.results.StressbalanceSolution.Vx,
+                                                        md.results.StressbalanceSolution.Vy]