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

make EclipseState constructor explicit

Browse Source 
and adjust test code
This commit is contained in:
Arne Morten Kvarving
2021-08-16 08:31:46 +02:00
parent 155c8fbcdb
commit 7560d7fd7c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/EclipseState.hpp
View File

@@ -55,7 +55,7 @@ namespace Opm {
};
EclipseState() = default;
EclipseState(const Deck& deck);
explicit EclipseState(const Deck& deck);
virtual ~EclipseState() = default;
const IOConfig& getIOConfig() const;

14
tests/test_Tables.cpp
View File

@@ -172,7 +172,7 @@ END
Opm::Parser{}.parseString(input)
};
return {deck};
return Opm::EclipseState{deck};
}
std::vector<double> expect_SGFN()
@@ -324,7 +324,7 @@ END
Opm::Parser{}.parseString(input)
};
return {deck};
return Opm::EclipseState{deck};
}
std::vector<double> expect_SOFN()
@@ -495,7 +495,7 @@ END
Opm::Parser{}.parseString(input)
};
return {deck};
return Opm::EclipseState{deck};
}
std::vector<double> expect_SGFN()
@@ -652,7 +652,7 @@ END
Opm::Parser{}.parseString(input)
};
return {deck};
return Opm::EclipseState{deck};
}
std::vector<double> expect_SGFN()
@@ -823,7 +823,7 @@ END
Opm::Parser{}.parseString(input)
};
return {deck};
return Opm::EclipseState{deck};
}
std::vector<double> expect_SOFN()
@@ -1007,7 +1007,7 @@ END
Opm::Parser{}.parseString(input)
};
return {deck};
return Opm::EclipseState{deck};
}
std::vector<double> expect_SGFN()
@@ -1494,7 +1494,7 @@ namespace {
Opm::EclipseState parse(const std::string& rspec,
const std::string& props)
{
return {
return Opm::EclipseState{
Opm::Parser{}.parseString(rspec + R"(GRID
INIT