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

use monotonic splines for the black-oil curves

Browse Source
This commit is contained in:
Andreas Lauser
2013-09-24 19:21:33 +02:00
parent 7605bd2aa5
commit 6c3fe32feb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/material/fluidsystems/BlackOilFluidSystem.hpp
View File

@@ -129,7 +129,7 @@ public:
// undersaturated oil
//SplineSamplingPoints tmp(samplePoints.begin(), --samplePoints.end());
SplineSamplingPoints tmp(samplePoints.begin(), samplePoints.end());
gasFormationFactorSpline_.setContainerOfTuples(tmp);
gasFormationFactorSpline_.setContainerOfTuples(tmp, /*type=*/Spline::Monotonic);
}
/*!
@@ -139,7 +139,7 @@ public:
*/
static void setOilFormationVolumeFactor(const SplineSamplingPoints &samplePoints)
{
oilFormationVolumeFactorSpline_.setContainerOfTuples(samplePoints);
oilFormationVolumeFactorSpline_.setContainerOfTuples(samplePoints, /*type=*/Spline::Monotonic);
assert(oilFormationVolumeFactorSpline_.monotonic());
}
@@ -165,7 +165,7 @@ public:
*/
static void setOilViscosity(const SplineSamplingPoints &samplePoints)
{
oilViscositySpline_.setContainerOfTuples(samplePoints);
oilViscositySpline_.setContainerOfTuples(samplePoints, /*type=*/Spline::Monotonic);
assert(oilViscositySpline_.monotonic());
}
@@ -195,7 +195,7 @@ public:
*/
static void setGasViscosity(const SplineSamplingPoints &samplePoints)
{
gasViscositySpline_.setContainerOfTuples(samplePoints);
gasViscositySpline_.setContainerOfTuples(samplePoints, /*type=*/Spline::Monotonic);
assert(gasViscositySpline_.monotonic());
}
@@ -252,7 +252,7 @@ public:
std::pair<Scalar, Scalar> val(X_oG, pSat);
pSatSamplePoints.push_back(val);;
};
saturationPressureSpline_.setContainerOfTuples(pSatSamplePoints);
saturationPressureSpline_.setContainerOfTuples(pSatSamplePoints, /*type=*/Spline::Monotonic);
#if 0
{
@@ -289,7 +289,7 @@ public:
//! \copydoc BaseFluidSystem::isLiquid
static bool isLiquid(const int phaseIdx)
{
// assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= phaseIdx && phaseIdx < numPhases);
return phaseIdx != gPhaseIdx;
}