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

opm-parser adoption of Deck automatic ownership

Browse Source 
Since the Deck* family of classes have changed their interfaces to no
longer use shared_ptr, a lot of code broke. This patch fixes all
problems in tests, other signatures and accesses to now use the new Deck
interfaces.
This commit is contained in:
Jørgen Kvalsvik
2016-02-09 12:09:40 +01:00
parent 9c577d8645
commit f0ae5db131
153 changed files with 2354 additions and 2682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
View File

@@ -46,8 +46,7 @@
#include <opm/parser/eclipse/Units/ConversionFactors.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Deck/DeckIntItem.hpp>
#include <opm/parser/eclipse/Deck/DeckStringItem.hpp>
#include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
using namespace Opm;
@@ -267,7 +266,7 @@ BOOST_AUTO_TEST_CASE(PropertiesNotSupportedThrows) {
OpmLog::addBackend("COUNTER" , counter);
DeckPtr deck = createDeck();
EclipseState state(deck , ParseMode());
DeckKeywordConstPtr swat = deck->getKeyword("SWAT");
const auto& swat = deck->getKeyword("SWAT");
BOOST_CHECK_EQUAL( false , state.supportsGridProperty("SWAT"));
state.loadGridPropertyFromDeckKeyword(std::make_shared<const Box>(10,10,10), swat);
BOOST_CHECK_EQUAL( 1 , counter->numMessages(Log::MessageType::Error) );