From ce2617f3363297dd5c160b8045cc846813856c10 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Thu, 22 Dec 2016 16:38:02 +0100
Subject: [PATCH] Merge branch 'Fix/gridAdaptModels' into 'master'

[sequential grid adaptation] Fix problems due to commit 42dd5278e39b36f1f06130d954ad46a610d6c427

Set GridAdaptModel with second template argument (true/false for adaptivity) depending on AdaptiveGrid property. Include file for default initialization indicator. Clean-up.

See merge request !313
---
 dumux/porousmediumflow/sequential/gridadaptproperties.hh        | 2 +-
 dumux/porousmediumflow/sequential/properties.hh                 | 1 +
 .../2p2c/sequential/test_adaptive2p2c3dproblem.hh               | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dumux/porousmediumflow/sequential/gridadaptproperties.hh b/dumux/porousmediumflow/sequential/gridadaptproperties.hh
index 6bb904116e..4ef6f2c104 100644
--- a/dumux/porousmediumflow/sequential/gridadaptproperties.hh
+++ b/dumux/porousmediumflow/sequential/gridadaptproperties.hh
@@ -95,7 +95,7 @@ SET_BOOL_PROP(GridAdaptTypeTag, AdaptiveGrid, false);
 //Set default class for adaptation initialization indicator
 SET_TYPE_PROP(GridAdaptTypeTag,  AdaptionInitializationIndicator, GridAdaptInitializationIndicatorDefault<TypeTag>);
 //Set default class for adaptation
-SET_TYPE_PROP(GridAdaptTypeTag,  GridAdaptModel, GridAdapt<TypeTag, false>);
+SET_TYPE_PROP(GridAdaptTypeTag,  GridAdaptModel, GridAdapt<TypeTag, GET_PROP_VALUE(TypeTag, AdaptiveGrid)>);
 
 
 //standard setting
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index 3b4858cb27..09cfaa0a7a 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -22,6 +22,7 @@
 #include <dumux/common/propertysystem.hh>
 #include <dumux/common/basicproperties.hh>
 #include <dumux/porousmediumflow/sequential/gridadaptproperties.hh>
+#include <dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh>
 
 /*!
  * \ingroup Sequential
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index d29abda775..a8968de89e 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -74,7 +74,6 @@ SET_PROP(Adaptive2p2c3d, Components) : public GET_PROP(TypeTag, DefaultComponent
 SET_TYPE_PROP(Adaptive2p2c3d, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
 
 SET_BOOL_PROP(Adaptive2p2c3d, EnableCapillarity, true);
-SET_BOOL_PROP(Adaptive2p2c3d, AdaptiveGrid, true);
 SET_INT_PROP(Adaptive2p2c3d, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
 
 }
-- 
GitLab