OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-07-07 04:53:03 -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-09 13:42:16 +01:00
parent 024344600e
commit cf9b7c39b9
107 changed files with 191 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/compute_eikonal_from_files.cpp
View File

@ -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>

6
examples/compute_initial_state.cpp
View File

@ -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>

8
examples/compute_tof_from_files.cpp
View File

@ -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>

6
examples/diagnose_relperm.cpp
View File

@ -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>

2
examples/flow_legacy.cpp
View File

@ -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>

2
examples/flow_reorder.cpp
View File

@ -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>

2
examples/flow_sequential.cpp
View File

@ -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>

6
examples/sim_2p_comp_reorder.cpp
View File

@ -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>

4
examples/sim_2p_incomp_ad.cpp
View File

@ -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>

4
examples/sim_poly2p_comp_reorder.cpp
View File

@ -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>

4
examples/sim_poly2p_incomp_reorder.cpp
View File

@ -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>

8
examples/sim_simple.cpp
View File

@ -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

4
examples/wells_example.cpp
View File

@ -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>

4
opm/autodiff/AutoDiffHelpers.hpp
View File

@ -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>

2
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -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>

2
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -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>

4
opm/autodiff/BlackoilOutputEbos.hpp
View File

@ -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
{

2
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -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>

2
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@ -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

2
opm/autodiff/BlackoilReorderingTransportModel.hpp
View File

@ -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>

2
opm/autodiff/DebugTimeReport.hpp
View File

@ -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

2
opm/autodiff/ExtractParallelGridInformationToISTL.hpp
View File

@ -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

2
opm/autodiff/FlowMain.hpp
View File

@ -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>

9
opm/autodiff/GeoProps.hpp
View File

@ -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

10
opm/autodiff/GridHelpers.hpp
View File

@ -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>

6
opm/autodiff/GridInit.hpp
View File

@ -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

4
opm/autodiff/ParallelDebugOutput.hpp
View File

@ -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

2
opm/autodiff/RateConverter.hpp
View File

@ -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>

4
opm/autodiff/SimulatorBase.hpp
View File

@ -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>

2
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -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>

4
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -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
{

4
opm/autodiff/SimulatorIncompTwophaseAd.cpp
View File

@ -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>

4
opm/autodiff/TransportSolverTwophaseAd.cpp
View File

@ -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>

4
opm/core/flowdiagnostics/AnisotropicEikonal.cpp
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

2
opm/core/flowdiagnostics/AnisotropicEikonal.hpp
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>

2
opm/core/flowdiagnostics/DGBasis.cpp
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>

10
opm/core/flowdiagnostics/TofDiscGalReorder.cpp
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>

4
opm/core/flowdiagnostics/TofReorder.cpp
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>

2
opm/core/linalg/ParallelIstlInformation.hpp
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>

2
opm/core/pressure/CompressibleTpfa.cpp
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>

2
opm/core/pressure/FlowBCManager.cpp
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

2
opm/core/pressure/IncompTpfa.cpp
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>

11
opm/core/pressure/IncompTpfaSinglePhase.cpp
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
{

2
opm/core/pressure/tpfa/cfs_tpfa_residual.c
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>

2
opm/core/pressure/tpfa/cfs_tpfa_residual.h
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>

2
opm/core/pressure/tpfa/ifs_tpfa.h
View File

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

4
opm/core/props/BlackoilPropertiesFromDeck.cpp
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>

2
opm/core/props/IncompPropertiesSinglePhase.cpp
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>

4
opm/core/props/rock/RockFromDeck.cpp
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>

6
opm/core/props/satfunc/RelpermDiagnostics.hpp
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>

2
opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
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 {

2
opm/core/props/satfunc/SaturationPropsFromDeck.cpp
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>

2
opm/core/props/satfunc/SaturationPropsFromDeck.hpp
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>

2
opm/core/simulator/BlackoilState.hpp
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>

2
opm/core/simulator/EquilibrationHelpers.hpp
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>

6
opm/core/simulator/initStateEquil.hpp
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>

4
opm/core/simulator/initStateEquil_impl.hpp
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>

4
opm/core/simulator/initState_impl.hpp
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>

4
opm/core/transport/reorder/ReorderSolverInterface.cpp
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>

4
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
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>

6
opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
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>

2
opm/core/transport/reorder/reordersequence.cpp
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"

2
opm/core/utility/miscUtilities.cpp
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>

2
opm/core/utility/miscUtilitiesBlackoil.cpp
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>

2
opm/core/utility/miscUtilities_impl.hpp
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>

2
opm/core/wells/WellCollection.hpp
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>

2
opm/core/wells/WellsGroup.hpp
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>

2
opm/core/wells/WellsManager.cpp
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>

2
opm/core/wells/WellsManager.hpp
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;

4
opm/core/wells/WellsManager_impl.hpp
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>

2
opm/polymer/CompressibleTpfaPolymer.cpp
View File

@ -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>

2
opm/polymer/GravityColumnSolverPolymer.hpp
View File

@ -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>

2
opm/polymer/IncompTpfaPolymer.cpp
View File

@ -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>

2
opm/polymer/PolymerBlackoilState.hpp
View File

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

2
opm/polymer/PolymerState.hpp
View File

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

6
opm/polymer/SimulatorCompressiblePolymer.cpp
View File

@ -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>

6
opm/polymer/SimulatorPolymer.cpp
View File

@ -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>

4
opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp
View File

@ -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>

4
opm/polymer/TransportSolverTwophasePolymer.cpp
View File

@ -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>

2
opm/polymer/polymerUtilities.hpp
View File

@ -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>

6
opm/simulators/SimulatorCompressibleTwophase.cpp
View File

@ -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>

2
opm/simulators/flow_ebos_blackoil.cpp
View File

@ -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>

2
opm/simulators/flow_ebos_gasoil.cpp
View File

@ -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>

2
opm/simulators/flow_ebos_oilwater.cpp
View File

@ -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>

2
opm/simulators/flow_ebos_polymer.cpp
View File

@ -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>

2
opm/simulators/flow_ebos_solvent.cpp
View File

@ -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>

2
opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
View File

@ -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>

2
opm/simulators/vtk/writeVtkData.cpp
View File

@ -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>

4
tests/test_anisotropiceikonal.cpp
View File

@ -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;

6
tests/test_blackoilstate.cpp
View File

@ -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;

2
tests/test_boprops_ad.cpp
View File

@ -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>

4
tests/test_dgbasis.cpp
View File

@ -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;

8
tests/test_equil_legacy.cpp
View File

@ -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>

8
tests/test_pinchprocessor.cpp
View File

@ -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>

4
tests/test_rateconverter.cpp
View File

@ -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>

6
tests/test_relpermdiagnostics.cpp
View File

@ -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>

6
tests/test_satfunc.cpp
View File

@ -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>

4
tests/test_singlecellsolves.cpp
View File

@ -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>

2
tests/test_stoppedwells.cpp
View File

@ -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;

4
tests/test_thresholdpressure.cpp
View File

@ -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)

Some files were not shown because too many files have changed in this diff Show More