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

Added 'minideck' to Schedule object.

Browse Source
This commit is contained in:
Joakim Hove
2015-10-30 15:33:53 +01:00
parent 2ef418bf86
commit 2b3e1c381a
4 changed files with 93 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -31,6 +31,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.hpp>
@@ -49,6 +50,7 @@ namespace Opm {
createTimeMap(deck);
m_tuning.reset(new Tuning(m_timeMap));
m_events.reset(new Events(m_timeMap));
m_modifierDeck.reset( new DynamicVector<std::shared_ptr<Deck> >( m_timeMap , std::shared_ptr<Deck>( 0 ) ));
addGroup( "FIELD", 0 );
initRootGroupTreeNode(getTimeMap());
initOilVaporization(getTimeMap());
@@ -86,21 +88,29 @@ namespace Opm {
}
void Schedule::iterateScheduleSection(const ParseMode& parseMode , std::shared_ptr<const SCHEDULESection> section, IOConfigPtr ioConfig) {
/*
geoModifiers is a list of geo modifiers which can be found in the schedule
section. This is only partly supported, support is indicated by the bool
value. The keywords which are supported will be assembled in a per-timestep
'minideck', whereas ParseMode::UNSUPPORTED_SCHEDULE_GEO_MODIFIER will be
consulted for the others.
*/
const std::map<std::string,bool> geoModifiers = {{"MULTFLT" , true},
{"MULTPV" , true},
{"MULTX" , true},
{"MULTX-" , true},
{"MULTY" , true},
{"MULTY-" , true},
{"MULTZ" , true},
{"MULTZ-" , true},
{"MULTREGT" , true},
{"MULTR" , true},
{"MULTR-" , true},
{"MULTSIG" , true},
{"MULTSIGV" , true},
{"MULTTHT" , true},
{"MULTTHT-" , true}};
{"MULTPV" , false},
{"MULTX" , false},
{"MULTX-" , false},
{"MULTY" , false},
{"MULTY-" , false},
{"MULTZ" , false},
{"MULTZ-" , false},
{"MULTREGT" , false},
{"MULTR" , false},
{"MULTR-" , false},
{"MULTSIG" , false},
{"MULTSIGV" , false},
{"MULTTHT" , false},
{"MULTTHT-" , false}};
size_t currentStep = 0;
std::vector<std::pair<DeckKeywordConstPtr , size_t> > rftProperties;
@@ -197,13 +207,25 @@ namespace Opm {
if (geoModifiers.find( keyword->name() ) != geoModifiers.end()) {
{
bool supported = geoModifiers.at( keyword->name() );
if (supported) {
/*
If the deck stored at currentStep is a null pointer (i.e. evaluates
to false) we must first create a new deck and install that under
index currentstep; then we fetch the deck (newly created - or old)
from the container and add the keyword.
*/
if (!m_modifierDeck->iget(currentStep))
m_modifierDeck->iset( currentStep , std::make_shared<Deck>( ));
{
const std::shared_ptr<Deck> deck = m_modifierDeck->iget( currentStep );
deck->addKeyword( keyword );
}
m_events->addEvent( ScheduleEvents::GEO_MODIFIER , currentStep);
} else {
std::string msg = "OPM does not support grid property modifier " + keyword->name() + " in the Schedule section. Error at report: " + std::to_string( currentStep );
parseMode.handleError( ParseMode::UNSUPPORTED_SCHEDULE_GEO_MODIFIER , msg );
}
{
m_events->addEvent( ScheduleEvents::GEO_MODIFIER , currentStep);
}
}
}
@@ -1562,6 +1584,11 @@ namespace Opm {
return m_tuning;
}
std::shared_ptr<const Deck> Schedule::getModifierDeck(size_t timeStep) const {
return m_modifierDeck->iget( timeStep );
}
const Events& Schedule::getEvents() const {
return *m_events;
}

3
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@@ -71,7 +71,7 @@ namespace Opm
bool initOnly() const;
const Events& getEvents() const;
bool hasOilVaporizationProperties();
std::shared_ptr<const Deck> getModifierDeck(size_t timeStep) const;
@@ -83,6 +83,7 @@ namespace Opm
std::shared_ptr<DynamicState<GroupTreePtr> > m_rootGroupTree;
std::shared_ptr<DynamicState<OilVaporizationPropertiesPtr> > m_oilvaporizationproperties;
std::shared_ptr<Events> m_events;
std::shared_ptr<DynamicVector<std::shared_ptr<Deck> > > m_modifierDeck;
TuningPtr m_tuning;
bool nosim;

25
opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp
View File

@@ -49,6 +49,9 @@ BOOST_AUTO_TEST_CASE( CheckUnsoppertedInSCHEDULE ) {
"MULTFLT\n"
" 'F1' 100 /\n"
"/\n"
"MULTFLT\n"
" 'F2' 77 /\n"
"/\n"
"TSTEP -- 3,4\n"
" 10 10/\n"
"\n";
@@ -67,5 +70,27 @@ BOOST_AUTO_TEST_CASE( CheckUnsoppertedInSCHEDULE ) {
BOOST_CHECK_EQUAL( false , events.hasEvent( ScheduleEvents::GEO_MODIFIER , 1 ));
BOOST_CHECK_EQUAL( true , events.hasEvent( ScheduleEvents::GEO_MODIFIER , 2 ));
BOOST_CHECK_EQUAL( false , events.hasEvent( ScheduleEvents::GEO_MODIFIER , 3 ));
BOOST_CHECK( !schedule.getModifierDeck(1) );
BOOST_CHECK( !schedule.getModifierDeck(3) );
std::shared_ptr<const Deck> multflt_deck = schedule.getModifierDeck(2);
BOOST_CHECK_EQUAL( 2U , multflt_deck->size());
BOOST_CHECK( multflt_deck->hasKeyword<ParserKeywords::MULTFLT>() );
auto multflt1 = multflt_deck->getKeyword(0);
BOOST_CHECK_EQUAL( 1U , multflt1->size( ) );
auto record0 = multflt1->getRecord( 0 );
BOOST_CHECK_EQUAL( 100.0 , record0->getItem<ParserKeywords::MULTFLT::factor>()->getRawDouble(0));
BOOST_CHECK_EQUAL( "F1" , record0->getItem<ParserKeywords::MULTFLT::fault>()->getString(0));
auto multflt2 = multflt_deck->getKeyword(1);
BOOST_CHECK_EQUAL( 1U , multflt2->size( ) );
auto record1 = multflt2->getRecord( 0 );
BOOST_CHECK_EQUAL( 77.0 , record1->getItem<ParserKeywords::MULTFLT::factor>()->getRawDouble(0));
BOOST_CHECK_EQUAL( "F2" , record1->getItem<ParserKeywords::MULTFLT::fault>()->getString(0));
}
}

27
opm/parser/eclipse/Parser/tests/ParseModeTests.cpp
View File

@@ -104,7 +104,18 @@ BOOST_AUTO_TEST_CASE( CheckMissingSizeKeyword) {
BOOST_AUTO_TEST_CASE( CheckUnsoppertedInSCHEDULE ) {
const char * deckString =
const char * deckStringUnSupported =
"START\n"
" 10 'JAN' 2000 /\n"
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 / \n"
"SCHEDULE\n"
"MULTZ\n"
" 1000*0.10 /\n"
"\n";
const char * deckStringSupported =
"START\n"
" 10 'JAN' 2000 /\n"
"RUNSPEC\n"
@@ -112,22 +123,26 @@ BOOST_AUTO_TEST_CASE( CheckUnsoppertedInSCHEDULE ) {
" 10 10 10 / \n"
"SCHEDULE\n"
"MULTFLT\n"
" 'F1' 100 /\n"
" 'F1' 0.10 /\n"
"/\n"
"\n";
ParseMode parseMode;
Parser parser(true);
auto deck = parser.parseString( deckString , parseMode );
std::shared_ptr<EclipseGrid> grid = std::make_shared<EclipseGrid>( deck );
auto deckSupported = parser.parseString( deckStringSupported , parseMode );
auto deckUnSupported = parser.parseString( deckStringUnSupported , parseMode );
std::shared_ptr<EclipseGrid> grid = std::make_shared<EclipseGrid>( deckSupported );
std::shared_ptr<IOConfig> ioconfig = std::make_shared<IOConfig>( "path" );
parseMode.update( ParseMode::UNSUPPORTED_SCHEDULE_GEO_MODIFIER , InputError::IGNORE );
BOOST_CHECK_NO_THROW( Schedule( parseMode , grid , deck , ioconfig ));
BOOST_CHECK_NO_THROW( Schedule( parseMode , grid , deckSupported , ioconfig ));
BOOST_CHECK_NO_THROW( Schedule( parseMode , grid , deckUnSupported , ioconfig ));
parseMode.update( ParseMode::UNSUPPORTED_SCHEDULE_GEO_MODIFIER , InputError::THROW_EXCEPTION );
BOOST_CHECK_THROW( Schedule( parseMode , grid , deck , ioconfig ), std::invalid_argument );
BOOST_CHECK_THROW( Schedule( parseMode , grid , deckUnSupported , ioconfig ), std::invalid_argument );
BOOST_CHECK_NO_THROW( Schedule( parseMode , grid , deckSupported , ioconfig ));
}