mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Add topology curves and show in additional track
* Add topology curves and default plot * Improve visual appearance * Update sub module opm-common * Add support for INCLUDE keyword to allow parsing of include files recursively * Search for *.DATA with fallback to *.SCH to automatically import WESEGLINK data * Find annulus branch based on MD diff on segment start * Stop growing device branch if segment starts at a lower MD than previous
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
|
||||
#include <opm/input/eclipse/Parser/ParserKeywords/V.hpp>
|
||||
#include "opm/input/eclipse/Parser/ParserKeywords/W.hpp"
|
||||
#include "opm/input/eclipse/Parser/ParserKeywords/I.hpp"
|
||||
#include "opm/input/eclipse/Parser/ParserKeywords/S.hpp"
|
||||
|
||||
#include "OpmTestDataDirectory.h"
|
||||
|
||||
@@ -87,22 +89,22 @@ TEST(OpmParserTest, ReadFromFile)
|
||||
TEST(OpmParserTest, ReadAndParseWSEGLINK)
|
||||
{
|
||||
Parser parser(false);
|
||||
const ::Opm::ParserKeywords::WSEGLINK kw1;
|
||||
|
||||
const Opm::ParserKeywords::WSEGLINK kw1;
|
||||
const Opm::ParserKeywords::INCLUDE kw2;
|
||||
|
||||
parser.addParserKeyword(kw1);
|
||||
parser.addParserKeyword(kw2);
|
||||
|
||||
std::stringstream ss;
|
||||
ss << TEST_DATA_DIR << "/test_wseglink.DATA";
|
||||
std::string testFile = ss.str();
|
||||
|
||||
auto deck = parser.parseFile(testFile);
|
||||
std::string testFilePath = std::string(TEST_DATA_DIR) + "/test_wseglink.DATA";
|
||||
|
||||
Opm::ParseContext parseContext(Opm::InputError::Action::WARN);
|
||||
auto deck = parser.parseFile(testFilePath, parseContext);
|
||||
|
||||
std::string myKeyword = "WSEGLINK";
|
||||
auto keywordList = deck.getKeywordList(myKeyword);
|
||||
for (auto kw : keywordList)
|
||||
{
|
||||
auto name = kw->name();
|
||||
|
||||
for (size_t i = 0; i < kw->size(); i++)
|
||||
{
|
||||
auto deckRecord = kw->getRecord(i);
|
||||
|
||||
2
ThirdParty/custom-opm-common/opm-common
vendored
2
ThirdParty/custom-opm-common/opm-common
vendored
Submodule ThirdParty/custom-opm-common/opm-common updated: 212cc35c43...aa8e9c1f84
Reference in New Issue
Block a user