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

Simplify setting of FOAM options

Browse Source
This commit is contained in:
Joakim Hove 2021-07-28 14:29:51 +02:00
parent 04a4cf46d9
commit 7c986e6891
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp
View File

@ -21,6 +21,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/common/utility/OpmInputError.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/F.hpp>
@ -132,20 +133,18 @@ FoamConfig::FoamConfig(const Deck& deck)
// setup for foam at this point, so we detect and deal with it here even though we
// do not store any data related to it.
const auto& kw_foamopts = deck.getKeyword<ParserKeywords::FOAMOPTS>();
transport_phase_ = get_phase(kw_foamopts.getRecord(0).getItem(0).get<std::string>(0));
std::string mobModel = kw_foamopts.getRecord(0).getItem(1).get<std::string>(0);
if (mobModel.empty()) {
if (transport_phase_ == Phase::GAS) {
mobility_model_ = MobilityModel::TAB;
} else if (transport_phase_ == Phase::WATER) {
mobility_model_ = MobilityModel::FUNC;
}
} else if (mobModel == "TAB") {
mobility_model_ = MobilityModel::TAB;
} else if (mobModel == "FUNC") {
mobility_model_ = MobilityModel::FUNC;
this->transport_phase_ = get_phase(kw_foamopts.getRecord(0).getItem(0).get<std::string>(0));
if (!(this->transport_phase_ == Phase::GAS || this->transport_phase_ == Phase::WATER))
throw OpmInputError("Only WATER and GAS phases are allowed for foam transport", kw_foamopts.location());
this->mobility_model_ = MobilityModel::TAB;
if (this->transport_phase_ == Phase::WATER) {
auto mobModel = kw_foamopts.getRecord(0).getItem(1).get<std::string>(0);
if (mobModel == "FUNC")
this->mobility_model_ = MobilityModel::FUNC;
}
}
if (deck.hasKeyword<ParserKeywords::FOAMFSC>()) {
const auto& kw_foamfsc = deck.getKeyword<ParserKeywords::FOAMFSC>();
const auto& kw_foamrock = deck.getKeyword<ParserKeywords::FOAMROCK>();