Changeset 13665

Timestamp:

10/15/12 11:41:07 (12 years ago)

Author:

Mathieu Morlighem

Message:

reverted back

File:

• issm/trunk-jpl/test/NightlyRun/test512.py (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test512.py

@@ -8 +8 @@
 from solve import *
 from MatlabFuncs import *
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
 
-md=triangle(model,'../Exp/Pig.exp',20000.)
+md=triangle(model(),'../Exp/Pig.exp',20000.)
 md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
 md=parameterize(md,'../Par/Pig.py')
@@ -20 +15 @@
 md=setflowequation(md,'pattyn','all')
 
-
 # control parameters
-
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1)
-md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1)
+md.inversion.min_parameters=1.*numpy.ones((md.mesh.numberofvertices,1))
+md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
 md.inversion.nsteps=2
-md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)]
-md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2)
- md.inversion.cost_functions_coefficients(:,2)=2.*10^-7
-md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1)
-md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1)
-md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1)
+md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
+md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
+md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
+md.inversion.gradient_scaling=3.*numpy.ones((md.inversion.nsteps,1))
+md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1))
+md.inversion.step_threshold=2.99*numpy.ones((md.inversion.nsteps,1))
 md.inversion.vx_obs=md.initialization.vx
- md.inversion.vy_obs=md.initialization.vy
-
+md.inversion.vy_obs=md.initialization.vy
 
 md.cluster=generic('name',oshostname(),'np',3)
 md=solve(md,DiagnosticSolutionEnum())
 
-
 # Fields and tolerances to track changes
-
 field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy']
 field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11]