From 742ba0e14fcc7cfbbc5dc09df26897de2a6ed7fb Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Wed, 11 Nov 2015 10:53:38 +0100 Subject: [PATCH] remvoing the thermal length related processing. and removing the defaulted 0 value in the keyword definition. --- .../eclipse/EclipseState/Schedule/Compsegs.cpp | 13 ++----------- .../eclipse/EclipseState/Schedule/Compsegs.hpp | 5 +++-- opm/parser/share/keywords/000_Eclipse100/C/COMPSEGS | 4 ++-- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/Compsegs.cpp b/opm/parser/eclipse/EclipseState/Schedule/Compsegs.cpp index 229e129d8..ca16c3db5 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Compsegs.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Compsegs.cpp @@ -26,7 +26,7 @@ namespace Opm { Compsegs::Compsegs(int i_in, int j_in, int k_in, int branch_number_in, double distance_start_in, double distance_end_in, - WellCompletion::DirectionEnum dir_in, double center_depth_in, double thermal_length_in, int segment_number_in) + WellCompletion::DirectionEnum dir_in, double center_depth_in, int segment_number_in) : m_i(i_in), m_j(j_in), m_k(k_in), @@ -35,7 +35,6 @@ namespace Opm { m_distance_end(distance_end_in), m_dir(dir_in), m_center_depth(center_depth_in), - m_thermal_length(thermal_length_in), m_segment_number(segment_number_in) { } @@ -110,14 +109,6 @@ namespace Opm { throw std::runtime_error("this way to obtain CENTER_DISTANCE not implemented yet either!"); } - double thermal_length; - if (!record->getItem("THERMAL_LENGTH")->defaultApplied(0)) { - thermal_length = record->getItem("THERMAL_LENGTH")->getSIDouble(0); - } else { - //TODO: get the thickness of the grid block in the direction of penetration - throw std::runtime_error("this way to obtain THERMAL_LENGTH not implemented yet!"); - } - int segment_number; if (record->getItem("SEGMENT_NUMBER")->hasValue(0)) { segment_number = record->getItem("SEGMENT_NUMBER")->getInt(0); @@ -128,7 +119,7 @@ namespace Opm { if (end_IJK < 0) { // only one compsegs CompsegsPtr new_compsegs = std::make_shared(I, J, K, branch, distance_start, distance_end, - direction, center_depth, thermal_length, segment_number); + direction, center_depth, segment_number); compsegs.push_back(new_compsegs); } else { // a range is defined. genrate a range of Compsegs throw std::runtime_error("entering COMPSEGS entries with a range is not supported yet!"); diff --git a/opm/parser/eclipse/EclipseState/Schedule/Compsegs.hpp b/opm/parser/eclipse/EclipseState/Schedule/Compsegs.hpp index 70613f077..3a93fba82 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Compsegs.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Compsegs.hpp @@ -43,11 +43,12 @@ namespace Opm { WellCompletion::DirectionEnum m_dir; double m_center_depth; - double m_thermal_length; + // we do not handle thermal length for the moment + // double m_thermal_length; int m_segment_number; Compsegs(int i_in, int j_in, int k_in, int branch_number_in, double distance_start_in, double distance_end_in, - WellCompletion::DirectionEnum dir_in, double center_depth_in, double thermal_length_in, int segment_number_in); + WellCompletion::DirectionEnum dir_in, double center_depth_in, int segment_number_in); static std::vector> compsegsFromCOMPSEGSKeyword(DeckKeywordConstPtr compsegsKeyword, EclipseGridConstPtr grid); diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COMPSEGS b/opm/parser/share/keywords/000_Eclipse100/C/COMPSEGS index 1ca0bf47b..b90885493 100644 --- a/opm/parser/share/keywords/000_Eclipse100/C/COMPSEGS +++ b/opm/parser/share/keywords/000_Eclipse100/C/COMPSEGS @@ -9,6 +9,6 @@ {"name" : "DIRECTION" , "value_type" : "STRING"}, {"name" : "END_IJK" , "value_type" : "INT"}, {"name" : "CENTER_DEPTH" , "value_type" : "DOUBLE" , "dimension" : "Length" , "default" : 0}, - {"name" : "THERMAL_LENGTH" , "value_type" : "DOUBLE" , "dimension" : "Length" , "default" : 0}, + {"name" : "THERMAL_LENGTH" , "value_type" : "DOUBLE" , "dimension" : "Length"}, {"name" : "SEGMENT_NUMBER" , "value_type" : "INT"} - ]]} \ No newline at end of file + ]]}