From c126b21b50b937f97b2aa24acdd505c9f1cf160a Mon Sep 17 00:00:00 2001
From: Max Rudolph <maxwellr@gmail.com>
Date: Mon, 3 Jul 2017 10:05:18 -0700
Subject: [PATCH] disable conduction timestep in tests that time out

---
 tests/depth_average_03.prm                           | 2 +-
 tests/depth_average_04.prm                           | 2 +-
 tests/diffusion.prm                                  | 1 +
 tests/minimum_refinement_function_time_dependent.prm | 2 +-
 tests/point_value_02.prm                             | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/depth_average_03.prm b/tests/depth_average_03.prm
index 36f2b0a46d7..0dbaa9b2d40 100644
--- a/tests/depth_average_03.prm
+++ b/tests/depth_average_03.prm
@@ -15,7 +15,7 @@ set Temperature solver tolerance           = 1e-15
 
 set Pressure normalization                 = surface
 set Surface pressure                       = 0
-
+set Use conduction timestep 		   = false
 
 subsection Geometry model
   set Model name = box
diff --git a/tests/depth_average_04.prm b/tests/depth_average_04.prm
index 9d1130abc29..3424abffb50 100644
--- a/tests/depth_average_04.prm
+++ b/tests/depth_average_04.prm
@@ -12,7 +12,7 @@ set Temperature solver tolerance           = 1e-15
 
 set Pressure normalization                 = surface
 set Surface pressure                       = 0
-
+set Use conduction timestep                = false
 
 subsection Geometry model
   set Model name = box
diff --git a/tests/diffusion.prm b/tests/diffusion.prm
index 4a973552772..291c734e856 100644
--- a/tests/diffusion.prm
+++ b/tests/diffusion.prm
@@ -38,6 +38,7 @@ set Dimension = 2
 # particular, one can choose $c>1$) though a CFL number significantly larger
 # than one will yield rather diffusive solutions. Units: None.
 set CFL number                             = 0.01
+set Use conduction timestep                = false
 
 # The end time of the simulation. Units: years if the 'Use years in output
 # instead of seconds' parameter is set; seconds otherwise.
diff --git a/tests/minimum_refinement_function_time_dependent.prm b/tests/minimum_refinement_function_time_dependent.prm
index 1faf184ac68..c2a4b263b9c 100644
--- a/tests/minimum_refinement_function_time_dependent.prm
+++ b/tests/minimum_refinement_function_time_dependent.prm
@@ -30,7 +30,7 @@ set Resume computation                     = false
 set Start time                             = 0
 
 set Use years in output instead of seconds = true
-
+set Use conduction timestep                = true
 
 subsection Boundary temperature model
   # Select one of the following models:
diff --git a/tests/point_value_02.prm b/tests/point_value_02.prm
index dc14708fbf6..c7eb021c96f 100644
--- a/tests/point_value_02.prm
+++ b/tests/point_value_02.prm
@@ -10,7 +10,7 @@ set Use years in output instead of seconds = true
 
 set Linear solver tolerance                = 1e-7
 set Pressure normalization                 = volume
-
+set Use conduction timestep		   = false
 
 subsection Geometry model
   set Model name = box