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

further cleaning up

Browse Source
This commit is contained in:
Kai Bao 2021-12-01 15:57:57 +01:00 committed by Trine Mykkeltvedt
parent a6b04e8cf0
commit e685864c1f
3 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
opm/material/fluidsystems/chifluid/twophasefluidsystem.hh
View File

@ -57,10 +57,10 @@ namespace Opm {
* \brief A two-phase fluid system with three components * \brief A two-phase fluid system with three components
*/ */
template <class Scalar> template <class Scalar>
class TwoPhaseThreeComponentFluidSystem class TwoPhaseTwoComponentFluidSystem
: public Opm::BaseFluidSystem<Scalar, TwoPhaseThreeComponentFluidSystem<Scalar> > : public Opm::BaseFluidSystem<Scalar, TwoPhaseTwoComponentFluidSystem<Scalar> >
{ {
using ThisType = TwoPhaseThreeComponentFluidSystem<Scalar>; using ThisType = TwoPhaseTwoComponentFluidSystem<Scalar>;
using PengRobinsonMixture = typename Opm::PengRobinsonMixture<Scalar, ThisType>; using PengRobinsonMixture = typename Opm::PengRobinsonMixture<Scalar, ThisType>;
using LBCviscosity = typename Opm::LBCviscosity<Scalar, ThisType>; using LBCviscosity = typename Opm::LBCviscosity<Scalar, ThisType>;
@ -123,56 +123,6 @@ public:
using Comp0 = Opm::ChiwomsBrine<Scalar>; using Comp0 = Opm::ChiwomsBrine<Scalar>;
using Comp1 = Opm::ChiwomsCO2<Scalar>; using Comp1 = Opm::ChiwomsCO2<Scalar>;
static void init(Scalar minT = 273.15,
Scalar maxT = 373.15,
Scalar minP = 1e4,
Scalar maxP = 100e6)
{
Opm::PengRobinsonParamsMixture<Scalar, ThisType, oilPhaseIdx, /*useSpe5=*/false> prParams;
// find envelopes of the 'a' and 'b' parameters for the range
// minT <= T <= maxT and minP <= p <= maxP. For
// this we take advantage of the fact that 'a' and 'b' for
// mixtures is just a convex combination of the attractive and
// repulsive parameters of the pure components
Scalar minA = 1e30, maxA = -1e30;
Scalar minB = 1e30, maxB = -1e30;
prParams.updatePure(minT, minP);
for (unsigned compIdx = 0; compIdx < numComponents; ++compIdx) {
minA = std::min(prParams.pureParams(compIdx).a(), minA);
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
};
prParams.updatePure(maxT, minP);
for (unsigned compIdx = 0; compIdx < numComponents; ++compIdx) {
minA = std::min(prParams.pureParams(compIdx).a(), minA);
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
};
prParams.updatePure(minT, maxP);
for (unsigned compIdx = 0; compIdx < numComponents; ++compIdx) {
minA = std::min(prParams.pureParams(compIdx).a(), minA);
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
};
prParams.updatePure(maxT, maxP);
for (unsigned compIdx = 0; compIdx < numComponents; ++compIdx) {
minA = std::min(prParams.pureParams(compIdx).a(), minA);
maxA = std::max(prParams.pureParams(compIdx).a(), maxA);
minB = std::min(prParams.pureParams(compIdx).b(), minB);
maxB = std::max(prParams.pureParams(compIdx).b(), maxB);
};
// PengRobinson::init(/*aMin=*/minA, /*aMax=*/maxA, /*na=*/100,
// /*bMin=*/minB, /*bMax=*/maxB, /*nb=*/200);
}
//! \copydoc BaseFluidSystem::componentName //! \copydoc BaseFluidSystem::componentName
static const char* componentName(unsigned compIdx) static const char* componentName(unsigned compIdx)

2
tests/test_chiflash.cpp
View File

@ -43,7 +43,7 @@
void testChiFlash() void testChiFlash()
{ {
using Scalar = double; using Scalar = double;
using FluidSystem = Opm::TwoPhaseThreeComponentFluidSystem<Scalar>; using FluidSystem = Opm::TwoPhaseTwoComponentFluidSystem<Scalar>;
constexpr auto numComponents = FluidSystem::numComponents; constexpr auto numComponents = FluidSystem::numComponents;
using Evaluation = Opm::DenseAd::Evaluation<double, numComponents>; using Evaluation = Opm::DenseAd::Evaluation<double, numComponents>;

2
tests/test_chiflash_scalar.cpp
View File

@ -45,7 +45,7 @@ void testChiFlash()
using Scalar = double; using Scalar = double;
using FluidSystem = Opm::TwoPhaseThreeComponentFluidSystem<Scalar>; using FluidSystem = Opm::TwoPhaseTwoComponentFluidSystem<Scalar>;
constexpr auto numComponents = FluidSystem::numComponents; constexpr auto numComponents = FluidSystem::numComponents;
//using Evaluation = Opm::DenseAd::Evaluation<double, numComponents>; //using Evaluation = Opm::DenseAd::Evaluation<double, numComponents>;