Adapt to moved opm-grid headers.

examples/compute_eikonal_from_files.cpp

@@ -24,10 +24,10 @@
 #endif // HAVE_CONFIG_H
 
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <boost/filesystem.hpp>

examples/compute_initial_state.cpp

@@ -23,15 +23,15 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/simulator/initStateEquil.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>

examples/compute_tof_from_files.cpp

@@ -22,13 +22,13 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/SparseTable.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 

examples/diagnose_relperm.cpp

@@ -23,12 +23,12 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
 #include <opm/core/props/satfunc/RelpermDiagnostics_impl.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 

examples/flow_legacy.cpp

@@ -27,7 +27,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/FlowMain.hpp>
 

examples/flow_reorder.cpp

@@ -22,7 +22,7 @@
 #endif // HAVE_CONFIG_H
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/SimulatorSequentialBlackoil.hpp>
 #include <opm/autodiff/FlowMainSequential.hpp>
 #include <opm/autodiff/BlackoilPressureModel.hpp>

examples/flow_sequential.cpp

@@ -22,7 +22,7 @@
 #endif // HAVE_CONFIG_H
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/SimulatorSequentialBlackoil.hpp>
 #include <opm/autodiff/FlowMainSequential.hpp>
 #include <opm/autodiff/BlackoilPressureModel.hpp>

examples/sim_2p_comp_reorder.cpp

@@ -23,9 +23,9 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>

examples/sim_2p_incomp_ad.cpp

@@ -25,8 +25,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>

examples/sim_poly2p_comp_reorder.cpp

@@ -24,8 +24,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>

examples/sim_poly2p_incomp_reorder.cpp

@@ -24,8 +24,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>

examples/sim_simple.cpp

@@ -21,12 +21,12 @@
 
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/props/IncompPropertiesBasic.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/utility/StopWatch.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/utility/StopWatch.hpp>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #if HAVE_SUITESPARSE_UMFPACK_H

examples/wells_example.cpp

@@ -6,11 +6,11 @@
 #include <opm/core/simulator/initState.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/core/wells/WellsManager.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
 #include <opm/core/props/IncompPropertiesFromDeck.hpp>
 #include <opm/core/wells.h>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/simulator/WellState.hpp>

opm/autodiff/AutoDiffHelpers.hpp

@@ -24,8 +24,8 @@
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/autodiff/GeoProps.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/PinchProcessor.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/PinchProcessor.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 
 #include <opm/common/ErrorMacros.hpp>

opm/autodiff/BlackoilModelBase_impl.hpp

@@ -39,7 +39,7 @@
 #include <opm/autodiff/VFPProdProperties.hpp>
 #include <opm/autodiff/VFPInjProperties.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>

opm/autodiff/BlackoilModelEbos.hpp

@@ -32,7 +32,7 @@
 #include <opm/autodiff/BlackoilDetails.hpp>
 #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>

opm/autodiff/BlackoilOutputEbos.hpp

@@ -23,7 +23,7 @@
 #include <ebos/eclproblem.hh>
 #include <ewoms/common/start.hh>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/common/ErrorMacros.hpp>
@@ -57,7 +57,7 @@
 #include <boost/filesystem.hpp>
 
 #ifdef HAVE_OPM_GRID
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #endif
 namespace Opm
 {

opm/autodiff/BlackoilPropsAdFromDeck.cpp

@@ -28,7 +28,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/utility/extractPvtTableIndex.hpp>
+#include <opm/grid/utility/extractPvtTableIndex.hpp>
 
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/material/common/Exceptions.hpp>

opm/autodiff/BlackoilPropsAdFromDeck.hpp

@@ -41,7 +41,7 @@
 
 #ifdef HAVE_OPM_GRID
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 #endif
 

opm/autodiff/BlackoilReorderingTransportModel.hpp

@@ -25,7 +25,7 @@
 #include <opm/autodiff/BlackoilModelParameters.hpp>
 #include <opm/autodiff/DebugTimeReport.hpp>
 #include <opm/autodiff/multiPhaseUpwind.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/core/simulator/BlackoilState.hpp>
 

opm/autodiff/DebugTimeReport.hpp

@@ -21,7 +21,7 @@
 #define OPM_DEBUGTIMEREPORT_HEADER_INCLUDED
 
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <string>
 
 namespace Opm

opm/autodiff/ExtractParallelGridInformationToISTL.hpp

@@ -21,7 +21,7 @@
 #define OPM_EXTRACTPARALLELGRIDINFORMATIONTOISTL_HEADER_INCLUDED
 #ifdef HAVE_OPM_GRID
 
-#include<dune/grid/CpGrid.hpp>
+#include<opm/grid/CpGrid.hpp>
 #include<boost/any.hpp>
 
 namespace Opm

opm/autodiff/FlowMain.hpp

@@ -32,7 +32,7 @@
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/autodiff/createGlobalCellArray.hpp>
 #include <opm/autodiff/GridInit.hpp>

opm/autodiff/GeoProps.hpp

@@ -20,18 +20,17 @@
 #ifndef OPM_GEOPROPS_HEADER_INCLUDED
 #define OPM_GEOPROPS_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/common/ErrorMacros.hpp>
-//#include <opm/core/pressure/tpfa/trans_tpfa.h>
-#include <opm/core/pressure/tpfa/TransTpfa.hpp>
+#include <opm/grid/transmissibility/TransTpfa.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
-#include <opm/core/grid/PinchProcessor.hpp>
+#include <opm/grid/PinchProcessor.hpp>
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <opm/output/data/Cells.hpp>
 #include <opm/output/data/Solution.hpp>
@@ -40,7 +39,7 @@
 
 #ifdef HAVE_OPM_GRID
 #include <dune/common/version.hh>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <dune/grid/common/mcmgmapper.hh>
 #endif
 

opm/autodiff/GridHelpers.hpp

@@ -23,8 +23,8 @@
 
 #include <functional>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridHelpers.hpp>
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 
@@ -34,9 +34,9 @@
 #include <boost/range/iterator_range.hpp>
 
 #ifdef HAVE_OPM_GRID
-#include <dune/grid/CpGrid.hpp>
-#include <dune/grid/cpgrid/GridHelpers.hpp>
-#include <dune/grid/polyhedralgrid.hh>
+#include <opm/grid/CpGrid.hpp>
+#include <opm/grid/cpgrid/GridHelpers.hpp>
+#include <opm/grid/polyhedralgrid.hh>
 #endif
 
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

opm/autodiff/GridInit.hpp

@@ -22,11 +22,11 @@
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 
 #if HAVE_OPM_GRID
-#include <dune/grid/polyhedralgrid.hh>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/polyhedralgrid.hh>
+#include <opm/grid/CpGrid.hpp>
 #endif
 
 

opm/autodiff/ParallelDebugOutput.hpp

@@ -24,7 +24,7 @@
 #include <opm/common/data/SimulationDataContainer.hpp>
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/wells/WellsManager.hpp>
 
@@ -34,7 +34,7 @@
 #include <opm/core/wells/DynamicListEconLimited.hpp>
 
 #if HAVE_OPM_GRID
-#include <dune/grid/common/p2pcommunicator.hh>
+#include <opm/grid/common/p2pcommunicator.hh>
 #endif
 
 namespace Opm

opm/autodiff/RateConverter.hpp

@@ -24,7 +24,7 @@
 
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
-#include <opm/core/utility/RegionMapping.hpp>
+#include <opm/grid/utility/RegionMapping.hpp>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
 
 #include <dune/grid/common/gridenums.hh>

opm/autodiff/SimulatorBase.hpp

@@ -34,7 +34,7 @@
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
@@ -42,7 +42,7 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 

opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -31,7 +31,7 @@
 #include <opm/autodiff/BlackoilWellModel.hpp>
 #include <opm/autodiff/moduleVersion.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/ErrorMacros.hpp>

opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp

@@ -19,7 +19,7 @@
 */
 #ifndef OPM_SIMULATORFULLYIMPLICITBLACKOILOUTPUT_HEADER_INCLUDED
 #define OPM_SIMULATORFULLYIMPLICITBLACKOILOUTPUT_HEADER_INCLUDED
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/autodiff/Compat.hpp>
@@ -58,7 +58,7 @@
 #include <boost/filesystem.hpp>
 
 #ifdef HAVE_OPM_GRID
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #endif
 namespace Opm
 {

opm/autodiff/SimulatorIncompTwophaseAd.cpp

@@ -29,14 +29,14 @@
 
 #include <opm/core/pressure/IncompTpfa.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>

opm/autodiff/TransportSolverTwophaseAd.cpp

@@ -20,10 +20,10 @@
 #include <config.h>
 
 #include <opm/autodiff/TransportSolverTwophaseAd.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>

opm/core/flowdiagnostics/AnisotropicEikonal.cpp

@@ -19,8 +19,8 @@
 
 #include <config.h>
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
-#include <opm/core/grid/GridUtilities.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/GridUtilities.hpp>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 
 #if BOOST_HEAP_AVAILABLE

opm/core/flowdiagnostics/AnisotropicEikonal.hpp

@@ -20,7 +20,7 @@
 #ifndef OPM_ANISOTROPICEIKONAL_HEADER_INCLUDED
 #define OPM_ANISOTROPICEIKONAL_HEADER_INCLUDED
 
-#include <opm/core/utility/SparseTable.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
 #include <vector>
 #include <set>
 #include <map>

opm/core/flowdiagnostics/DGBasis.cpp

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <numeric>
 

opm/core/flowdiagnostics/TofDiscGalReorder.cpp

@@ -18,14 +18,14 @@
 */
 
 #include "config.h"
-#include <opm/core/grid/CellQuadrature.hpp>
-#include <opm/core/grid/FaceQuadrature.hpp>
+#include <opm/grid/CellQuadrature.hpp>
+#include <opm/grid/FaceQuadrature.hpp>
 #include <opm/core/flowdiagnostics/TofDiscGalReorder.hpp>
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/SparseTable.hpp>
-#include <opm/core/utility/VelocityInterpolation.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
+#include <opm/grid/utility/VelocityInterpolation.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/utility/numeric/blas_lapack.h>
 

opm/core/flowdiagnostics/TofReorder.cpp

@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include <opm/core/flowdiagnostics/TofReorder.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/SparseTable.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
 
 #include <algorithm>
 #include <numeric>

opm/core/linalg/ParallelIstlInformation.hpp

@@ -22,7 +22,7 @@
 #define OPM_PARALLELISTLINFORMTION_HEADER_INCLUDED
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <boost/any.hpp>
 #include <exception>

opm/core/pressure/CompressibleTpfa.cpp

@@ -23,7 +23,7 @@
 #include <opm/core/pressure/tpfa/cfs_tpfa_residual.h>
 #include <opm/core/pressure/tpfa/compr_quant_general.h>
 #include <opm/core/pressure/tpfa/compr_source.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/sparse_sys.h>
 #include <opm/common/ErrorMacros.hpp>

opm/core/pressure/FlowBCManager.cpp

@@ -21,7 +21,7 @@
 #include "config.h"
 #include <opm/core/pressure/FlowBCManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 
 namespace Opm

opm/core/pressure/IncompTpfa.cpp

@@ -25,7 +25,7 @@
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
 #include <opm/core/pressure/flow_bc.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>

opm/core/pressure/IncompTpfaSinglePhase.cpp

@@ -23,20 +23,11 @@
 
 #include <opm/core/props/IncompPropertiesSinglePhase.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
-// #include <opm/core/pressure/mimetic/mimetic.h>
-// #include <opm/core/pressure/flow_bc.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/sparse_sys.h>
-// #include <opm/core/simulator/TwophaseState.hpp>
-// #include <opm/core/simulator/WellState.hpp>
 #include <opm/common/ErrorMacros.hpp>
-// #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/wells.h>
-// #include <iostream>
-// #include <iomanip>
-// #include <cmath>
-// #include <algorithm>
 
 namespace Opm
 {

opm/core/pressure/tpfa/cfs_tpfa_residual.c

@@ -13,7 +13,7 @@
 
 #include <opm/core/pressure/tpfa/compr_quant_general.h>
 #include <opm/core/pressure/tpfa/compr_source.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <opm/core/pressure/tpfa/cfs_tpfa_residual.h>
 

opm/core/pressure/tpfa/cfs_tpfa_residual.h

@@ -20,7 +20,7 @@
 #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
 #define OPM_CFS_TPFA_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 
 #include <opm/core/pressure/tpfa/compr_source.h>

opm/core/pressure/tpfa/ifs_tpfa.h

@@ -30,7 +30,7 @@
  * connection fluxes.
  */
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 
 #ifdef __cplusplus
 extern "C" {

opm/core/props/BlackoilPropertiesFromDeck.cpp

@@ -22,8 +22,8 @@
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
-#include <opm/core/utility/extractPvtTableIndex.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/extractPvtTableIndex.hpp>
 #include <vector>
 #include <numeric>
 

opm/core/props/IncompPropertiesSinglePhase.cpp

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <opm/core/props/IncompPropertiesSinglePhase.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 

opm/core/props/rock/RockFromDeck.cpp

@@ -20,12 +20,12 @@
 
 #include "config.h"
 #include <opm/core/props/rock/RockFromDeck.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
-#include <opm/core/utility/CompressedPropertyAccess.hpp>
+#include <opm/grid/utility/CompressedPropertyAccess.hpp>
 
 #include <array>
 #include <string>

opm/core/props/satfunc/RelpermDiagnostics.hpp

@@ -27,9 +27,9 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/common/utility/numeric/linearInterpolation.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>

opm/core/props/satfunc/RelpermDiagnostics_impl.hpp

@@ -24,7 +24,7 @@
 #include <utility>
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 
 namespace Opm {
 

opm/core/props/satfunc/SaturationPropsFromDeck.cpp

@@ -24,7 +24,7 @@
 
 #include <opm/common/utility/numeric/UniformTableLinear.hpp>
 #include <opm/common/utility/numeric/NonuniformTableLinear.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/simulator/ExplicitArraysFluidState.hpp>
 #include <opm/core/simulator/ExplicitArraysSatDerivativesFluidState.hpp>
 

opm/core/props/satfunc/SaturationPropsFromDeck.hpp

@@ -24,7 +24,7 @@
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>

opm/core/simulator/BlackoilState.hpp

@@ -23,7 +23,7 @@
 
 #include <opm/common/data/SimulationDataContainer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <vector>
 

opm/core/simulator/EquilibrationHelpers.hpp

@@ -22,7 +22,7 @@
 #define OPM_EQUILIBRATIONHELPERS_HEADER_INCLUDED
 
 #include <opm/common/utility/numeric/linearInterpolation.hpp>
-#include <opm/core/utility/RegionMapping.hpp>
+#include <opm/grid/utility/RegionMapping.hpp>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 
 #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>

opm/core/simulator/initStateEquil.hpp

@@ -23,10 +23,10 @@
 #ifndef OPM_INITSTATEEQUIL_HEADER_INCLUDED
 #define OPM_INITSTATEEQUIL_HEADER_INCLUDED
 
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/simulator/EquilibrationHelpers.hpp>
-#include <opm/core/utility/RegionMapping.hpp>
-#include <opm/core/utility/extractPvtTableIndex.hpp>
+#include <opm/grid/utility/RegionMapping.hpp>
+#include <opm/grid/utility/extractPvtTableIndex.hpp>
 
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>

opm/core/simulator/initStateEquil_impl.hpp

@@ -23,8 +23,8 @@
 #ifndef OPM_INITSTATEEQUIL_IMPL_HEADER_INCLUDED
 #define OPM_INITSTATEEQUIL_IMPL_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridHelpers.hpp>
 
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 

opm/core/simulator/initState_impl.hpp

@@ -24,8 +24,8 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>

opm/core/transport/reorder/ReorderSolverInterface.cpp

@@ -20,8 +20,8 @@
 #include "config.h"
 #include <opm/core/transport/reorder/ReorderSolverInterface.hpp>
 #include <opm/core/transport/reorder/reordersequence.h>
-#include <opm/core/grid.h>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/utility/StopWatch.hpp>
 
 #include <vector>
 #include <cassert>

opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp

@@ -21,12 +21,12 @@
 #include "config.h"
 #include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <iostream>
 #include <fstream>

opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp

@@ -20,12 +20,12 @@
 #include "config.h"
 #include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <iostream>
 #include <fstream>

opm/core/transport/reorder/reordersequence.cpp

@@ -1,7 +1,7 @@
 /* Copyright 2011 (c) Jostein R. Natvig <Jostein.R.Natvig at sintef.no> */
 
 #include "config.h"
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 
 #ifdef MATLAB_MEX_FILE
 #include "reordersequence.h"

opm/core/utility/miscUtilities.cpp

@@ -20,7 +20,7 @@
 #include "config.h"
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/props/IncompPropertiesInterface.hpp>

opm/core/utility/miscUtilitiesBlackoil.cpp

@@ -22,7 +22,7 @@
 
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/common/utility/numeric/blas_lapack.h>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>

opm/core/utility/miscUtilities_impl.hpp

@@ -1,4 +1,4 @@
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 

opm/core/wells/WellCollection.hpp

@@ -23,7 +23,7 @@
 #include <memory>
 
 #include <opm/core/wells/WellsGroup.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>

opm/core/wells/WellsGroup.hpp

@@ -22,7 +22,7 @@
 
 #include <opm/core/wells/InjectionSpecification.hpp>
 #include <opm/core/wells/ProductionSpecification.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>

opm/core/wells/WellsManager.cpp

@@ -22,7 +22,7 @@
 
 
 #include <opm/core/wells/WellsManager.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/common/ErrorMacros.hpp>

opm/core/wells/WellsManager.hpp

@@ -29,7 +29,7 @@
 #include <opm/core/wells/DynamicListEconLimited.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp>
 
-#include <opm/core/utility/CompressedPropertyAccess.hpp>
+#include <opm/grid/utility/CompressedPropertyAccess.hpp>
 
 struct Wells;
 struct UnstructuredGrid;

opm/core/wells/WellsManager_impl.hpp

@@ -1,9 +1,9 @@
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp>

opm/polymer/CompressibleTpfaPolymer.cpp

@@ -24,7 +24,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
 #include <opm/core/pressure/flow_bc.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>

opm/polymer/GravityColumnSolverPolymer.hpp

@@ -20,7 +20,7 @@
 #ifndef OPM_GRAVITYCOLUMNSOLVERPOLYMER_HEADER_INCLUDED
 #define OPM_GRAVITYCOLUMNSOLVERPOLYMER_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 #include <map>
 

opm/polymer/IncompTpfaPolymer.cpp

@@ -27,7 +27,7 @@
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
 #include <opm/core/pressure/flow_bc.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>

opm/polymer/PolymerBlackoilState.hpp

@@ -22,7 +22,7 @@
 
 
 #include <opm/core/simulator/BlackoilState.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 
 namespace Opm

opm/polymer/PolymerState.hpp

@@ -22,7 +22,7 @@
 
 #include <opm/common/data/SimulationDataContainer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 
 namespace Opm

opm/polymer/SimulatorCompressiblePolymer.cpp

@@ -27,13 +27,13 @@
 
 #include <opm/polymer/CompressibleTpfaPolymer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
@@ -44,7 +44,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/polymer/PolymerBlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>

opm/polymer/SimulatorPolymer.cpp

@@ -28,14 +28,14 @@
 
 #include <opm/polymer/IncompTpfaPolymer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/autodiff/Compat.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
@@ -46,7 +46,7 @@
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/polymer/PolymerState.hpp>
 #include <opm/core/simulator/WellState.hpp>

opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp

@@ -21,12 +21,12 @@
 
 #include <opm/polymer/TransportSolverTwophaseCompressiblePolymer.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <cmath>
 #include <list>

opm/polymer/TransportSolverTwophasePolymer.cpp

@@ -22,10 +22,10 @@
 
 #include <opm/polymer/TransportSolverTwophasePolymer.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <cmath>
 #include <list>

opm/polymer/polymerUtilities.hpp

@@ -21,7 +21,7 @@
 #define OPM_POLYMERUTILITIES_HEADER_INCLUDED
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/polymer/PolymerProperties.hpp>

opm/simulators/SimulatorCompressibleTwophase.cpp

@@ -27,13 +27,13 @@
 
 #include <opm/core/pressure/CompressibleTpfa.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
@@ -44,7 +44,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>

opm/simulators/flow_ebos_blackoil.cpp

@@ -22,7 +22,7 @@
 #include <opm/simulators/flow_ebos_blackoil.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 

opm/simulators/flow_ebos_gasoil.cpp

@@ -24,7 +24,7 @@
 #include <opm/material/common/ResetLocale.hpp>
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 

opm/simulators/flow_ebos_oilwater.cpp

@@ -24,7 +24,7 @@
 #include <opm/material/common/ResetLocale.hpp>
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 

opm/simulators/flow_ebos_polymer.cpp

@@ -19,7 +19,7 @@
 #include <opm/simulators/flow_ebos_polymer.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 

opm/simulators/flow_ebos_solvent.cpp

@@ -19,7 +19,7 @@
 #include <opm/simulators/flow_ebos_solvent.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 

opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp

@@ -26,7 +26,7 @@
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
 #include <opm/simulators/timestepping/TimeStepControl.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <dune/istl/istlexception.hh>

opm/simulators/vtk/writeVtkData.cpp

@@ -21,7 +21,7 @@
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <set>
 #include <cmath>
 #include <algorithm>

tests/test_anisotropiceikonal.cpp

@@ -31,8 +31,8 @@
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
 #include <cmath>
 
 using namespace Opm;

tests/test_blackoilstate.cpp

@@ -1,7 +1,7 @@
 #include <config.h>
 
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
@@ -21,7 +21,7 @@
 #include <vector>
 #include <string>
 
-#include "opm/core/grid/GridManager.hpp"
+#include "opm/grid/GridManager.hpp"
 #include "opm/core/simulator/BlackoilState.hpp"
 
 using namespace Opm;

tests/test_boprops_ad.cpp

@@ -32,7 +32,7 @@
 
 #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 

tests/test_dgbasis.cpp

@@ -28,8 +28,8 @@
 #include <boost/test/unit_test.hpp>
 
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
 #include <cmath>
 
 using namespace Opm;

tests/test_equil_legacy.cpp

@@ -19,10 +19,10 @@
 
 #include <opm/core/simulator/initStateEquil.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/cart_grid.h>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/cart_grid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>

tests/test_pinchprocessor.cpp

@@ -32,8 +32,8 @@
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <vector>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
@@ -42,8 +42,8 @@
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
-#include <opm/core/pressure/tpfa/TransTpfa.hpp>
-#include <opm/core/grid/PinchProcessor.hpp>
+#include <opm/grid/transmissibility/TransTpfa.hpp>
+#include <opm/grid/PinchProcessor.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 
 

tests/test_rateconverter.cpp

@@ -32,8 +32,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <opm/core/grid/GridHelpers.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>

tests/test_relpermdiagnostics.cpp

@@ -36,9 +36,9 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/CounterLog.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/cart_grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/cart_grid.h>
+#include <opm/grid/GridManager.hpp>
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>

tests/test_satfunc.cpp

@@ -19,9 +19,9 @@
 
 #include <opm/core/simulator/initStateEquil.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/cart_grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/cart_grid.h>
+#include <opm/grid/GridManager.hpp>
 
 #include <opm/core/props/BlackoilPropertiesBasic.hpp>
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>

tests/test_singlecellsolves.cpp

@@ -24,8 +24,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>

tests/test_stoppedwells.cpp

@@ -35,7 +35,7 @@
 #include <opm/core/well_controls.h>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 
 
 using namespace Opm;

tests/test_thresholdpressure.cpp

@@ -2,9 +2,9 @@
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/grid/cornerpoint_grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/simulators/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available)