From 77ed32662cc36a708d4dcadd3aac0f6f0fa1dad9 Mon Sep 17 00:00:00 2001 From: Atle Haugan Date: Fri, 16 May 2014 11:07:01 +0200 Subject: [PATCH] Enabled integration tests in ParseWellWithWildcards --- .../IntegrationTests/ParseWellWithWildcards.cpp | 14 ++++++-------- .../integration_tests/WellWithWildcards/WCONINJE1 | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp b/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp index 6b35cb20f..e07960ce6 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp +++ b/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp @@ -74,7 +74,6 @@ BOOST_AUTO_TEST_CASE( parse_WCONINJE_OK ) { DeckPtr deck = parser->parseFile(wconprodFile.string()); ScheduleConstPtr sched(new Schedule(deck)); -#if false BOOST_CHECK_EQUAL(5U, sched->numWells()); BOOST_CHECK(sched->hasWell("PROD1")); BOOST_CHECK(sched->hasWell("INJE2")); @@ -84,22 +83,21 @@ BOOST_AUTO_TEST_CASE( parse_WCONINJE_OK ) { { WellPtr well = sched->getWell("INJE2"); - BOOST_CHECK_CLOSE(1000/Metric::Time, well->getProductionProperties(0).OilRate, 0.001); - BOOST_CHECK_CLOSE(1500/Metric::Time, well->getProductionProperties(1).OilRate, 0.001); + BOOST_CHECK_CLOSE(1000/Metric::Time, well->getInjectionProperties(0).surfaceInjectionRate, 0.001); + BOOST_CHECK_CLOSE(1500/Metric::Time, well->getInjectionProperties(1).surfaceInjectionRate, 0.001); } { WellPtr well = sched->getWell("INJE3"); - BOOST_CHECK_CLOSE(0/Metric::Time, well->getProductionProperties(0).OilRate, 0.001); - BOOST_CHECK_CLOSE(1500/Metric::Time, well->getProductionProperties(1).OilRate, 0.001); + BOOST_CHECK_CLOSE(0/Metric::Time, well->getInjectionProperties(0).surfaceInjectionRate, 0.001); + BOOST_CHECK_CLOSE(1500/Metric::Time, well->getInjectionProperties(1).surfaceInjectionRate, 0.001); } { WellPtr well = sched->getWell("INJX5"); - BOOST_CHECK_CLOSE(2000/Metric::Time, well->getProductionProperties(0).OilRate, 0.001); - BOOST_CHECK_CLOSE(2000/Metric::Time, well->getProductionProperties(1).OilRate, 0.001); + BOOST_CHECK_CLOSE(2000/Metric::Time, well->getInjectionProperties(0).surfaceInjectionRate, 0.001); + BOOST_CHECK_CLOSE(2000/Metric::Time, well->getInjectionProperties(1).surfaceInjectionRate, 0.001); } -#endif } diff --git a/testdata/integration_tests/WellWithWildcards/WCONINJE1 b/testdata/integration_tests/WellWithWildcards/WCONINJE1 index f03766707..c3fe462ac 100644 --- a/testdata/integration_tests/WellWithWildcards/WCONINJE1 +++ b/testdata/integration_tests/WellWithWildcards/WCONINJE1 @@ -10,7 +10,7 @@ WELSPECS 'INJE2' 'I' 24 25 9110 'WATER' / 'INJE3' 'I' 24 25 9110 'WATER' / 'PROD4' 'P' 11 3 9110 'OIL' / -'INJX5' 'P' 10 4 9110 'OIL' / +'INJX5' 'I' 10 4 9110 'WATER' / / WCONINJE