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

Merge pull request #710 from andlaus/implement_FILEUNIT

Browse Source 
Implement FILEUNIT
This commit is contained in:
Joakim Hove 2019-04-05 12:07:19 +02:00 committed by GitHub
commit de9a93377c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/checkDeck.hpp
View File

@ -26,6 +26,8 @@ namespace Opm {
class Deck;
class Parser;
class ParseContext;
class ErrorGuard;
enum DeckChecks {
SectionTopology = 0x0001,
@ -40,7 +42,7 @@ enum DeckChecks {
// some semantical correctness checks of the deck. this method adds a warning to
// the deck object if any issue is found ...
bool checkDeck( Deck& deck, const Parser&, size_t enabledChecks = AllChecks);
bool checkDeck( const Deck& deck, const Parser& parser, const ParseContext& parseContext, ErrorGuard& errorGuard, size_t enabledChecks = AllChecks);
}

6
opm/parser/eclipse/Parser/ParseContext.hpp
View File

@ -217,6 +217,12 @@ namespace Opm {
*/
const static std::string PARSE_LONG_KEYWORD;
/*
The unit system specified via the FILEUNIT keyword is different from the unit
system used by the deck.
*/
const static std::string UNIT_SYSTEM_MISMATCH;
/*
Some property modfiers can be modified in the Schedule
section; this effectively means that Eclipse supports time

19
src/opm/parser/eclipse/EclipseState/checkDeck.cpp
View File

@ -24,9 +24,11 @@
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Opm {
bool checkDeck( Deck& deck, const Parser& parser, size_t enabledChecks) {
bool checkDeck( const Deck& deck, const Parser& parser, const ParseContext& parseContext, ErrorGuard& errorGuard, size_t enabledChecks) {
bool deckValid = true;
// make sure that the deck does not contain unknown keywords
@ -48,6 +50,21 @@ bool checkDeck( Deck& deck, const Parser& parser, size_t enabledChecks) {
deckValid = deckValid && Section::checkSectionTopology(deck, parser, ensureKeywordSection);
}
const std::string& deckUnitSystem = deck.getActiveUnitSystem().getName();
for (const auto& keyword : deck.getKeywordList("FILEUNIT")) {
const std::string& fileUnitSystem =
keyword->getRecord(0).getItem("FILE_UNIT_SYSTEM").getTrimmedString(0);
if (fileUnitSystem != deckUnitSystem) {
std::string msg =
"Unit system " + fileUnitSystem + " specified via the FILEUNIT keyword at "
+ keyword->getFileName() + ":" + std::to_string(keyword->getLineNumber())
+ " does not correspond to the unit system used by the deck ("
+ deckUnitSystem + ")";
parseContext.handleError(ParseContext::UNIT_SYSTEM_MISMATCH, msg, errorGuard);
deckValid = false;
}
}
return deckValid;
}
}

4
src/opm/parser/eclipse/Parser/ParseContext.cpp
View File

@ -79,6 +79,8 @@ namespace Opm {
addKey(PARSE_MISSING_INCLUDE, InputError::EXIT1);
addKey(PARSE_LONG_KEYWORD, InputError::WARN);
addKey(UNIT_SYSTEM_MISMATCH, InputError::THROW_EXCEPTION);
this->addKey(RUNSPEC_NUMWELLS_TOO_LARGE, InputError::DELAYED_EXIT1);
this->addKey(RUNSPEC_CONNS_PER_WELL_TOO_LARGE, InputError::DELAYED_EXIT1);
this->addKey(RUNSPEC_NUMGROUPS_TOO_LARGE, InputError::DELAYED_EXIT1);
@ -310,6 +312,8 @@ namespace Opm {
const std::string ParseContext::PARSE_MISSING_INCLUDE = "PARSE_MISSING_INCLUDE";
const std::string ParseContext::PARSE_LONG_KEYWORD = "PARSE_LONG_KEYWORD";
const std::string ParseContext::UNIT_SYSTEM_MISMATCH = "UNIT_SYSTEM_MISMATCH";
const std::string ParseContext::RUNSPEC_NUMWELLS_TOO_LARGE = "RUNSPEC_NUMWELLS_TOO_LARGE";
const std::string ParseContext::RUNSPEC_CONNS_PER_WELL_TOO_LARGE = "RUNSPEC_CONNS_PER_WELL_TOO_LARGE";
const std::string ParseContext::RUNSPEC_NUMGROUPS_TOO_LARGE = "RUNSPEC_NUMGROUPS_TOO_LARGE";

8
src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FILEUNIT Normal file
View File

@ -0,0 +1,8 @@
{
"name": "FILEUNIT",
"sections": ["GRID", "EDIT", "PROPS", "REGIONS", "SOLUTION", "SCHEDULE"],
"size":1,
"items":[
{"name" : "FILE_UNIT_SYSTEM", "value_type" : "STRING"}
]}

1
src/opm/parser/eclipse/share/keywords/keyword_list.cmake
View File

@ -98,6 +98,7 @@ set( keywords
000_Eclipse100/F/FAULTS
000_Eclipse100/F/FIELD
000_Eclipse100/F/FIELD_PROBE
000_Eclipse100/F/FILEUNIT
000_Eclipse100/F/FILLEPS
000_Eclipse100/F/FIPOWG
000_Eclipse100/F/FIP_PROBE

14
tests/parser/integration/CheckDeckValidity.cpp
View File

@ -28,6 +28,8 @@
BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) {
Opm::Parser parser;
Opm::ParseContext parseContext;
Opm::ErrorGuard errorGuard;
{
const char *correctDeckString =
@ -50,7 +52,7 @@ BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) {
"SCHEDULE\n";
auto deck = parser.parseString(correctDeckString);
BOOST_CHECK(Opm::checkDeck(deck, parser));
BOOST_CHECK(Opm::checkDeck(deck, parser, parseContext, errorGuard));
}
{
@ -63,8 +65,8 @@ BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) {
"SCHEDULE\n";
auto deck = parser.parseString(correctDeckString);
BOOST_CHECK(!Opm::checkDeck(deck, parser));
BOOST_CHECK(Opm::checkDeck(deck, parser, ~Opm::SectionTopology));
BOOST_CHECK(!Opm::checkDeck(deck, parser, parseContext, errorGuard));
BOOST_CHECK(Opm::checkDeck(deck, parser, parseContext, errorGuard, ~Opm::SectionTopology));
}
{
@ -89,13 +91,13 @@ BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) {
"SCHEDULE\n";
auto deck = parser.parseString(incorrectDeckString);
BOOST_CHECK(!Opm::checkDeck(deck, parser));
BOOST_CHECK(!Opm::checkDeck(deck, parser, parseContext, errorGuard));
// this is supposed to succeed as we don't ensure that all keywords are in the
// correct section
BOOST_CHECK(Opm::checkDeck(deck, parser, Opm::SectionTopology));
BOOST_CHECK(Opm::checkDeck(deck, parser, parseContext, errorGuard, Opm::SectionTopology));
// this fails because of the incorrect BOX keyword
BOOST_CHECK(!Opm::checkDeck(deck, parser, Opm::SectionTopology | Opm::KeywordSection));
BOOST_CHECK(!Opm::checkDeck(deck, parser, parseContext, errorGuard, Opm::SectionTopology | Opm::KeywordSection));
}
}