OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt include statements to moved headers.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-03-14 10:29:42 +01:00
parent fa31f17885
commit 34f523339d
68 changed files with 284 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

325
CMakeLists_files.cmake
View File

@ -26,56 +26,35 @@
# originally generated with the command:
# find opm -name '*.c*' -printf '\t%p\n' | sort
list (APPEND MAIN_SOURCE_FILES
opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
opm/core/fluid/BlackoilPropertiesBasic.cpp
opm/core/fluid/BlackoilPropertiesFromDeck.cpp
opm/core/fluid/blackoil/SinglePvtDead.cpp
opm/core/fluid/blackoil/SinglePvtDeadSpline.cpp
opm/core/fluid/blackoil/SinglePvtInterface.cpp
opm/core/fluid/blackoil/SinglePvtLiveGas.cpp
opm/core/fluid/blackoil/SinglePvtLiveOil.cpp
opm/core/fluid/IncompPropertiesBasic.cpp
opm/core/fluid/IncompPropertiesFromDeck.cpp
opm/core/fluid/PvtPropertiesBasic.cpp
opm/core/fluid/PvtPropertiesIncompFromDeck.cpp
opm/core/fluid/RockBasic.cpp
opm/core/fluid/RockCompressibility.cpp
opm/core/fluid/RockFromDeck.cpp
opm/core/fluid/SatFuncGwseg.cpp
opm/core/fluid/SatFuncSimple.cpp
opm/core/fluid/SatFuncStone2.cpp
opm/core/fluid/SaturationPropsBasic.cpp
opm/core/fluid/SaturationPropsFromDeck.cpp
opm/core/GridManager.cpp
opm/core/grid.c
opm/core/grid/cart_grid.c
opm/core/grid/cornerpoint_grid.c
opm/core/grid/cpgpreprocess/facetopology.c
opm/core/grid/cpgpreprocess/geometry.c
opm/core/grid/cpgpreprocess/preprocess.c
opm/core/grid/cpgpreprocess/processgrid.c
opm/core/grid/cpgpreprocess/uniquepoints.c
opm/core/GridManager.cpp
opm/core/io/eclipse/EclipseGridInspector.cpp
opm/core/io/eclipse/EclipseGridParser.cpp
opm/core/io/eclipse/writeECLData.cpp
opm/core/io/vag/vag.cpp
opm/core/io/vtk/writeVtkData.cpp
opm/core/linalg/call_umfpack.c
opm/core/linalg/LinearSolverAGMG.cpp
opm/core/linalg/LinearSolverFactory.cpp
opm/core/linalg/LinearSolverInterface.cpp
opm/core/linalg/LinearSolverIstl.cpp
opm/core/linalg/LinearSolverUmfpack.cpp
opm/core/linalg/call_umfpack.c
opm/core/linalg/sparse_sys.c
opm/core/newwells.c
opm/core/pressure/cfsh.c
opm/core/pressure/CompressibleTpfa.cpp
opm/core/pressure/flow_bc.c
opm/core/pressure/FlowBCManager.cpp
opm/core/pressure/IncompTpfa.cpp
opm/core/pressure/cfsh.c
opm/core/pressure/flow_bc.c
opm/core/pressure/fsh.c
opm/core/pressure/fsh_common_impl.c
opm/core/pressure/ifsh.c
opm/core/pressure/IncompTpfa.cpp
opm/core/pressure/mimetic/hybsys.c
opm/core/pressure/mimetic/hybsys_global.c
opm/core/pressure/mimetic/mimetic.c
@ -94,25 +73,48 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/pressure/tpfa/ifs_tpfa.c
opm/core/pressure/tpfa/trans_tpfa.c
opm/core/pressure/well.c
opm/core/props/BlackoilPropertiesBasic.cpp
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/props/IncompPropertiesBasic.cpp
opm/core/props/IncompPropertiesFromDeck.cpp
opm/core/props/pvt/BlackoilPvtProperties.cpp
opm/core/props/pvt/PvtPropertiesBasic.cpp
opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
opm/core/props/pvt/SinglePvtDead.cpp
opm/core/props/pvt/SinglePvtDeadSpline.cpp
opm/core/props/pvt/SinglePvtInterface.cpp
opm/core/props/pvt/SinglePvtLiveGas.cpp
opm/core/props/pvt/SinglePvtLiveOil.cpp
opm/core/props/rock/RockBasic.cpp
opm/core/props/rock/RockCompressibility.cpp
opm/core/props/rock/RockFromDeck.cpp
opm/core/props/satfunc/SatFuncGwseg.cpp
opm/core/props/satfunc/SatFuncSimple.cpp
opm/core/props/satfunc/SatFuncStone2.cpp
opm/core/props/satfunc/SaturationPropsBasic.cpp
opm/core/props/satfunc/SaturationPropsFromDeck.cpp
opm/core/simulator/SimulatorCompressibleTwophase.cpp
opm/core/simulator/SimulatorIncompTwophase.cpp
opm/core/simulator/SimulatorReport.cpp
opm/core/simulator/SimulatorTimer.cpp
opm/core/transport/reorder/DGBasis.cpp
opm/core/transport/reorder/nlsolvers.c
opm/core/transport/reorder/reordersequence.cpp
opm/core/transport/reorder/tarjan.c
opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp
opm/core/transport/reorder/TransportModelInterface.cpp
opm/core/transport/reorder/TransportModelTracerTof.cpp
opm/core/transport/reorder/TransportModelTracerTofDiscGal.cpp
opm/core/transport/reorder/TransportModelTwophase.cpp
opm/core/transport/reorder/nlsolvers.c
opm/core/transport/reorder/reordersequence.cpp
opm/core/transport/reorder/tarjan.c
opm/core/transport/spu_explicit.c
opm/core/transport/spu_implicit.c
opm/core/transport/transport_source.c
opm/core/utility/miscUtilitiesBlackoil.cpp
opm/core/utility/miscUtilities.cpp
opm/core/utility/MonotCubicInterpolator.cpp
opm/core/utility/StopWatch.cpp
opm/core/utility/VelocityInterpolation.cpp
opm/core/utility/WachspressCoord.cpp
opm/core/utility/miscUtilities.cpp
opm/core/utility/miscUtilitiesBlackoil.cpp
opm/core/utility/parameters/Parameter.cpp
opm/core/utility/parameters/ParameterGroup.cpp
opm/core/utility/parameters/ParameterTools.cpp
@ -122,9 +124,6 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp
opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp
opm/core/utility/parameters/tinyxml/xmltest.cpp
opm/core/utility/StopWatch.cpp
opm/core/utility/VelocityInterpolation.cpp
opm/core/utility/WachspressCoord.cpp
opm/core/wells/InjectionSpecification.cpp
opm/core/wells/ProductionSpecification.cpp
opm/core/wells/WellCollection.cpp
@ -176,157 +175,157 @@ list (APPEND EXAMPLE_SOURCE_FILES
# originally generated with the command:
# find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
list (APPEND PUBLIC_HEADER_FILES
opm/core/transport/ImplicitTransport.hpp
opm/core/transport/SimpleFluid2pWrapper.hpp
opm/core/transport/CSRMatrixBlockAssembler.hpp
opm/core/transport/ImplicitAssembly.hpp
opm/core/transport/CSRMatrixUmfpackSolver.hpp
opm/core/transport/GravityColumnSolver_impl.hpp
opm/core/transport/spu_implicit.h
opm/core/transport/transport_source.h
opm/core/transport/SinglePointUpwindTwoPhase.hpp
opm/core/transport/JacobianSystem.hpp
opm/core/transport/reorder/TransportModelTwophase.hpp
opm/core/transport/reorder/TransportModelTracerTof.hpp
opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp
opm/core/transport/reorder/DGBasis.hpp
opm/core/transport/reorder/reordersequence.h
opm/core/transport/reorder/tarjan.h
opm/core/transport/reorder/TransportModelInterface.hpp
opm/core/transport/reorder/nlsolvers.h
opm/core/transport/reorder/TransportModelTracerTofDiscGal.hpp
opm/core/transport/GravityColumnSolver.hpp
opm/core/transport/NormSupport.hpp
opm/core/transport/spu_explicit.h
opm/core/GridAdapter.hpp
opm/core/GridManager.hpp
opm/core/io/eclipse/SpecialEclipseFields.hpp
opm/core/io/eclipse/EclipseUnits.hpp
opm/core/io/eclipse/EclipseGridParserHelpers.hpp
opm/core/doxygen_main.hpp
opm/core/grid.h
opm/core/grid/CellQuadrature.hpp
opm/core/grid/FaceQuadrature.hpp
opm/core/grid/cart_grid.h
opm/core/grid/cornerpoint_grid.h
opm/core/grid/cpgpreprocess/facetopology.h
opm/core/grid/cpgpreprocess/geometry.h
opm/core/grid/cpgpreprocess/grdecl.h
opm/core/grid/cpgpreprocess/preprocess.h
opm/core/grid/cpgpreprocess/uniquepoints.h
opm/core/io/eclipse/CornerpointChopper.hpp
opm/core/io/eclipse/EclipseGridParser.hpp
opm/core/io/eclipse/EclipseGridInspector.hpp
opm/core/io/eclipse/EclipseGridParser.hpp
opm/core/io/eclipse/EclipseGridParserHelpers.hpp
opm/core/io/eclipse/EclipseUnits.hpp
opm/core/io/eclipse/SpecialEclipseFields.hpp
opm/core/io/eclipse/writeECLData.hpp
opm/core/io/vag/vag.hpp
opm/core/io/vtk/writeVtkData.hpp
opm/core/linalg/blas_lapack.h
opm/core/linalg/LinearSolverAGMG.hpp
opm/core/linalg/LinearSolverFactory.hpp
opm/core/linalg/LinearSolverUmfpack.hpp
opm/core/linalg/LinearSolverInterface.hpp
opm/core/linalg/LinearSolverIstl.hpp
opm/core/linalg/LinearSolverUmfpack.hpp
opm/core/linalg/blas_lapack.h
opm/core/linalg/call_umfpack.h
opm/core/linalg/sparse_sys.h
opm/core/linalg/LinearSolverInterface.hpp
opm/core/newwells.h
opm/core/doxygen_main.hpp
opm/core/simulator/SimulatorIncompTwophase.hpp
opm/core/simulator/WellState.hpp
opm/core/pressure/CompressibleTpfa.hpp
opm/core/pressure/FlowBCManager.hpp
opm/core/pressure/HybridPressureSolver.hpp
opm/core/pressure/IncompTpfa.hpp
opm/core/pressure/TPFACompressiblePressureSolver.hpp
opm/core/pressure/TPFAPressureSolver.hpp
opm/core/pressure/flow_bc.h
opm/core/pressure/fsh.h
opm/core/pressure/fsh_common_impl.h
opm/core/pressure/mimetic/hybsys.h
opm/core/pressure/mimetic/hybsys_global.h
opm/core/pressure/mimetic/mimetic.h
opm/core/pressure/msmfem/coarse_conn.h
opm/core/pressure/msmfem/coarse_sys.h
opm/core/pressure/msmfem/dfs.h
opm/core/pressure/msmfem/hash_set.h
opm/core/pressure/msmfem/ifsh_ms.h
opm/core/pressure/msmfem/partition.h
opm/core/pressure/tpfa/cfs_tpfa.h
opm/core/pressure/tpfa/cfs_tpfa_residual.h
opm/core/pressure/tpfa/compr_bc.h
opm/core/pressure/tpfa/compr_quant.h
opm/core/pressure/tpfa/compr_quant_general.h
opm/core/pressure/tpfa/compr_source.h
opm/core/pressure/tpfa/ifs_tpfa.h
opm/core/pressure/tpfa/trans_tpfa.h
opm/core/props/BlackoilPhases.hpp
opm/core/props/BlackoilPropertiesBasic.hpp
opm/core/props/BlackoilPropertiesFromDeck.hpp
opm/core/props/BlackoilPropertiesInterface.hpp
opm/core/props/IncompPropertiesBasic.hpp
opm/core/props/IncompPropertiesFromDeck.hpp
opm/core/props/IncompPropertiesInterface.hpp
opm/core/props/SimpleFluid2p.hpp
opm/core/props/phaseUsageFromDeck.hpp
opm/core/props/pvt/BlackoilPvtProperties.hpp
opm/core/props/pvt/PvtPropertiesBasic.hpp
opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp
opm/core/props/pvt/SinglePvtConstCompr.hpp
opm/core/props/pvt/SinglePvtDead.hpp
opm/core/props/pvt/SinglePvtDeadSpline.hpp
opm/core/props/pvt/SinglePvtInterface.hpp
opm/core/props/pvt/SinglePvtLiveGas.hpp
opm/core/props/pvt/SinglePvtLiveOil.hpp
opm/core/props/rock/RockBasic.hpp
opm/core/props/rock/RockCompressibility.hpp
opm/core/props/rock/RockFromDeck.hpp
opm/core/props/satfunc/SatFuncGwseg.hpp
opm/core/props/satfunc/SatFuncSimple.hpp
opm/core/props/satfunc/SatFuncStone2.hpp
opm/core/props/satfunc/SaturationPropsBasic.hpp
opm/core/props/satfunc/SaturationPropsFromDeck.hpp
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
opm/core/props/satfunc/SaturationPropsInterface.hpp
opm/core/simulator/BlackoilState.hpp
opm/core/simulator/SimulatorCompressibleTwophase.hpp
opm/core/simulator/SimulatorIncompTwophase.hpp
opm/core/simulator/SimulatorReport.hpp
opm/core/simulator/SimulatorTimer.hpp
opm/core/simulator/TwophaseState.hpp
opm/core/simulator/BlackoilState.hpp
opm/core/utility/linearInterpolation.hpp
opm/core/utility/WachspressCoord.hpp
opm/core/utility/initState_impl.hpp
opm/core/utility/initState.hpp
opm/core/utility/NonuniformTableLinear.hpp
opm/core/utility/Units.hpp
opm/core/utility/DataMap.hpp
opm/core/utility/linInt.hpp
opm/core/utility/parameters/ParameterXML.hpp
opm/core/utility/parameters/ParameterGroup_impl.hpp
opm/core/utility/parameters/Parameter.hpp
opm/core/utility/parameters/ParameterTools.hpp
opm/core/utility/parameters/ParameterRequirement.hpp
opm/core/utility/parameters/ParameterMapItem.hpp
opm/core/utility/parameters/ParameterGroup.hpp
opm/core/utility/parameters/tinyxml/tinystr.h
opm/core/utility/parameters/tinyxml/tinyxml.h
opm/core/utility/parameters/ParameterStrings.hpp
opm/core/utility/miscUtilitiesBlackoil.hpp
opm/core/utility/MonotCubicInterpolator.hpp
opm/core/utility/UniformTableLinear.hpp
opm/core/simulator/WellState.hpp
opm/core/transport/CSRMatrixBlockAssembler.hpp
opm/core/transport/CSRMatrixUmfpackSolver.hpp
opm/core/transport/GravityColumnSolver.hpp
opm/core/transport/GravityColumnSolver_impl.hpp
opm/core/transport/ImplicitAssembly.hpp
opm/core/transport/ImplicitTransport.hpp
opm/core/transport/JacobianSystem.hpp
opm/core/transport/NormSupport.hpp
opm/core/transport/SimpleFluid2pWrapper.hpp
opm/core/transport/SinglePointUpwindTwoPhase.hpp
opm/core/transport/reorder/DGBasis.hpp
opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp
opm/core/transport/reorder/TransportModelInterface.hpp
opm/core/transport/reorder/TransportModelTracerTof.hpp
opm/core/transport/reorder/TransportModelTracerTofDiscGal.hpp
opm/core/transport/reorder/TransportModelTwophase.hpp
opm/core/transport/reorder/nlsolvers.h
opm/core/transport/reorder/reordersequence.h
opm/core/transport/reorder/tarjan.h
opm/core/transport/spu_explicit.h
opm/core/transport/spu_implicit.h
opm/core/transport/transport_source.h
opm/core/utility/Average.hpp
opm/core/utility/Factory.hpp
opm/core/utility/VelocityInterpolation.hpp
opm/core/utility/SparseVector.hpp
opm/core/utility/StopWatch.hpp
opm/core/utility/buildUniformMonotoneTable.hpp
opm/core/utility/ErrorMacros.hpp
opm/core/utility/miscUtilities.hpp
opm/core/utility/ColumnExtract.hpp
opm/core/utility/DataMap.hpp
opm/core/utility/ErrorMacros.hpp
opm/core/utility/Factory.hpp
opm/core/utility/MonotCubicInterpolator.hpp
opm/core/utility/NonuniformTableLinear.hpp
opm/core/utility/RootFinders.hpp
opm/core/utility/SparseTable.hpp
opm/core/utility/SparseVector.hpp
opm/core/utility/StopWatch.hpp
opm/core/utility/UniformTableLinear.hpp
opm/core/utility/Units.hpp
opm/core/utility/VelocityInterpolation.hpp
opm/core/utility/WachspressCoord.hpp
opm/core/utility/buildUniformMonotoneTable.hpp
opm/core/utility/have_boost_redef.hpp
opm/core/grid/CellQuadrature.hpp
opm/core/grid/cornerpoint_grid.h
opm/core/grid/cpgpreprocess/geometry.h
opm/core/grid/cpgpreprocess/uniquepoints.h
opm/core/grid/cpgpreprocess/preprocess.h
opm/core/grid/cpgpreprocess/grdecl.h
opm/core/grid/cpgpreprocess/facetopology.h
opm/core/grid/cart_grid.h
opm/core/grid/FaceQuadrature.hpp
opm/core/pressure/TPFAPressureSolver.hpp
opm/core/pressure/fsh_common_impl.h
opm/core/pressure/msmfem/dfs.h
opm/core/pressure/msmfem/coarse_conn.h
opm/core/pressure/msmfem/hash_set.h
opm/core/pressure/msmfem/partition.h
opm/core/pressure/msmfem/ifsh_ms.h
opm/core/pressure/msmfem/coarse_sys.h
opm/core/pressure/IncompTpfa.hpp
opm/core/pressure/HybridPressureSolver.hpp
opm/core/pressure/fsh.h
opm/core/pressure/flow_bc.h
opm/core/pressure/tpfa/compr_quant_general.h
opm/core/pressure/tpfa/compr_bc.h
opm/core/pressure/tpfa/trans_tpfa.h
opm/core/pressure/tpfa/compr_quant.h
opm/core/pressure/tpfa/cfs_tpfa_residual.h
opm/core/pressure/tpfa/ifs_tpfa.h
opm/core/pressure/tpfa/compr_source.h
opm/core/pressure/tpfa/cfs_tpfa.h
opm/core/pressure/mimetic/hybsys_global.h
opm/core/pressure/mimetic/hybsys.h
opm/core/pressure/mimetic/mimetic.h
opm/core/pressure/FlowBCManager.hpp
opm/core/pressure/CompressibleTpfa.hpp
opm/core/pressure/TPFACompressiblePressureSolver.hpp
opm/core/utility/initState.hpp
opm/core/utility/initState_impl.hpp
opm/core/utility/linInt.hpp
opm/core/utility/linearInterpolation.hpp
opm/core/utility/miscUtilities.hpp
opm/core/utility/miscUtilitiesBlackoil.hpp
opm/core/utility/parameters/Parameter.hpp
opm/core/utility/parameters/ParameterGroup.hpp
opm/core/utility/parameters/ParameterGroup_impl.hpp
opm/core/utility/parameters/ParameterMapItem.hpp
opm/core/utility/parameters/ParameterRequirement.hpp
opm/core/utility/parameters/ParameterStrings.hpp
opm/core/utility/parameters/ParameterTools.hpp
opm/core/utility/parameters/ParameterXML.hpp
opm/core/utility/parameters/tinyxml/tinystr.h
opm/core/utility/parameters/tinyxml/tinyxml.h
opm/core/well.h
opm/core/wells/InjectionSpecification.hpp
opm/core/wells/WellsGroup.hpp
opm/core/wells/WellsManager.hpp
opm/core/wells/ProductionSpecification.hpp
opm/core/wells/WellCollection.hpp
opm/core/fluid/SaturationPropsInterface.hpp
opm/core/fluid/SaturationPropsFromDeck_impl.hpp
opm/core/fluid/RockFromDeck.hpp
opm/core/fluid/BlackoilPropertiesBasic.hpp
opm/core/fluid/RockCompressibility.hpp
opm/core/fluid/PvtPropertiesIncompFromDeck.hpp
opm/core/fluid/IncompPropertiesBasic.hpp
opm/core/fluid/SaturationPropsFromDeck.hpp
opm/core/fluid/SaturationPropsBasic.hpp
opm/core/fluid/BlackoilPropertiesFromDeck.hpp
opm/core/fluid/BlackoilPropertiesInterface.hpp
opm/core/fluid/blackoil/SinglePvtInterface.hpp
opm/core/fluid/blackoil/BlackoilPhases.hpp
opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp
opm/core/fluid/blackoil/SinglePvtLiveOil.hpp
opm/core/fluid/blackoil/SinglePvtConstCompr.hpp
opm/core/fluid/blackoil/SinglePvtDead.hpp
opm/core/fluid/blackoil/phaseUsageFromDeck.hpp
opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
opm/core/fluid/blackoil/SinglePvtLiveGas.hpp
opm/core/fluid/SimpleFluid2p.hpp
opm/core/fluid/IncompPropertiesInterface.hpp
opm/core/fluid/PvtPropertiesBasic.hpp
opm/core/fluid/SatFuncSimple.hpp
opm/core/fluid/SatFuncGwseg.hpp
opm/core/fluid/IncompPropertiesFromDeck.hpp
opm/core/fluid/RockBasic.hpp
opm/core/fluid/SatFuncStone2.hpp
opm/core/grid.h
opm/core/well.h
opm/core/GridAdapter.hpp
opm/core/wells/WellsGroup.hpp
opm/core/wells/WellsManager.hpp
)

4
examples/compute_tof.cpp
View File

@ -35,8 +35,8 @@
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp>

4
examples/compute_tof_from_files.cpp
View File

@ -34,8 +34,8 @@
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp>

6
examples/sim_2p_comp_reorder.cpp
View File

@ -34,9 +34,9 @@
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/fluid/BlackoilPropertiesBasic.hpp>
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/BlackoilPropertiesBasic.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp>

6
examples/sim_2p_incomp_reorder.cpp
View File

@ -35,9 +35,9 @@
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp>

6
examples/sim_wateroil.cpp
View File

@ -38,9 +38,9 @@
#include <opm/core/utility/miscUtilitiesBlackoil.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/fluid/BlackoilPropertiesBasic.hpp>
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/BlackoilPropertiesBasic.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp>

8
examples/spu_2p.cpp
View File

@ -53,10 +53,10 @@
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/fluid/SimpleFluid2p.hpp>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/SimpleFluid2p.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp>

4
examples/wells_example.cpp
View File

@ -8,7 +8,7 @@
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/GridManager.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/core/newwells.h>
#include <opm/core/grid.h>
#include <opm/core/utility/miscUtilities.hpp>
@ -16,7 +16,7 @@
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/pressure/FlowBCManager.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
int main(int argc, char** argv)
{

2
opm/core/pressure/CompressibleTpfa.cpp
View File

@ -30,7 +30,7 @@
#include <opm/core/newwells.h>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <algorithm>
#include <cmath>

4
opm/core/pressure/IncompTpfa.cpp
View File

@ -19,8 +19,8 @@
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#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/core/pressure/mimetic/mimetic.h>

2
opm/core/props/BlackoilPropertiesBasic.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/BlackoilPropertiesBasic.hpp>
#include <opm/core/props/BlackoilPropertiesBasic.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>

8
opm/core/props/BlackoilPropertiesBasic.hpp
View File

@ -21,10 +21,10 @@
#define OPM_BLACKOILPROPERTIESBASIC_HEADER_INCLUDED
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/fluid/RockBasic.hpp>
#include <opm/core/fluid/PvtPropertiesBasic.hpp>
#include <opm/core/fluid/SaturationPropsBasic.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/rock/RockBasic.hpp>
#include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
#include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
namespace Opm

2
opm/core/props/BlackoilPropertiesFromDeck.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
namespace Opm

8
opm/core/props/BlackoilPropertiesFromDeck.hpp
View File

@ -21,10 +21,10 @@
#define OPM_BLACKOILPROPERTIESFROMDECK_HEADER_INCLUDED
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/fluid/RockFromDeck.hpp>
#include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp>
#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/rock/RockFromDeck.hpp>
#include <opm/core/props/pvt/BlackoilPvtProperties.hpp>
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <boost/scoped_ptr.hpp>

2
opm/core/props/IncompPropertiesBasic.cpp
View File

@ -19,7 +19,7 @@
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>

8
opm/core/props/IncompPropertiesBasic.hpp
View File

@ -20,10 +20,10 @@
#ifndef OPM_INCOMPPROPERTIESBASIC_HEADER_INCLUDED
#define OPM_INCOMPPROPERTIESBASIC_HEADER_INCLUDED
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/fluid/RockBasic.hpp>
#include <opm/core/fluid/PvtPropertiesBasic.hpp>
#include <opm/core/fluid/SaturationPropsBasic.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/props/rock/RockBasic.hpp>
#include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
#include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
namespace Opm
{

2
opm/core/props/IncompPropertiesFromDeck.cpp
View File

@ -18,7 +18,7 @@
*/
#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>

8
opm/core/props/IncompPropertiesFromDeck.hpp
View File

@ -20,10 +20,10 @@
#ifndef OPM_INCOMPPROPERTIESFROMDECK_HEADER_INCLUDED
#define OPM_INCOMPPROPERTIESFROMDECK_HEADER_INCLUDED
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/fluid/RockFromDeck.hpp>
#include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/props/rock/RockFromDeck.hpp>
#include <opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp>
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
struct UnstructuredGrid;

2
opm/core/props/phaseUsageFromDeck.hpp
View File

@ -22,7 +22,7 @@
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
namespace Opm

14
opm/core/props/pvt/BlackoilPvtProperties.cpp
View File

@ -19,13 +19,13 @@
#include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp>
#include <opm/core/fluid/blackoil/SinglePvtDead.hpp>
#include <opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp>
#include <opm/core/fluid/blackoil/SinglePvtLiveOil.hpp>
#include <opm/core/fluid/blackoil/SinglePvtLiveGas.hpp>
#include <opm/core/fluid/blackoil/SinglePvtConstCompr.hpp>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/pvt/BlackoilPvtProperties.hpp>
#include <opm/core/props/pvt/SinglePvtDead.hpp>
#include <opm/core/props/pvt/SinglePvtDeadSpline.hpp>
#include <opm/core/props/pvt/SinglePvtLiveOil.hpp>
#include <opm/core/props/pvt/SinglePvtLiveGas.hpp>
#include <opm/core/props/pvt/SinglePvtConstCompr.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>

4
opm/core/props/pvt/BlackoilPvtProperties.hpp
View File

@ -22,8 +22,8 @@
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/pvt/SinglePvtInterface.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <string>
#include <tr1/memory>

2
opm/core/props/pvt/PvtPropertiesBasic.cpp
View File

@ -19,7 +19,7 @@
#include <opm/core/fluid/PvtPropertiesBasic.hpp>
#include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>

6
opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
View File

@ -18,12 +18,12 @@
*/
#include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
namespace Opm

2
opm/core/props/pvt/SinglePvtConstCompr.hpp
View File

@ -21,7 +21,7 @@
#define OPM_SINGLEPVTCONSTCOMPR_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/props/pvt/SinglePvtInterface.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <vector>
#include <algorithm>

2
opm/core/props/pvt/SinglePvtDead.cpp
View File

@ -18,7 +18,7 @@
*/
#include <opm/core/fluid/blackoil/SinglePvtDead.hpp>
#include <opm/core/props/pvt/SinglePvtDead.hpp>
#include <algorithm>
// Extra includes for debug dumping of tables.

2
opm/core/props/pvt/SinglePvtDead.hpp
View File

@ -21,7 +21,7 @@
#define OPM_SINGLEPVTDEAD_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/props/pvt/SinglePvtInterface.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp>
#include <vector>

2
opm/core/props/pvt/SinglePvtDeadSpline.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp>
#include <opm/core/props/pvt/SinglePvtDeadSpline.hpp>
#include <opm/core/utility/buildUniformMonotoneTable.hpp>
#include <algorithm>

2
opm/core/props/pvt/SinglePvtDeadSpline.hpp
View File

@ -21,7 +21,7 @@
#define OPM_SINGLEPVTDEADSPLINE_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/props/pvt/SinglePvtInterface.hpp>
#include <opm/core/utility/UniformTableLinear.hpp>
#include <vector>

2
opm/core/props/pvt/SinglePvtInterface.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/props/pvt/SinglePvtInterface.hpp>
namespace Opm

2
opm/core/props/pvt/SinglePvtInterface.hpp
View File

@ -21,7 +21,7 @@
#define OPM_SINGLEPVTINTERFACE_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
namespace Opm

2
opm/core/props/pvt/SinglePvtLiveGas.cpp
View File

@ -28,7 +28,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/blackoil/SinglePvtLiveGas.hpp>
#include <opm/core/props/pvt/SinglePvtLiveGas.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linInt.hpp>
#include <algorithm>

2
opm/core/props/pvt/SinglePvtLiveGas.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_SINGLEPVTLIVEGAS_HEADER_INCLUDED
#define OPM_SINGLEPVTLIVEGAS_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/props/pvt/SinglePvtInterface.hpp>
#include <vector>
namespace Opm

2
opm/core/props/pvt/SinglePvtLiveOil.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/blackoil/SinglePvtLiveOil.hpp>
#include <opm/core/props/pvt/SinglePvtLiveOil.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linInt.hpp>
#include <algorithm>

2
opm/core/props/pvt/SinglePvtLiveOil.hpp
View File

@ -21,7 +21,7 @@
#define OPM_SINGLEPVTLIVEOIL_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/props/pvt/SinglePvtInterface.hpp>
#include <vector>
namespace Opm

2
opm/core/props/rock/RockBasic.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/RockBasic.hpp>
#include <opm/core/props/rock/RockBasic.hpp>
namespace Opm
{

2
opm/core/props/rock/RockCompressibility.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/Units.hpp>

2
opm/core/props/rock/RockFromDeck.cpp
View File

@ -18,7 +18,7 @@
*/
#include <opm/core/fluid/RockFromDeck.hpp>
#include <opm/core/props/rock/RockFromDeck.hpp>
#include <opm/core/grid.h>
#include <tr1/array>

8
opm/core/props/satfunc/SatFuncGwseg.cpp
View File

@ -17,11 +17,11 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/SatFuncGwseg.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/props/satfunc/SatFuncGwseg.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/grid.h>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/utility/buildUniformMonotoneTable.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>

2
opm/core/props/satfunc/SatFuncGwseg.hpp
View File

@ -22,7 +22,7 @@
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <vector>
namespace Opm

8
opm/core/props/satfunc/SatFuncSimple.cpp
View File

@ -17,11 +17,11 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/SatFuncSimple.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/props/satfunc/SatFuncSimple.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/grid.h>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/utility/buildUniformMonotoneTable.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>

2
opm/core/props/satfunc/SatFuncSimple.hpp
View File

@ -22,7 +22,7 @@
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <vector>
namespace Opm

8
opm/core/props/satfunc/SatFuncStone2.cpp
View File

@ -17,11 +17,11 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/SatFuncStone2.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/props/satfunc/SatFuncStone2.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/grid.h>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/utility/buildUniformMonotoneTable.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>

2
opm/core/props/satfunc/SatFuncStone2.hpp
View File

@ -22,7 +22,7 @@
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <vector>
namespace Opm

2
opm/core/props/satfunc/SaturationPropsBasic.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/SaturationPropsBasic.hpp>
#include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>

2
opm/core/props/satfunc/SaturationPropsFromDeck.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/buildUniformMonotoneTable.hpp>
#include <opm/core/utility/ErrorMacros.hpp>

12
opm/core/props/satfunc/SaturationPropsFromDeck.hpp
View File

@ -20,13 +20,13 @@
#ifndef OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED
#define OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED
#include <opm/core/fluid/SaturationPropsInterface.hpp>
#include <opm/core/props/satfunc/SaturationPropsInterface.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/fluid/SatFuncStone2.hpp>
#include <opm/core/fluid/SatFuncSimple.hpp>
#include <opm/core/fluid/SatFuncGwseg.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/props/satfunc/SatFuncStone2.hpp>
#include <opm/core/props/satfunc/SatFuncSimple.hpp>
#include <opm/core/props/satfunc/SatFuncGwseg.hpp>
#include <vector>
struct UnstructuredGrid;
@ -136,7 +136,7 @@ namespace Opm
} // namespace Opm
#include <opm/core/fluid/SaturationPropsFromDeck_impl.hpp>
#include <opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp>
#endif // OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED

2
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
View File

@ -23,7 +23,7 @@
#include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/grid.h>
namespace Opm

2
opm/core/props/satfunc/SaturationPropsInterface.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_SATURATIONPROPSINTERFACE_HEADER_INCLUDED
#define OPM_SATURATIONPROPSINTERFACE_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
namespace Opm

2
opm/core/simulator/BlackoilState.hpp
View File

@ -21,7 +21,7 @@
#define OPM_BLACKOILSTATE_HEADER_INCLUDED
#include <opm/core/grid.h>
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <vector>
namespace Opm

4
opm/core/simulator/SimulatorCompressibleTwophase.cpp
View File

@ -40,8 +40,8 @@
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/simulator/BlackoilState.hpp>

4
opm/core/simulator/SimulatorIncompTwophase.cpp
View File

@ -39,8 +39,8 @@
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/simulator/TwophaseState.hpp>

2
opm/core/simulator/TwophaseState.hpp
View File

@ -21,7 +21,7 @@
#define OPM_TWOPHASESTATE_HEADER_INCLUDED
#include <opm/core/grid.h>
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <vector>
namespace Opm

2
opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp
View File

@ -19,7 +19,7 @@
#include <opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp>
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/grid.h>
#include <opm/core/transport/reorder/reordersequence.h>
#include <opm/core/utility/RootFinders.hpp>

2
opm/core/transport/reorder/TransportModelTwophase.cpp
View File

@ -18,7 +18,7 @@
*/
#include <opm/core/transport/reorder/TransportModelTwophase.hpp>
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/grid.h>
#include <opm/core/transport/reorder/reordersequence.h>
#include <opm/core/utility/RootFinders.hpp>

6
opm/core/utility/initState_impl.hpp
View File

@ -27,9 +27,9 @@
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/MonotCubicInterpolator.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <cmath>
namespace Opm

6
opm/core/utility/miscUtilities.cpp
View File

@ -21,9 +21,9 @@
#include <opm/core/utility/Units.hpp>
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <algorithm>
#include <functional>

2
opm/core/utility/miscUtilitiesBlackoil.cpp
View File

@ -22,7 +22,7 @@
#include <opm/core/utility/Units.hpp>
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp>

2
opm/core/wells/WellsGroup.cpp
View File

@ -20,7 +20,7 @@
#include <opm/core/wells/WellsGroup.hpp>
#include <cmath>
#include <opm/core/newwells.h>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
namespace Opm
{

2
opm/core/wells/WellsGroup.hpp
View File

@ -24,7 +24,7 @@
#include <opm/core/wells/ProductionSpecification.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/grid.h>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <string>

2
opm/core/wells/WellsManager.cpp
View File

@ -25,7 +25,7 @@
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/wells/WellCollection.hpp>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <tr1/array>
#include <algorithm>

2
tests/not-unit/bo_resprop_test.cpp
View File

@ -23,7 +23,7 @@
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/eclipse/EclipseGridInspector.hpp>
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/grid.h>
#include <algorithm>

2
tests/not-unit/pvt_test.cpp
View File

@ -25,7 +25,7 @@
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/eclipse/EclipseGridInspector.hpp>
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/grid.h>
#include <algorithm>

2
tests/not-unit/relperm_test.cpp
View File

@ -25,7 +25,7 @@
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/eclipse/EclipseGridInspector.hpp>
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/grid.h>
#include <algorithm>

4
tests/not-unit/test_ert.cpp
View File

@ -25,8 +25,8 @@
#include <opm/core/grid.h>
#include <cstdio>
#include <boost/scoped_ptr.hpp>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <ert/ecl/ecl_grid.h>

2
tests/not-unit/test_sf2p.cpp
View File

@ -3,7 +3,7 @@
#include <iostream>
#include <iterator>
#include <opm/core/fluid/SimpleFluid2p.hpp>
#include <opm/core/props/SimpleFluid2p.hpp>
template <class Ostream, typename T, size_t n>
Ostream&

2
tutorials/tutorial2.cpp
View File

@ -37,7 +37,7 @@
#include <iostream>
#include <fstream>
#include <vector>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/linalg/LinearSolverUmfpack.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/pressure/FlowBCManager.hpp>

2
tutorials/tutorial3.cpp
View File

@ -33,7 +33,7 @@
#include <opm/core/linalg/LinearSolverUmfpack.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/pressure/FlowBCManager.hpp>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/transport/reorder/TransportModelTwophase.hpp>

2
tutorials/tutorial4.cpp
View File

@ -33,7 +33,7 @@
#include <opm/core/linalg/LinearSolverUmfpack.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/pressure/FlowBCManager.hpp>
#include <opm/core/fluid/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/transport/reorder/TransportModelTwophase.hpp>