From 8759c3a89a68be41e548b104048e96e274eb28ae Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Wed, 24 May 2017 12:08:20 +0200
Subject: [PATCH] Set defines in *.cpp files.

That way we can keep the old order of includes which seems to be needed for compilation.
---
 examples/flow_ebos.cpp        | 5 +++--
 examples/flow_legacy.cpp      | 2 ++
 examples/flow_mpi.cpp         | 2 ++
 opm/autodiff/FlowMain.hpp     | 3 ---
 opm/autodiff/FlowMainEbos.hpp | 2 --
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/flow_ebos.cpp b/examples/flow_ebos.cpp
index acb757cec..00d8eddb1 100644
--- a/examples/flow_ebos.cpp
+++ b/examples/flow_ebos.cpp
@@ -24,13 +24,14 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-// Include of opm/autodiff/FlowMainEbos.hpp has to come first
-#include <opm/autodiff/FlowMainEbos.hpp>
+// Define making clear that the simulator supports AMG
+#define FLOW_SUPPORT_AMG 1
 
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/autodiff/DuneMatrix.hpp>
 #include <dune/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/autodiff/FlowMainEbos.hpp>
 
 
 // ----------------- Main program -----------------
diff --git a/examples/flow_legacy.cpp b/examples/flow_legacy.cpp
index 53a5b2d6d..e40a412e2 100644
--- a/examples/flow_legacy.cpp
+++ b/examples/flow_legacy.cpp
@@ -24,6 +24,8 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+// Define making clear that the simulator supports AMG
+#define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
 
 #include <opm/core/grid.h>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
diff --git a/examples/flow_mpi.cpp b/examples/flow_mpi.cpp
index e3f65b970..5356207ff 100644
--- a/examples/flow_mpi.cpp
+++ b/examples/flow_mpi.cpp
@@ -24,6 +24,8 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+// Define making clear that the simulator supports AMG
+#define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
 
 #include <dune/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
diff --git a/opm/autodiff/FlowMain.hpp b/opm/autodiff/FlowMain.hpp
index 644512863..4a03d5301 100644
--- a/opm/autodiff/FlowMain.hpp
+++ b/opm/autodiff/FlowMain.hpp
@@ -23,9 +23,6 @@
 #ifndef OPM_FLOWMAIN_HEADER_INCLUDED
 #define OPM_FLOWMAIN_HEADER_INCLUDED
 
-// Define making clear that the simulator supports AMG
-#define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
-
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 
 
diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp
index fdf0864f4..8b2ef145f 100755
--- a/opm/autodiff/FlowMainEbos.hpp
+++ b/opm/autodiff/FlowMainEbos.hpp
@@ -23,8 +23,6 @@
 #ifndef OPM_FLOW_MAIN_EBOS_HEADER_INCLUDED
 #define OPM_FLOW_MAIN_EBOS_HEADER_INCLUDED
 
-// Define making clear that the simulator supports AMG
-#define FLOW_SUPPORT_AMG 1
 
 #include <sys/utsname.h>