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

move ebos/eclmixingratecontrols.[hh|cc] to opm/simulators/flow

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-02 10:46:44 +01:00
parent ddb7c65f97
commit eb90588fa9
5 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@ -28,7 +28,6 @@ list (APPEND MAIN_SOURCE_FILES
ebos/eclgenericthresholdpressure.cc
ebos/eclgenerictracermodel.cc
ebos/eclgenericvanguard.cc
ebos/eclmixingratecontrols.cc
ebos/eclsolutioncontainers.cc
ebos/ecltransmissibility.cc
ebos/equil/equilibrationhelpers.cc
@ -49,6 +48,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/flow/KeywordValidation.cpp
opm/simulators/flow/LogOutputHelper.cpp
opm/simulators/flow/Main.cpp
opm/simulators/flow/MixingRateControls.cpp
opm/simulators/flow/NonlinearSolver.cpp
opm/simulators/flow/partitionCells.cpp
opm/simulators/flow/RSTConv.cpp
@ -422,7 +422,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclgenerictracermodel.hh
ebos/eclgenerictracermodel_impl.hh
ebos/eclgenericvanguard.hh
ebos/eclmixingratecontrols.hh
ebos/eclnewtonmethod.hh
ebos/eclproblem.hh
ebos/eclproblem_properties.hh
@ -459,6 +458,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/KeywordValidation.hpp
opm/simulators/flow/LogOutputHelper.hpp
opm/simulators/flow/Main.hpp
opm/simulators/flow/MixingRateControls.hpp
opm/simulators/flow/NonlinearSolver.hpp
opm/simulators/flow/OutputBlackoilModule.hpp
opm/simulators/flow/partitionCells.hpp

5
ebos/eclgenericproblem.hh
View File

@ -28,12 +28,13 @@
#ifndef EWOMS_GENERIC_ECL_PROBLEM_HH
#define EWOMS_GENERIC_ECL_PROBLEM_HH
#include <ebos/eclmixingratecontrols.hh>
#include <ebos/eclsolutioncontainers.hh>
#include <opm/material/common/UniformXTabulated2DFunction.hpp>
#include <opm/material/common/Tabulated1DFunction.hpp>
#include <opm/simulators/flow/MixingRateControls.hpp>
#include <array>
#include <cstddef>
#include <functional>
@ -370,7 +371,7 @@ protected:
std::vector<Scalar> solventRsw_;
MICPSolutionContainer<Scalar> micp_;
EclMixingRateControls<FluidSystem, Scalar> mixControls_;
MixingRateControls<FluidSystem, Scalar> mixControls_;
// time stepping parameters
bool enableTuning_;

2
ebos/eclgenericproblem_impl.hh
View File

@ -109,7 +109,7 @@ serializationTestObject(const EclipseState& eclState,
result.solventRsw_ = {18.0};
result.polymer_ = PolymerSolutionContainer<Scalar>::serializationTestObject();
result.micp_ = MICPSolutionContainer<Scalar>::serializationTestObject();
result.mixControls_ = EclMixingRateControls<FluidSystem,Scalar>::serializationTestObject(schedule);
result.mixControls_ = MixingRateControls<FluidSystem,Scalar>::serializationTestObject(schedule);
return result;
}

52
ebos/eclmixingratecontrols.cc → opm/simulators/flow/MixingRateControls.cpp
View File

@ -23,11 +23,11 @@
/*!
* \file
*
* \copydoc Opm::EclProblem
* \copydoc Opm::FlowProblem
*/
#include <config.h>
#include <ebos/eclmixingratecontrols.hh>
#include <opm/simulators/flow/MixingRateControls.hpp>
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
@ -37,25 +37,25 @@
namespace Opm {
template<class FluidSystem, class Scalar>
EclMixingRateControls<FluidSystem,Scalar>::
EclMixingRateControls(const Schedule& schedule)
MixingRateControls<FluidSystem,Scalar>::
MixingRateControls(const Schedule& schedule)
: schedule_(schedule)
{}
template<class FluidSystem, class Scalar>
EclMixingRateControls<FluidSystem,Scalar>::
EclMixingRateControls(const EclMixingRateControls& rhs)
MixingRateControls<FluidSystem,Scalar>::
MixingRateControls(const MixingRateControls& rhs)
: schedule_(rhs.schedule_)
{
*this = rhs;
}
template<class FluidSystem, class Scalar>
EclMixingRateControls<FluidSystem,Scalar>
EclMixingRateControls<FluidSystem,Scalar>::
MixingRateControls<FluidSystem,Scalar>
MixingRateControls<FluidSystem,Scalar>::
serializationTestObject(const Schedule& schedule)
{
EclMixingRateControls<FluidSystem,Scalar> result(schedule);
MixingRateControls<FluidSystem,Scalar> result(schedule);
result.lastRv_ = {21.0};
result.maxDRv_ = {22.0, 23.0};
result.convectiveDrs_ = {24.0, 25.0, 26.0};
@ -67,8 +67,8 @@ serializationTestObject(const Schedule& schedule)
}
template<class FluidSystem, class Scalar>
bool EclMixingRateControls<FluidSystem,Scalar>::
operator==(const EclMixingRateControls& rhs) const
bool MixingRateControls<FluidSystem,Scalar>::
operator==(const MixingRateControls& rhs) const
{
return this->lastRv_ == rhs.lastRv_ &&
this->maxDRv_ == rhs.maxDRv_ &&
@ -79,9 +79,9 @@ operator==(const EclMixingRateControls& rhs) const
}
template<class FluidSystem, class Scalar>
EclMixingRateControls<FluidSystem,Scalar>&
EclMixingRateControls<FluidSystem,Scalar>::
operator=(const EclMixingRateControls& rhs)
MixingRateControls<FluidSystem,Scalar>&
MixingRateControls<FluidSystem,Scalar>::
operator=(const MixingRateControls& rhs)
{
this->lastRv_ = rhs.lastRv_;
this->maxDRv_ = rhs.maxDRv_;
@ -94,7 +94,7 @@ operator=(const EclMixingRateControls& rhs)
}
template<class FluidSystem, class Scalar>
void EclMixingRateControls<FluidSystem,Scalar>::
void MixingRateControls<FluidSystem,Scalar>::
init(std::size_t numDof, int episodeIdx, const unsigned ntpvt)
{
// deal with DRSDT
@ -117,7 +117,7 @@ init(std::size_t numDof, int episodeIdx, const unsigned ntpvt)
}
template<class FluidSystem, class Scalar>
bool EclMixingRateControls<FluidSystem,Scalar>::
bool MixingRateControls<FluidSystem,Scalar>::
drsdtActive(int episodeIdx) const
{
const auto& oilVaporizationControl = schedule_[episodeIdx].oilvap();
@ -127,7 +127,7 @@ drsdtActive(int episodeIdx) const
}
template<class FluidSystem, class Scalar>
bool EclMixingRateControls<FluidSystem,Scalar>::
bool MixingRateControls<FluidSystem,Scalar>::
drvdtActive(int episodeIdx) const
{
const auto& oilVaporizationControl = schedule_[episodeIdx].oilvap();
@ -137,7 +137,7 @@ drvdtActive(int episodeIdx) const
}
template<class FluidSystem, class Scalar>
bool EclMixingRateControls<FluidSystem,Scalar>::
bool MixingRateControls<FluidSystem,Scalar>::
drsdtConvective(int episodeIdx) const
{
const auto& oilVaporizationControl = schedule_[episodeIdx].oilvap();
@ -147,7 +147,7 @@ drsdtConvective(int episodeIdx) const
}
template<class FluidSystem, class Scalar>
void EclMixingRateControls<FluidSystem,Scalar>::
void MixingRateControls<FluidSystem,Scalar>::
updateExplicitQuantities(const int episodeIdx,
const Scalar timeStepSize)
{
@ -166,7 +166,7 @@ updateExplicitQuantities(const int episodeIdx,
}
template<class FluidSystem, class Scalar>
void EclMixingRateControls<FluidSystem,Scalar>::
void MixingRateControls<FluidSystem,Scalar>::
updateLastValues(const unsigned elemIdx,
const Scalar Rs,
const Scalar Rv)
@ -181,7 +181,7 @@ updateLastValues(const unsigned elemIdx,
}
template<class FluidSystem, class Scalar>
void EclMixingRateControls<FluidSystem,Scalar>::
void MixingRateControls<FluidSystem,Scalar>::
updateMaxValues(const int episodeIdx,
const Scalar timeStepSize)
{
@ -202,7 +202,7 @@ updateMaxValues(const int episodeIdx,
}
template<class FluidSystem, class Scalar>
Scalar EclMixingRateControls<FluidSystem,Scalar>::
Scalar MixingRateControls<FluidSystem,Scalar>::
drsdtcon(const unsigned elemIdx,
int episodeIdx,
const int pvtRegionIdx) const
@ -219,7 +219,7 @@ drsdtcon(const unsigned elemIdx,
}
template<class FluidSystem, class Scalar>
Scalar EclMixingRateControls<FluidSystem,Scalar>::
Scalar MixingRateControls<FluidSystem,Scalar>::
maxGasDissolutionFactor(const unsigned timeIdx,
const unsigned globalDofIdx,
const int episodeIdx,
@ -244,7 +244,7 @@ maxGasDissolutionFactor(const unsigned timeIdx,
}
template<class FluidSystem, class Scalar>
Scalar EclMixingRateControls<FluidSystem,Scalar>::
Scalar MixingRateControls<FluidSystem,Scalar>::
maxOilVaporizationFactor(const unsigned timeIdx,
const unsigned globalDofIdx,
const int episodeIdx,
@ -263,7 +263,7 @@ maxOilVaporizationFactor(const unsigned timeIdx,
}
}
template<class FluidSystem, class Scalar>
void EclMixingRateControls<FluidSystem,Scalar>::
void MixingRateControls<FluidSystem,Scalar>::
updateConvectiveDRsDt_(const unsigned compressedDofIdx,
const Scalar t,
const Scalar p,
@ -294,6 +294,6 @@ updateConvectiveDRsDt_(const unsigned compressedDofIdx,
= permz * rssat * max(0.0, deltaDensity) * gravity / (so * visc * distZ * poro);
}
template class EclMixingRateControls<BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>, double>;
template class MixingRateControls<BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>, double>;
} // namespace Opm

22
ebos/eclmixingratecontrols.hh → opm/simulators/flow/MixingRateControls.hpp
View File

@ -23,10 +23,10 @@
/*!
* \file
*
* \copydoc Opm::EclProblem
* \copydoc Opm::FlowProblem
*/
#ifndef ECL_MIXING_RATE_CONTROLS_HH
#define ECL_MIXING_RATE_CONTROLS_HH
#ifndef OPM_MIXING_RATE_CONTROLS_HPP
#define OPM_MIXING_RATE_CONTROLS_HPP
#include <opm/input/eclipse/Schedule/Schedule.hpp>
@ -40,17 +40,17 @@ namespace Opm {
class EclipseState;
//! \brief Class handling mixing rate controls for an EclProblem.
//! \brief Class handling mixing rate controls for a FlowProblem.
template<class FluidSystem, class Scalar>
class EclMixingRateControls {
class MixingRateControls {
public:
EclMixingRateControls(const Schedule& schedule);
EclMixingRateControls(const EclMixingRateControls& rhs);
MixingRateControls(const Schedule& schedule);
MixingRateControls(const MixingRateControls& rhs);
static EclMixingRateControls serializationTestObject(const Schedule& schedule);
static MixingRateControls serializationTestObject(const Schedule& schedule);
bool operator==(const EclMixingRateControls& rhs) const;
EclMixingRateControls& operator=(const EclMixingRateControls& rhs);
bool operator==(const MixingRateControls& rhs) const;
MixingRateControls& operator=(const MixingRateControls& rhs);
void init(std::size_t numDof, int episodeIdx, const unsigned ntpvt);
@ -180,4 +180,4 @@ private:
} // namespace Opm
#endif
#endif // OPM_MIXING_RATE_CONTROLS_HPP