From bd74a32c894e2e229a83e879b38c04f181c7d67a Mon Sep 17 00:00:00 2001 From: Kristian Flikka Date: Tue, 21 Jan 2014 10:10:05 +0100 Subject: [PATCH] Added dimension to WELSPECS REF_DEPT, updated usage to query for SI --- opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp | 4 ++-- opm/parser/share/keywords/W/WELSPECS | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index d964b4c41..e7ae52ac8 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -154,7 +154,7 @@ namespace Opm { if (well->getHeadJ() != record->getItem("HEAD_J")->getInt(0)) { throw std::invalid_argument("Unable process WELSPECS for well " + well->name() + ", HEAD_J deviates from existing value"); } - if (well->getRefDepth() != record->getItem("REF_DEPTH")->getRawDouble(0)) { + if (well->getRefDepth() != record->getItem("REF_DEPTH")->getSIDouble(0)) { throw std::invalid_argument("Unable process WELSPECS for well " + well->name() + ", REF_DEPTH deviates from existing value"); } } @@ -289,7 +289,7 @@ namespace Opm { void Schedule::addWell(const std::string& wellName, DeckRecordConstPtr record, size_t timeStep) { int headI = record->getItem("HEAD_I")->getInt(0); int headJ = record->getItem("HEAD_J")->getInt(0); - double refDepth = record->getItem("REF_DEPTH")->getRawDouble(0); + double refDepth = record->getItem("REF_DEPTH")->getSIDouble(0); WellPtr well(new Well(wellName, headI, headJ, refDepth, m_timeMap , timeStep)); m_wells[ wellName ] = well; } diff --git a/opm/parser/share/keywords/W/WELSPECS b/opm/parser/share/keywords/W/WELSPECS index 5624c790d..bb210f795 100644 --- a/opm/parser/share/keywords/W/WELSPECS +++ b/opm/parser/share/keywords/W/WELSPECS @@ -3,7 +3,7 @@ {"name" : "GROUP" , "value_type" : "STRING" }, {"name" : "HEAD_I" , "value_type" : "INT"}, {"name" : "HEAD_J" , "value_type" : "INT"}, - {"name" : "REF_DEPTH" , "value_type" : "FLOAT"}, + {"name" : "REF_DEPTH" , "value_type" : "FLOAT", "dimension" : "L"}, {"name" : "PHASE" , "value_type" : "STRING"}, {"name" : "D_RADIUS" , "value_type" : "FLOAT" , "default" : 0}, {"name" : "INFLOW_EQ" , "value_type" : "STRING" , "default" : "STD"},