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

TableManager and Deck are now used as references, hid GridProperties

Browse Source 
* Added keyword "OPERNUM" to supported keywords in Eclipse3DProperties
* Updated tests to use Eclipse3DProperties API instead of GridProperties
* Moved init sequence of title into constructor
* ThresholdPressure and SimulationConfig now tasks Deck ref instead of shared_ptr
* Removed obsolete test and unused tests that tested gridProperties
* Refactor use of TableManager.  Is now a reference.
* Added non-const GridProperties.getKeyword(size_t i)
This commit is contained in:
Pål Grønås Drange
2016-04-01 15:27:40 +02:00
parent 3680dfcb97
commit 21f94c0606
18 changed files with 425 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp
View File

@@ -21,6 +21,7 @@
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/C.hpp>
@@ -46,14 +47,14 @@
namespace Opm {
SimulationConfig::SimulationConfig(const ParseContext& parseContext,
DeckConstPtr deck,
GridProperties<int>& gridProperties) :
const Deck& deck,
const Eclipse3DProperties& eclipseProperties) :
m_useCPR(false),
m_DISGAS(false),
m_VAPOIL(false)
{
if (Section::hasRUNSPEC(*deck)) {
const RUNSPECSection runspec(*deck);
if (Section::hasRUNSPEC(deck)) {
const RUNSPECSection runspec(deck);
if (runspec.hasKeyword<ParserKeywords::CPR>()) {
const auto& cpr = runspec.getKeyword<ParserKeywords::CPR>();
if (cpr.size() > 0)
@@ -69,14 +70,14 @@ namespace Opm {
}
}
initThresholdPressure(parseContext , deck, gridProperties);
initThresholdPressure(parseContext , deck, eclipseProperties);
}
void SimulationConfig::initThresholdPressure(const ParseContext& parseContext,
DeckConstPtr deck,
GridProperties<int>& gridProperties) {
m_ThresholdPressure = std::make_shared<const ThresholdPressure>(parseContext , deck, gridProperties);
const Deck& deck,
const Eclipse3DProperties& eclipseProperties) {
m_ThresholdPressure = std::make_shared<const ThresholdPressure>(parseContext , deck, eclipseProperties);
}