Changeset 25836 for issm/trunk/test/NightlyRun/test250.py

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

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

issm/trunk/test/NightlyRun

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

issm/trunk/test/NightlyRun/test250.py

@@ -9 +9 @@
 from setflowequation import *
 from solve import *
-from SMBgemb import *
 from partitioner import *
 from dmeth_params_set import *
@@ -36 +35 @@
 
 #partitioning
-md.qmu.numberofpartitions = md.mesh.numberofvertices
-md = partitioner(md, 'package', 'linear')
-md.qmu.vpartition = md.qmu.vpartition - 1
+npart = md.mesh.numberofvertices
+partition = partitioner(md, 'package', 'linear', 'npart', npart)[0] - 1
 
 #variables
-md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance', 1, 0.1)
+md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
+    'descriptor', 'scaled_SmbMassBalance',
+    'mean', np.ones((npart, 1)),
+    'stddev', .1 * np.ones((npart, 1)),
+    'partition', partition
+    )
 
 #responses
-md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
-md.qmu.responses.IceVolume = response_function.response_function('IceVolume', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
-md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
-md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
-md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
-md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
-md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
-md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999])
+md.qmu.responses.MaxVel = response_function.response_function('descriptor','MaxVel')
+md.qmu.responses.IceVolume = response_function.response_function('descriptor','IceVolume')
+md.qmu.responses.MassFlux1 = response_function.response_function('descriptor','indexed_MassFlux_1')
+md.qmu.responses.MassFlux2 = response_function.response_function('descriptor','indexed_MassFlux_2')
+md.qmu.responses.MassFlux3 = response_function.response_function('descriptor','indexed_MassFlux_3')
+md.qmu.responses.MassFlux4 = response_function.response_function('descriptor','indexed_MassFlux_4')
+md.qmu.responses.MassFlux5 = response_function.response_function('descriptor','indexed_MassFlux_5')
+md.qmu.responses.massFlux6 = response_function.response_function('descriptor','indexed_MassFlux_6')
 
 #mass flux profiles

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err