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

Merge pull request #207 from andlaus/SCALECRS-from-EclipseState

Browse Source 
Scalecrs from eclipse state
This commit is contained in:
Andreas Lauser 2017-02-24 17:33:22 +01:00 committed by GitHub
commit 9d6a620680
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
opm/material/fluidmatrixinteractions/EclEpsConfig.hpp
View File

@ -33,9 +33,11 @@
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#endif
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/Exceptions.hpp>
#endif
#include <opm/common/Unused.hpp>
#include <string>
#include <cassert>
@ -160,12 +162,13 @@ public:
*
* This requires that the opm-parser module is available.
*/
void initFromDeck(const Opm::Deck& deck,
void initFromDeck(const Opm::Deck& deck OPM_UNUSED,
const Opm::EclipseState& eclState,
Opm::EclTwoPhaseSystemType twoPhaseSystemType)
{
const auto& endscale = eclState.runspec().endpointScaling();
// find out if endpoint scaling is used in the first place
if (!deck.hasKeyword("ENDSCALE")) {
if (!endscale) {
// it is not used, i.e., just set all enable$Foo attributes to 0 and be done
// with it.
enableSatScaling_ = false;
@ -180,26 +183,7 @@ public:
// endpoint scaling is used, i.e., at least saturation scaling needs to be enabled
enableSatScaling_ = true;
// check if three-point scaling is to be used for the saturations of the relative
// permeabilities
if (deck.hasKeyword("SCALECRS")) {
// if the deck features the SCALECRS keyword, it must be set to 'YES'
const auto& scalecrsKeyword = deck.getKeyword("SCALECRS");
std::string scalecrsValue =
scalecrsKeyword.getRecord(0).getItem("VALUE").get< std::string >(0);
// convert the value of the SCALECRS keyword to upper case, just to be sure
std::transform(scalecrsValue.begin(),
scalecrsValue.end(),
scalecrsValue.begin(),
::toupper);
if (scalecrsValue == "YES" || scalecrsValue == "Y")
enableThreePointKrSatScaling_ = true;
else
enableThreePointKrSatScaling_ = false;
}
else
enableThreePointKrSatScaling_ = false;
enableThreePointKrSatScaling_ = endscale.threepoint();
auto& props = eclState.get3DProperties();
// check if we are supposed to scale the Y axis of the capillary pressure