From 606d6fd73aedc4a6b1f2632451539c2221cb0e04 Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Tue, 1 Nov 2022 14:59:18 +0100 Subject: [PATCH] using SIDouble when creating Valve from a record to account for the unit conversion. --- src/opm/input/eclipse/Schedule/MSW/Valve.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/opm/input/eclipse/Schedule/MSW/Valve.cpp b/src/opm/input/eclipse/Schedule/MSW/Valve.cpp index 7d760826b..fae47e64a 100644 --- a/src/opm/input/eclipse/Schedule/MSW/Valve.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/Valve.cpp @@ -21,8 +21,6 @@ #include #include -#include - namespace Opm { @@ -52,7 +50,7 @@ namespace Opm { Valve::Valve(const DeckRecord& record) : m_con_flow_coeff(record.getItem("CV").get(0)) - , m_con_cross_area(record.getItem("AREA").get(0)) + , m_con_cross_area(record.getItem("AREA").getSIDouble(0)) { // we initialize negative values for the values are defaulted const double value_for_default = -1.e100; @@ -61,25 +59,25 @@ namespace Opm { if (record.getItem("EXTRA_LENGTH").defaultApplied(0)) { m_pipe_additional_length = value_for_default; } else { - m_pipe_additional_length = record.getItem("EXTRA_LENGTH").get(0); + m_pipe_additional_length = record.getItem("EXTRA_LENGTH").getSIDouble(0); } if (record.getItem("PIPE_D").defaultApplied(0)) { m_pipe_diameter = value_for_default; } else { - m_pipe_diameter = record.getItem("PIPE_D").get(0); + m_pipe_diameter = record.getItem("PIPE_D").getSIDouble(0); } if (record.getItem("ROUGHNESS").defaultApplied(0)) { m_pipe_roughness = value_for_default; } else { - m_pipe_roughness = record.getItem("ROUGHNESS").get(0); + m_pipe_roughness = record.getItem("ROUGHNESS").getSIDouble(0); } if (record.getItem("PIPE_A").defaultApplied(0)) { m_pipe_cross_area = value_for_default; } else { - m_pipe_cross_area = record.getItem("PIPE_A").get(0); + m_pipe_cross_area = record.getItem("PIPE_A").getSIDouble(0); } if (record.getItem("STATUS").getTrimmedString(0) == "OPEN") { @@ -92,7 +90,7 @@ namespace Opm { if (record.getItem("MAX_A").defaultApplied(0)) { m_con_max_cross_area = value_for_default; } else { - m_con_max_cross_area = record.getItem("MAX_A").get(0); + m_con_max_cross_area = record.getItem("MAX_A").getSIDouble(0); } }