OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-17 16:54:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to moved opm-grid headers.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2018-02-10 08:33:33 +01:00
parent 024344600e
commit cf9b7c39b9
107 changed files with 191 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/core/flowdiagnostics/AnisotropicEikonal.cpp
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+5 -5
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -10
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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>