OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

BlackoilModelParametersEbos: rename to BlackoilModelParameters

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-01-31 14:14:50 +01:00
parent abdf92c959
commit dd92a7446c
12 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@@ -439,7 +439,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/priVarsPacking.hpp opm/simulators/flow/priVarsPacking.hpp
opm/simulators/flow/BlackoilModelEbos.hpp opm/simulators/flow/BlackoilModelEbos.hpp
opm/simulators/flow/BlackoilModelEbosNldd.hpp opm/simulators/flow/BlackoilModelEbosNldd.hpp
opm/simulators/flow/BlackoilModelParametersEbos.hpp opm/simulators/flow/BlackoilModelParameters.hpp
opm/simulators/flow/Banners.hpp opm/simulators/flow/Banners.hpp
opm/simulators/flow/ConvergenceOutputConfiguration.hpp opm/simulators/flow/ConvergenceOutputConfiguration.hpp
opm/simulators/flow/EclActionHandler.hpp opm/simulators/flow/EclActionHandler.hpp

2
ebos/ebos.hh
View File

@@ -193,7 +193,7 @@ public:
{ {
ParentType::registerParameters(); ParentType::registerParameters();
BlackoilModelParametersEbos<TypeTag>::registerParameters(); BlackoilModelParameters<TypeTag>::registerParameters();
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableTerminalOutput, "Do *NOT* use!"); EWOMS_REGISTER_PARAM(TypeTag, bool, EnableTerminalOutput, "Do *NOT* use!");
EWOMS_HIDE_PARAM(TypeTag, DbhpMaxRel); EWOMS_HIDE_PARAM(TypeTag, DbhpMaxRel);
EWOMS_HIDE_PARAM(TypeTag, DwellFractionMax); EWOMS_HIDE_PARAM(TypeTag, DwellFractionMax);

4
ebos/eclbasevanguard.hh
View File

@@ -40,9 +40,7 @@
#include <opm/models/utils/parametersystem.hh> #include <opm/models/utils/parametersystem.hh>
#include <opm/models/utils/propertysystem.hh> #include <opm/models/utils/propertysystem.hh>
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp> #include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <array> #include <array>
#include <cstddef> #include <cstddef>

4
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@@ -40,7 +40,7 @@
#include <opm/simulators/aquifers/AquiferGridUtils.hpp> #include <opm/simulators/aquifers/AquiferGridUtils.hpp>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp> #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/flow/BlackoilModelEbosNldd.hpp> #include <opm/simulators/flow/BlackoilModelEbosNldd.hpp>
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp> #include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/flow/countGlobalCells.hpp> #include <opm/simulators/flow/countGlobalCells.hpp>
#include <opm/simulators/flow/NonlinearSolverEbos.hpp> #include <opm/simulators/flow/NonlinearSolverEbos.hpp>
#include <opm/simulators/flow/RSTConv.hpp> #include <opm/simulators/flow/RSTConv.hpp>
@@ -165,7 +165,7 @@ namespace Opm {
{ {
public: public:
// --------- Types and enums --------- // --------- Types and enums ---------
using ModelParameters = BlackoilModelParametersEbos<TypeTag>; using ModelParameters = BlackoilModelParameters<TypeTag>;
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;

2
opm/simulators/flow/BlackoilModelEbosNldd.hpp
View File

@@ -81,7 +81,7 @@ public:
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
using Indices = GetPropType<TypeTag, Properties::Indices>; using Indices = GetPropType<TypeTag, Properties::Indices>;
using ModelParameters = BlackoilModelParametersEbos<TypeTag>; using ModelParameters = BlackoilModelParameters<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;

10
opm/simulators/flow/BlackoilModelParametersEbos.hpp → opm/simulators/flow/BlackoilModelParameters.hpp
View File

@@ -17,8 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED #ifndef OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
#define OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED #define OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
#include <opm/models/discretization/common/fvbaseproperties.hh> #include <opm/models/discretization/common/fvbaseproperties.hh>
@@ -463,7 +463,7 @@ namespace Opm
{ {
/// Solver parameters for the BlackoilModel. /// Solver parameters for the BlackoilModel.
template <class TypeTag> template <class TypeTag>
struct BlackoilModelParametersEbos struct BlackoilModelParameters
{ {
private: private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -595,7 +595,7 @@ namespace Opm
bool write_partitions_{false}; bool write_partitions_{false};
/// Construct from user parameters or defaults. /// Construct from user parameters or defaults.
BlackoilModelParametersEbos() BlackoilModelParameters()
{ {
dbhp_max_rel_= EWOMS_GET_PARAM(TypeTag, Scalar, DbhpMaxRel); dbhp_max_rel_= EWOMS_GET_PARAM(TypeTag, Scalar, DbhpMaxRel);
dwell_fraction_max_ = EWOMS_GET_PARAM(TypeTag, Scalar, DwellFractionMax); dwell_fraction_max_ = EWOMS_GET_PARAM(TypeTag, Scalar, DwellFractionMax);
@@ -715,4 +715,4 @@ namespace Opm
}; };
} // namespace Opm } // namespace Opm
#endif // OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED #endif // OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED

2
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -26,7 +26,7 @@
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp> #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/flow/BlackoilModelEbos.hpp> #include <opm/simulators/flow/BlackoilModelEbos.hpp>
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp> #include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp> #include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp>
#include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp> #include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp>
#include <opm/simulators/flow/NonlinearSolverEbos.hpp> #include <opm/simulators/flow/NonlinearSolverEbos.hpp>

2
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@@ -35,7 +35,7 @@
#include <opm/models/common/multiphasebaseproperties.hh> #include <opm/models/common/multiphasebaseproperties.hh>
#include <opm/models/utils/parametersystem.hh> #include <opm/models/utils/parametersystem.hh>
#include <opm/models/utils/propertysystem.hh> #include <opm/models/utils/propertysystem.hh>
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp> #include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp> #include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp>
#include <opm/simulators/linalg/FlowLinearSolverParameters.hpp> #include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
#include <opm/simulators/linalg/matrixblock.hh> #include <opm/simulators/linalg/matrixblock.hh>

2
opm/simulators/wells/BlackoilWellModel.hpp
View File

@@ -96,7 +96,7 @@ namespace Opm {
{ {
public: public:
// --------- Types --------- // --------- Types ---------
typedef BlackoilModelParametersEbos<TypeTag> ModelParameters; using ModelParameters = BlackoilModelParameters<TypeTag>;
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>; using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;

4
opm/simulators/wells/WellInterface.hpp
View File

@@ -39,7 +39,7 @@ namespace Opm {
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp> #include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp> #include <opm/simulators/wells/BlackoilWellModel.hpp>
#include <opm/simulators/wells/GasLiftGroupInfo.hpp> #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
@@ -78,7 +78,7 @@ class WellInterface : public WellInterfaceIndices<GetPropType<TypeTag, Propertie
GetPropType<TypeTag, Properties::Indices>, GetPropType<TypeTag, Properties::Indices>,
GetPropType<TypeTag, Properties::Scalar>>; GetPropType<TypeTag, Properties::Scalar>>;
public: public:
using ModelParameters = BlackoilModelParametersEbos<TypeTag>; using ModelParameters = BlackoilModelParameters<TypeTag>;
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;

4
tests/test_equil.cc
View File

@@ -39,7 +39,7 @@
#include <opm/models/utils/start.hh> #include <opm/models/utils/start.hh>
#include <opm/simulators/linalg/parallelbicgstabbackend.hh> #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp> #include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp> #include <opm/simulators/wells/BlackoilWellModel.hpp>
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
@@ -238,7 +238,7 @@ struct EquilFixture {
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
Opm::EclGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>()); Opm::EclGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>());
Opm::BlackoilModelParametersEbos<TypeTag>::registerParameters(); Opm::BlackoilModelParameters<TypeTag>::registerParameters();
Opm::AdaptiveTimeSteppingEbos<TypeTag>::registerParameters(); Opm::AdaptiveTimeSteppingEbos<TypeTag>::registerParameters();
Opm::Parameters::registerParam<TypeTag, bool>("EnableTerminalOutput", Opm::Parameters::registerParam<TypeTag, bool>("EnableTerminalOutput",
"EnableTerminalOutput", "EnableTerminalOutput",

4
tests/test_wellmodel.cpp
View File

@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) {
const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep); const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep);
BOOST_CHECK_EQUAL( wells_ecl.size(), 2); BOOST_CHECK_EQUAL( wells_ecl.size(), 2);
const Opm::Well& well = wells_ecl[1]; const Opm::Well& well = wells_ecl[1];
const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param; const Opm::BlackoilModelParameters<Opm::Properties::TTag::EclFlowProblem> param;
// For the conversion between the surface volume rate and resrevoir voidage rate // For the conversion between the surface volume rate and resrevoir voidage rate
typedef Opm::BlackOilFluidSystem<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
@@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) {
{ {
const int nw = wells_ecl.size(); const int nw = wells_ecl.size();
const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param; const Opm::BlackoilModelParameters<Opm::Properties::TTag::EclFlowProblem> param;
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
// For the conversion between the surface volume rate and resrevoir voidage rate // For the conversion between the surface volume rate and resrevoir voidage rate