Changeset 24313 for issm/trunk/test/NightlyRun/test513.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test513.py (modified) (1 diff)

issm/trunk/test/NightlyRun/test513.py

@@ -9 +9 @@
 
 
-md=triangle(model(),'../Exp/Pig.exp',30000.)
-md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
-md=parameterize(md,'../Par/Pig.py')
-md.extrude(3,1.)
-md=setflowequation(md,'SSA','all')
+md = triangle(model(), '../Exp/Pig.exp', 30000.)
+md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp')
+md = parameterize(md, '../Par/Pig.py')
+md.extrude(3, 1.)
+md = setflowequation(md, 'SSA', 'all')
 
 # control parameters
-md.inversion.iscontrol=1
-md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
-md.inversion.nsteps=2
-md.inversion.cost_functions=[103,501]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
-md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
-md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
-md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps))
-md.inversion.vx_obs=md.initialization.vx
-md.inversion.vy_obs=md.initialization.vy
-md.timestepping.time_step=0.
-
-md.thermal.penalty_lock=5
-md.cluster=generic('name',gethostname(),'np',3)
-md=solve(md,'Steadystate')
+md.inversion.iscontrol = 1
+md.inversion.control_parameters = ['FrictionCoefficient']
+md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters)))
+md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters)))
+md.inversion.nsteps = 2
+md.inversion.cost_functions = [103, 501]
+md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2))
+md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7
+md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters)))
+md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps))
+md.inversion.step_threshold = 0.99 * np.ones((md.inversion.nsteps))
+md.inversion.vx_obs = md.initialization.vx
+md.inversion.vy_obs = md.initialization.vy
+md.timestepping.time_step = 0.
+md.thermal.penalty_lock = 5
+md.cluster = generic('name', gethostname(), 'np', 3)
+md = solve(md, 'Steadystate')
 
 # Fields and tolerances to track changes
-field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate']
-field_tolerances=[5e-08,4e-10,1e-10,1e-10,3e-6,4e-6,3.4e-6,3e-6,2e-6,2e-06]
-field_values=[\
-        md.results.SteadystateSolution.Gradient1,\
-        md.results.SteadystateSolution.J,\
-        md.results.SteadystateSolution.FrictionCoefficient,\
-        md.results.SteadystateSolution.Pressure,\
-        md.results.SteadystateSolution.Vel,\
-        md.results.SteadystateSolution.Vx,\
-        md.results.SteadystateSolution.Vy,\
-        md.results.SteadystateSolution.Vz,\
-        md.results.SteadystateSolution.Temperature,\
-        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate
-]
+field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy', 'Vz', 'Temperature', 'BasalforcingsGroundediceMeltingRate']
+field_tolerances = [5e-08, 4e-10, 1e-10, 1e-10, 3e-6, 4e-6, 3.4e-6, 3e-6, 2e-6, 2e-06]
+field_values = [md.results.SteadystateSolution.Gradient1,
+                md.results.SteadystateSolution.J,
+                md.results.SteadystateSolution.FrictionCoefficient,
+                md.results.SteadystateSolution.Pressure,
+                md.results.SteadystateSolution.Vel,
+                md.results.SteadystateSolution.Vx,
+                md.results.SteadystateSolution.Vy,
+                md.results.SteadystateSolution.Vz,
+                md.results.SteadystateSolution.Temperature,
+                md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate]