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

remove macro EWOMS_GET_PARAM

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-04-05 10:27:52 +02:00
parent 4d2486196f
commit 078b0e8679
51 changed files with 268 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/problems/co2injectionproblem.hh
View File

@@ -311,16 +311,16 @@ public:
eps_ = 1e-6;
temperatureLow_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemTemperatureLow);
temperatureHigh_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemTemperatureHigh);
nTemperature_ = EWOMS_GET_PARAM(TypeTag, unsigned, FluidSystemNumTemperature);
temperatureLow_ = Parameters::get<TypeTag, Properties::FluidSystemTemperatureLow>();
temperatureHigh_ = Parameters::get<TypeTag, Properties::FluidSystemTemperatureHigh>();
nTemperature_ = Parameters::get<TypeTag, Properties::FluidSystemNumTemperature>();
pressureLow_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemPressureLow);
pressureHigh_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemPressureHigh);
nPressure_ = EWOMS_GET_PARAM(TypeTag, unsigned, FluidSystemNumPressure);
pressureLow_ = Parameters::get<TypeTag, Properties::FluidSystemPressureLow>();
pressureHigh_ = Parameters::get<TypeTag, Properties::FluidSystemPressureHigh>();
nPressure_ = Parameters::get<TypeTag, Properties::FluidSystemNumPressure>();
maxDepth_ = EWOMS_GET_PARAM(TypeTag, Scalar, MaxDepth);
temperature_ = EWOMS_GET_PARAM(TypeTag, Scalar, Temperature);
maxDepth_ = Parameters::get<TypeTag, Properties::MaxDepth>();
temperature_ = Parameters::get<TypeTag, Properties::Temperature>();
// initialize the tables of the fluid system
// FluidSystem::init();
@@ -404,7 +404,7 @@ public:
std::string name() const
{
std::ostringstream oss;
oss << EWOMS_GET_PARAM(TypeTag, std::string, SimulationName)
oss << Parameters::get<TypeTag, Properties::SimulationName>()
<< "_" << Model::name();
if (getPropValue<TypeTag, Properties::EnableEnergy>())
oss << "_ni";

14
examples/problems/co2ptflashproblem.hh
View File

@@ -353,7 +353,7 @@ public:
explicit CO2PTProblem(Simulator& simulator)
: ParentType(simulator)
{
const Scalar epi_len = EWOMS_GET_PARAM(TypeTag, Scalar, EpisodeLength);
const Scalar epi_len = Parameters::get<TypeTag, Properties::EpisodeLength>();
simulator.setEpisodeLength(epi_len);
FluidSystem::init();
using CompParm = typename FluidSystem::ComponentParam;
@@ -371,7 +371,7 @@ public:
void initPetrophysics()
{
temperature_ = EWOMS_GET_PARAM(TypeTag, Scalar, Temperature);
temperature_ = Parameters::get<TypeTag, Properties::Temperature>();
K_ = this->toDimMatrix_(9.869232667160131e-14);
porosity_ = 0.1;
@@ -422,7 +422,7 @@ public:
std::string name() const
{
std::ostringstream oss;
oss << EWOMS_GET_PARAM(TypeTag, std::string, SimulationName);
oss << Parameters::get<TypeTag, Properties::SimulationName>();
return oss.str();
}
@@ -431,7 +431,7 @@ public:
// the old one.
void endEpisode()
{
Scalar epi_len = EWOMS_GET_PARAM(TypeTag, Scalar, EpisodeLength);
Scalar epi_len = Parameters::get<TypeTag, Properties::EpisodeLength>();
this->simulator().startNextEpisode(epi_len);
}
@@ -507,7 +507,7 @@ public:
{
int spatialIdx = context.globalSpaceIndex(spaceIdx, timeIdx);
int inj = 0;
int prod = EWOMS_GET_PARAM(TypeTag, unsigned, CellsX) - 1;
int prod = Parameters::get<TypeTag, Properties::CellsX>() - 1;
if (spatialIdx == inj || spatialIdx == prod) {
return 1.0;
} else {
@@ -558,7 +558,7 @@ private:
// p0 = 75e5
// T0 = 423.25
int inj = 0;
int prod = EWOMS_GET_PARAM(TypeTag, unsigned, CellsX) - 1;
int prod = Parameters::get<TypeTag, Properties::CellsX>() - 1;
int spatialIdx = context.globalSpaceIndex(spaceIdx, timeIdx);
ComponentVector comp;
comp[0] = Evaluation::createVariable(0.5, 1);
@@ -573,7 +573,7 @@ private:
sat[0] = 1.0;
sat[1] = 1.0 - sat[0];
Scalar p0 = EWOMS_GET_PARAM(TypeTag, Scalar, Initialpressure);
Scalar p0 = Parameters::get<TypeTag, Properties::Initialpressure>();
//\Note, for an AD variable, if we multiply it with 2, the derivative will also be scalced with 2,
//\Note, so we should not do it.

2
examples/problems/fingerproblem.hh
View File

@@ -558,7 +558,7 @@ private:
auto& fs = initialFluidState_;
fs.setPressure(wettingPhaseIdx, /*pressure=*/1e5);
Scalar Sw = EWOMS_GET_PARAM(TypeTag, Scalar, InitialWaterSaturation);
Scalar Sw = Parameters::get<TypeTag, Properties::InitialWaterSaturation>();
fs.setSaturation(wettingPhaseIdx, Sw);
fs.setSaturation(nonWettingPhaseIdx, 1 - Sw);

16
examples/problems/groundwaterproblem.hh
View File

@@ -240,20 +240,20 @@ public:
eps_ = 1.0e-3;
lensLowerLeft_[0] = EWOMS_GET_PARAM(TypeTag, Scalar, LensLowerLeftX);
lensLowerLeft_[0] = Parameters::get<TypeTag, Properties::LensLowerLeftX>();
if (dim > 1)
lensLowerLeft_[1] = EWOMS_GET_PARAM(TypeTag, Scalar, LensLowerLeftY);
lensLowerLeft_[1] = Parameters::get<TypeTag, Properties::LensLowerLeftY>();
if (dim > 2)
lensLowerLeft_[2] = EWOMS_GET_PARAM(TypeTag, Scalar, LensLowerLeftY);
lensLowerLeft_[2] = Parameters::get<TypeTag, Properties::LensLowerLeftY>();
lensUpperRight_[0] = EWOMS_GET_PARAM(TypeTag, Scalar, LensUpperRightX);
lensUpperRight_[0] = Parameters::get<TypeTag, Properties::LensUpperRightX>();
if (dim > 1)
lensUpperRight_[1] = EWOMS_GET_PARAM(TypeTag, Scalar, LensUpperRightY);
lensUpperRight_[1] = Parameters::get<TypeTag, Properties::LensUpperRightY>();
if (dim > 2)
lensUpperRight_[2] = EWOMS_GET_PARAM(TypeTag, Scalar, LensUpperRightY);
lensUpperRight_[2] = Parameters::get<TypeTag, Properties::LensUpperRightY>();
intrinsicPerm_ = this->toDimMatrix_(EWOMS_GET_PARAM(TypeTag, Scalar, Permeability));
intrinsicPermLens_ = this->toDimMatrix_(EWOMS_GET_PARAM(TypeTag, Scalar, PermeabilityLens));
intrinsicPerm_ = this->toDimMatrix_(Parameters::get<TypeTag, Properties::Permeability>());
intrinsicPermLens_ = this->toDimMatrix_(Parameters::get<TypeTag, Properties::PermeabilityLens>());
}
/*!

12
examples/problems/lensproblem.hh
View File

@@ -321,14 +321,14 @@ public:
FluidSystem::init();
temperature_ = 273.15 + 20; // -> 20°C
lensLowerLeft_[0] = EWOMS_GET_PARAM(TypeTag, Scalar, LensLowerLeftX);
lensLowerLeft_[1] = EWOMS_GET_PARAM(TypeTag, Scalar, LensLowerLeftY);
lensUpperRight_[0] = EWOMS_GET_PARAM(TypeTag, Scalar, LensUpperRightX);
lensUpperRight_[1] = EWOMS_GET_PARAM(TypeTag, Scalar, LensUpperRightY);
lensLowerLeft_[0] = Parameters::get<TypeTag, Properties::LensLowerLeftX>();
lensLowerLeft_[1] = Parameters::get<TypeTag, Properties::LensLowerLeftY>();
lensUpperRight_[0] = Parameters::get<TypeTag, Properties::LensUpperRightX>();
lensUpperRight_[1] = Parameters::get<TypeTag, Properties::LensUpperRightY>();
if (dimWorld == 3) {
lensLowerLeft_[2] = EWOMS_GET_PARAM(TypeTag, Scalar, LensLowerLeftZ);
lensUpperRight_[2] = EWOMS_GET_PARAM(TypeTag, Scalar, LensUpperRightZ);
lensLowerLeft_[2] = Parameters::get<TypeTag, Properties::LensLowerLeftZ>();
lensUpperRight_[2] = Parameters::get<TypeTag, Properties::LensUpperRightZ>();
}
// residual saturations

6
examples/problems/reservoirproblem.hh
View File

@@ -262,9 +262,9 @@ public:
{
ParentType::finishInit();
temperature_ = EWOMS_GET_PARAM(TypeTag, Scalar, Temperature);
maxDepth_ = EWOMS_GET_PARAM(TypeTag, Scalar, MaxDepth);
wellWidth_ = EWOMS_GET_PARAM(TypeTag, Scalar, WellWidth);
temperature_ = Parameters::get<TypeTag, Properties::Temperature>();
maxDepth_ = Parameters::get<TypeTag, Properties::MaxDepth>();
wellWidth_ = Parameters::get<TypeTag, Properties::WellWidth>();
std::vector<std::pair<Scalar, Scalar> > Bo = {
{ 101353, 1.062 },