Changeset 21408 for issm/trunk-jpl/test/NightlyRun/test341.py

Timestamp:

11/22/16 02:31:19 (8 years ago)

Author:

bdef

Message:

CHG: uniformization fix

File:

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

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

@@ -1 +1 @@
 #Test Name: SquareSheetConstrainedCMm1qn3DragHO
-import numpy
+import numpy as np
 from model import *
+from socket import gethostname
 from m1qn3inversion import *
 from triangle import *
@@ -8 +9 @@
 from setflowequation import *
 from solve import *
-from MatlabFuncs import *
 
-md=triangle(model(),'../Exp/Square.exp',200000.);
-md=setmask(md,'','');
-md=parameterize(md,'../Par/SquareSheetConstrained.py');
+
+md=triangle(model(),'../Exp/Square.exp',200000.)
+md=setmask(md,'','')
+md=parameterize(md,'../Par/SquareSheetConstrained.py')
 md.extrude(3,1.)
-md=setflowequation(md,'HO','all');
+md=setflowequation(md,'HO','all')
 
 #control parameters
-md.inversion=m1qn3inversion(md.inversion);
-md.inversion.iscontrol=1;
+md.inversion=m1qn3inversion(md.inversion)
+md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*numpy.ones((md.mesh.numberofvertices,1))
-md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
 md.inversion.maxsteps=2
 md.inversion.maxiter=6
 md.inversion.cost_functions=[102,501]
-md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.vx_obs=md.initialization.vx;
-md.inversion.vy_obs=md.initialization.vy;
+md.inversion.vx_obs=md.initialization.vx
+md.inversion.vy_obs=md.initialization.vy
 
-md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,'Stressbalance');
+md.cluster=generic('name',gethostname(),'np',3)
+md=solve(md,'Stressbalance')
 
 #Fields and tolerances to track changes