From 38fe05cb272c609cd5be88d447b719930b5847b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Fri, 16 Dec 2011 10:17:40 +0100
Subject: [PATCH] Moved GridAdapter to opm/core. Fixes include paths.

---
 Makefile.am                                        |  2 +-
 opm/core/{pressure => }/GridAdapter.hpp            |  2 +-
 opm/core/pressure/HybridPressureSolver.hpp         |  8 ++++----
 .../pressure/TPFACompressiblePressureSolver.hpp    | 14 +++++++-------
 opm/core/pressure/TPFAPressureSolver.hpp           | 12 ++++++------
 opm/core/transport/ImplicitTransport.hpp           |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)
 rename opm/core/{pressure => }/GridAdapter.hpp (99%)

diff --git a/Makefile.am b/Makefile.am
index 14e7dbe0..8722e73e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,7 @@ opm/core/linalg/sparse_sys.h                            \
 opm/core/linalg/blas_lapack.h                           \
 opm/core/fluid/SimpleFluid2p.hpp                        \
 opm/core/grid.h                                         \
+opm/core/GridAdapter.hpp                                \
 opm/core/pressure/fsh.h                                 \
 opm/core/pressure/HybridPressureSolver.hpp              \
 opm/core/pressure/TPFAPressureSolver.hpp                \
@@ -71,7 +72,6 @@ opm/core/pressure/tpfa/trans_tpfa.h                     \
 opm/core/pressure/tpfa/cfs_tpfa_residual.h              \
 opm/core/pressure/tpfa/ifs_tpfa.h                       \
 opm/core/pressure/TPFACompressiblePressureSolver.hpp    \
-opm/core/pressure/GridAdapter.hpp                       \
 opm/core/pressure/msmfem/coarse_sys.h                   \
 opm/core/pressure/msmfem/hash_set.h                     \
 opm/core/pressure/msmfem/ifsh_ms.h                      \
diff --git a/opm/core/pressure/GridAdapter.hpp b/opm/core/GridAdapter.hpp
similarity index 99%
rename from opm/core/pressure/GridAdapter.hpp
rename to opm/core/GridAdapter.hpp
index b4bdfc88..25191df5 100644
--- a/opm/core/pressure/GridAdapter.hpp
+++ b/opm/core/GridAdapter.hpp
@@ -21,7 +21,7 @@
 #define OPM_GRIDADAPTER_HEADER_INCLUDED
 
 
-#include "grid.h"
+#include <opm/core/grid.h>
 #include <stdexcept>
 
 class GridAdapter
diff --git a/opm/core/pressure/HybridPressureSolver.hpp b/opm/core/pressure/HybridPressureSolver.hpp
index d2896613..78e7554a 100644
--- a/opm/core/pressure/HybridPressureSolver.hpp
+++ b/opm/core/pressure/HybridPressureSolver.hpp
@@ -21,10 +21,10 @@
 #ifndef OPM_HYBRIDPRESSURESOLVER_HEADER_INCLUDED
 #define OPM_HYBRIDPRESSURESOLVER_HEADER_INCLUDED
 
-#include "fsh.h"
-#include "sparse_sys.h"
-#include "mimetic.h"
-#include "GridAdapter.hpp"
+#include <opm/core/pressure/fsh.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/pressure/mimetic/mimetic.h>
+#include <opm/core/GridAdapter.hpp>
 #include <stdexcept>
 
 
diff --git a/opm/core/pressure/TPFACompressiblePressureSolver.hpp b/opm/core/pressure/TPFACompressiblePressureSolver.hpp
index d0d38554..8dedc4a2 100644
--- a/opm/core/pressure/TPFACompressiblePressureSolver.hpp
+++ b/opm/core/pressure/TPFACompressiblePressureSolver.hpp
@@ -21,13 +21,13 @@
 #define OPM_TPFACOMPRESSIBLEPRESSURESOLVER_HEADER_INCLUDED
 
 
-#include "cfs_tpfa.h"
-#include "trans_tpfa.h"
-#include "sparse_sys.h"
-#include "flow_bc.h"
-#include "well.h"
-#include "compr_quant.h"
-#include "GridAdapter.hpp"
+#include <opm/core/pressure/tpfa/cfs_tpfa.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/pressure/flow_bc.h>
+#include <opm/core/well.h>
+#include <opm/core/pressure/tpfa/compr_quant.h>
+#include <opm/core/GridAdapter.hpp>
 #include <stdexcept>
 
 
diff --git a/opm/core/pressure/TPFAPressureSolver.hpp b/opm/core/pressure/TPFAPressureSolver.hpp
index a38ce3cb..eb763a2c 100644
--- a/opm/core/pressure/TPFAPressureSolver.hpp
+++ b/opm/core/pressure/TPFAPressureSolver.hpp
@@ -21,12 +21,12 @@
 #define OPM_TPFAPRESSURESOLVER_HEADER_INCLUDED
 
 
-#include "ifs_tpfa.h"
-#include "trans_tpfa.h"
-#include "sparse_sys.h"
-#include "flow_bc.h"
-#include "mimetic.h" // for updating gpress
-#include "GridAdapter.hpp"
+#include <opm/core/pressure/tpfa/ifs_tpfa.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/pressure/flow_bc.h>
+#include <opm/core/pressure/mimetic/mimetic.h> // for updating gpress
+#include <opm/core/GridAdapter.hpp>
 #include <stdexcept>
 
 
diff --git a/opm/core/transport/ImplicitTransport.hpp b/opm/core/transport/ImplicitTransport.hpp
index 5a499a68..b1188093 100644
--- a/opm/core/transport/ImplicitTransport.hpp
+++ b/opm/core/transport/ImplicitTransport.hpp
@@ -36,7 +36,7 @@
 #ifndef OPM_IMPLICITTRANSPORT_HPP_HEADER
 #define OPM_IMPLICITTRANSPORT_HPP_HEADER
 
-#include "ImplicitAssembly.hpp"
+#include <opm/core/transport/ImplicitAssembly.hpp>
 
 namespace Opm {
     namespace ImplicitTransportDetails {