Changeset 22758 for issm/trunk/test/NightlyRun/test227.py

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

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

issm/trunk/test/NightlyRun

@@ -14 +14 @@
 qmu*
 *.bin
+Models
+run
+run.old
+run_matlab

@@ -14 +14 @@
 qmu*
 *.bin
+Models
+run
+run.old
+run_matlab

issm/trunk/test/NightlyRun/test227.py

@@ -15 +15 @@
 md=setflowequation(md,'HO','all')
 md.cluster=generic('name',gethostname(),'np',3)
-md.timestepping.time_adapt=1.
+md.timestepping = timesteppingadaptive(md.timestepping)
 md.timestepping.final_time=20.
 md=solve(md,'Transient')
@@ -24 +24 @@
         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
 field_tolerances=[\
-        1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
-        1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,\
+        1e-08,5e-09,1e-09,5e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
+        1e-09,5e-09,1e-08,5e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,\
         1e-08,1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05]
 field_values=[\

@@ -14 +14 @@
 qmu*
 *.bin
+Models
+run
+run.old
+run_matlab