From dee69e78c339d143f190774eb1d036ae461eedff Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Thu, 27 Aug 2020 11:52:02 +0200 Subject: [PATCH] Remove function SummaryConfig::requireFIPNUM --- .../EclipseState/SummaryConfig/SummaryConfig.hpp | 1 - .../EclipseState/SummaryConfig/SummaryConfig.cpp | 11 ----------- tests/parser/SummaryConfigTests.cpp | 3 --- tests/test_Summary.cpp | 2 -- 4 files changed, 17 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp b/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp index a1a103a1b..3824fd6dc 100644 --- a/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp +++ b/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp @@ -174,7 +174,6 @@ namespace Opm { is required to calculate the summary variables. */ bool require3DField( const std::string& keyword) const; - bool requireFIPNUM( ) const; bool operator==(const SummaryConfig& data) const; diff --git a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp b/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp index 406bcc723..7db03ec1c 100644 --- a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp +++ b/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp @@ -1147,17 +1147,6 @@ bool SummaryConfig::require3DField( const std::string& keyword ) const { } -bool SummaryConfig::requireFIPNUM( ) const { - return this->hasKeyword("ROIP") || - this->hasKeyword("ROIPL") || - this->hasKeyword("RGIP") || - this->hasKeyword("RGIPL") || - this->hasKeyword("RGIPG") || - this->hasKeyword("RWIP") || - this->hasKeyword("RPR"); -} - - bool SummaryConfig::operator==(const Opm::SummaryConfig& data) const { return this->keywords == data.keywords && this->short_keywords == data.short_keywords && diff --git a/tests/parser/SummaryConfigTests.cpp b/tests/parser/SummaryConfigTests.cpp index 3762f0b77..d5a01bff4 100644 --- a/tests/parser/SummaryConfigTests.cpp +++ b/tests/parser/SummaryConfigTests.cpp @@ -643,7 +643,6 @@ BOOST_AUTO_TEST_CASE( summary_require3DField ) { const auto summary = createSummary( input ); BOOST_CHECK( summary.require3DField( "PRESSURE")); - BOOST_CHECK( !summary.requireFIPNUM( )); } @@ -680,7 +679,6 @@ BOOST_AUTO_TEST_CASE( summary_require3DField ) { const auto input = "RPR\n/\n"; const auto summary = createSummary( input ); BOOST_CHECK( summary.require3DField( "PRESSURE")); - BOOST_CHECK( summary.requireFIPNUM( )); BOOST_CHECK( summary.hasKeyword( "RPR" ) ); BOOST_CHECK( summary.hasSummaryKey( "RPR:1" ) ); BOOST_CHECK( summary.hasSummaryKey( "RPR:3" ) ); @@ -699,7 +697,6 @@ BOOST_AUTO_TEST_CASE( summary_require3DField ) { const auto input = "RGIPL\n/\n"; const auto summary = createSummary( input ); BOOST_CHECK( summary.require3DField( "GIPL")); - BOOST_CHECK( summary.requireFIPNUM( )); } } diff --git a/tests/test_Summary.cpp b/tests/test_Summary.cpp index 641f5eb5f..2fd3f65d8 100755 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -1479,8 +1479,6 @@ BOOST_AUTO_TEST_CASE( require3D ) BOOST_CHECK( summaryConfig.require3DField( "OIPG" )); BOOST_CHECK( summaryConfig.require3DField( "GIPL" )); BOOST_CHECK( summaryConfig.require3DField( "GIPG" )); - - BOOST_CHECK( summaryConfig.requireFIPNUM( )); }