OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1893 from joakim-hove/remove-require-fipnum

Browse Source 
Remove function SummaryConfig::requireFIPNUM
This commit is contained in:
Joakim Hove 2020-08-27 13:56:36 +02:00 committed by GitHub
commit 76e8805d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp
View File

@ -174,7 +174,6 @@ namespace Opm {
is required to calculate the summary variables. is required to calculate the summary variables.
*/ */
bool require3DField( const std::string& keyword) const; bool require3DField( const std::string& keyword) const;
bool requireFIPNUM( ) const;
bool operator==(const SummaryConfig& data) const; bool operator==(const SummaryConfig& data) const;

11
src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
View File

@ -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 { bool SummaryConfig::operator==(const Opm::SummaryConfig& data) const {
return this->keywords == data.keywords && return this->keywords == data.keywords &&
this->short_keywords == data.short_keywords && this->short_keywords == data.short_keywords &&

3
tests/parser/SummaryConfigTests.cpp
View File

@ -643,7 +643,6 @@ BOOST_AUTO_TEST_CASE( summary_require3DField ) {
const auto summary = createSummary( input ); const auto summary = createSummary( input );
BOOST_CHECK( summary.require3DField( "PRESSURE")); 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 input = "RPR\n/\n";
const auto summary = createSummary( input ); const auto summary = createSummary( input );
BOOST_CHECK( summary.require3DField( "PRESSURE")); BOOST_CHECK( summary.require3DField( "PRESSURE"));
BOOST_CHECK( summary.requireFIPNUM( ));
BOOST_CHECK( summary.hasKeyword( "RPR" ) ); BOOST_CHECK( summary.hasKeyword( "RPR" ) );
BOOST_CHECK( summary.hasSummaryKey( "RPR:1" ) ); BOOST_CHECK( summary.hasSummaryKey( "RPR:1" ) );
BOOST_CHECK( summary.hasSummaryKey( "RPR:3" ) ); BOOST_CHECK( summary.hasSummaryKey( "RPR:3" ) );
@ -699,7 +697,6 @@ BOOST_AUTO_TEST_CASE( summary_require3DField ) {
const auto input = "RGIPL\n/\n"; const auto input = "RGIPL\n/\n";
const auto summary = createSummary( input ); const auto summary = createSummary( input );
BOOST_CHECK( summary.require3DField( "GIPL")); BOOST_CHECK( summary.require3DField( "GIPL"));
BOOST_CHECK( summary.requireFIPNUM( ));
} }
} }

2
tests/test_Summary.cpp
View File

@ -1479,8 +1479,6 @@ BOOST_AUTO_TEST_CASE( require3D )
BOOST_CHECK( summaryConfig.require3DField( "OIPG" )); BOOST_CHECK( summaryConfig.require3DField( "OIPG" ));
BOOST_CHECK( summaryConfig.require3DField( "GIPL" )); BOOST_CHECK( summaryConfig.require3DField( "GIPL" ));
BOOST_CHECK( summaryConfig.require3DField( "GIPG" )); BOOST_CHECK( summaryConfig.require3DField( "GIPG" ));
BOOST_CHECK( summaryConfig.requireFIPNUM( ));
} }