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

Merge pull request #5178 from akva2/baseaquifermodel_move

Browse Source 
move ebos/eclbaseaquifermodel.hh to opm/simulators/flow
This commit is contained in:
Kai Bao 2024-03-06 12:47:51 +01:00 committed by GitHub
commit 75f38ca726
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -410,7 +410,6 @@ list (APPEND TEST_DATA_FILES
# find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
list (APPEND PUBLIC_HEADER_FILES
ebos/ebos.hh
ebos/eclbaseaquifermodel.hh
ebos/eclbasevanguard.hh
ebos/eclcpgridvanguard.hh
ebos/eclequilinitializer.hh
@ -442,6 +441,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/AluGridCartesianIndexMapper.hpp
opm/simulators/flow/AluGridVanguard.hpp
opm/simulators/flow/Banners.hpp
opm/simulators/flow/BaseAquiferModel.hpp
opm/simulators/flow/BlackoilModel.hpp
opm/simulators/flow/BlackoilModelNldd.hpp
opm/simulators/flow/BlackoilModelParameters.hpp

2
ebos/eclproblem.hh
View File

@ -34,7 +34,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <ebos/eclbaseaquifermodel.hh>
#include <ebos/eclcpgridvanguard.hh>
#include <ebos/eclequilinitializer.hh>
#include <ebos/eclfluxmodule.hh>
@ -81,6 +80,7 @@
#include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/simulators/flow/ActionHandler.hpp>
#include <opm/simulators/flow/BaseAquiferModel.hpp>
#include <opm/simulators/flow/DummyGradientCalculator.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>

4
ebos/eclproblem_properties.hh
View File

@ -28,7 +28,6 @@
#ifndef ECL_PROBLEM_PROPERTIES_HH
#define ECL_PROBLEM_PROPERTIES_HH
#include <ebos/eclbaseaquifermodel.hh>
#include <ebos/eclcpgridvanguard.hh>
#include <ebos/eclfluxmodule.hh>
#include <ebos/eclnewtonmethod.hh>
@ -47,6 +46,7 @@
#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
#include <opm/models/utils/propertysystem.hh>
#include <opm/simulators/flow/BaseAquiferModel.hpp>
#include <opm/simulators/flow/DummyGradientCalculator.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp>
@ -243,7 +243,7 @@ public:
// by default use the dummy aquifer "model"
template<class TypeTag>
struct AquiferModel<TypeTag, TTag::EclBaseProblem> {
using type = EclBaseAquiferModel<TypeTag>;
using type = BaseAquiferModel<TypeTag>;
};
// Enable gravity

4
opm/simulators/aquifers/BlackoilAquiferModel.hpp
View File

@ -24,8 +24,6 @@
#ifndef OPM_BLACKOILAQUIFERMODEL_HEADER_INCLUDED
#define OPM_BLACKOILAQUIFERMODEL_HEADER_INCLUDED
#include <ebos/eclbaseaquifermodel.hh>
#include <opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp>
#include <opm/input/eclipse/EclipseState/Aquifer/AquiferCT.hpp>
#include <opm/input/eclipse/EclipseState/Aquifer/Aquifetp.hpp>
@ -36,6 +34,8 @@
#include <opm/simulators/aquifers/AquiferFetkovich.hpp>
#include <opm/simulators/aquifers/AquiferNumerical.hpp>
#include <opm/simulators/flow/BaseAquiferModel.hpp>
#include <opm/grid/CpGrid.hpp>
#include <opm/grid/polyhedralgrid.hh>
#if HAVE_DUNE_ALUGRID

18
ebos/eclbaseaquifermodel.hh → opm/simulators/flow/BaseAquiferModel.hpp
View File

@ -22,10 +22,10 @@
*/
/*!
* \file
* \copydoc Opm::EclBaseAquiferModel
* \copydoc Opm::BaseAquiferModel
*/
#ifndef EWOMS_ECL_BASE_AQUIFER_MODEL_HH
#define EWOMS_ECL_BASE_AQUIFER_MODEL_HH
#ifndef OPM_BASE_AQUIFER_MODEL_HPP
#define OPM_BASE_AQUIFER_MODEL_HPP
#include <opm/models/discretization/common/fvbaseproperties.hh>
#include <opm/models/utils/basicproperties.hh>
@ -33,14 +33,12 @@
#include <opm/output/data/Aquifer.hpp>
#include <exception>
#include <stdexcept>
#include <vector>
namespace Opm {
/*!
* \ingroup EclBaseAquiferModel
* \ingroup BaseAquiferModel
*
* \brief The base class which specifies the API of aquifer models.
*
@ -48,13 +46,13 @@ namespace Opm {
* anything on its own.
*/
template <class TypeTag>
class EclBaseAquiferModel
class BaseAquiferModel
{
using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using RateVector = GetPropType<TypeTag, Properties::RateVector>;
public:
EclBaseAquiferModel(Simulator& simulator)
BaseAquiferModel(Simulator& simulator)
: simulator_(simulator)
{}
@ -151,15 +149,13 @@ public:
void deserialize(Restarter&)
{ }
data::Aquifers aquiferData() const
{ return data::Aquifers{}; }
protected:
Simulator& simulator_;
};
} // namespace Opm
#endif
#endif // OPM_BASE_AQUIFER_MODEL_HPP