Changeset 25836 for issm/trunk/test/NightlyRun/test3300.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/test3300.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/test3300.py

@@ -15 +15 @@
 md = setmask(md, '', '')
 md = parameterize(md, '../Par/SquareSheetConstrained.py')
-md.transient = transient.setallnullparameters(md.transient)
+md.transient = transient.deactivateall(md.transient)
 md.transient.ishydrology = True
 md.transient.issmb = True
@@ -72 +72 @@
 field_names = ['SedimentWaterHead5', 'EplWaterHead5', 'SedimentWaterHead40', 'EplWaterHead40']
 field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13]
-field_values = [md.results.TransientSolution[5].SedimentHeadSubstep,
-                md.results.TransientSolution[5].EplHeadSubstep,
-                md.results.TransientSolution[40].SedimentHeadSubstep,
-                md.results.TransientSolution[40].EplHeadSubstep]
+field_values = [md.results.TransientSolution[5].SedimentHead,
+                md.results.TransientSolution[5].EplHead,
+                md.results.TransientSolution[40].SedimentHead,
+                md.results.TransientSolution[40].EplHead]

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