OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed use of deprecated boost native string func, replaced with string()

Browse Source
This commit is contained in:
Kristian Flikka
2013-11-27 09:10:54 +01:00
parent 5a2765a296
commit 2de09d6d56
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration_tests/sim_fibo_ad_test.cpp
View File

@@ -74,7 +74,7 @@ std::vector<BlackoilState> runWithOldParser(parameter::ParameterGroup param) {
double gravity[3] = {0.0}; double gravity[3] = {0.0};
boost::filesystem::path test_data("non_public/SPE1_opm.DATA"); boost::filesystem::path test_data("non_public/SPE1_opm.DATA");
std::string deck_filename = test_data.native_file_string(); std::string deck_filename = test_data.string();
deck.reset(new EclipseGridParser(deck_filename)); deck.reset(new EclipseGridParser(deck_filename));
// Grid init // Grid init
grid.reset(new GridManager(*deck)); grid.reset(new GridManager(*deck));
@@ -176,7 +176,7 @@ std::vector<BlackoilState> runWithNewParser(parameter::ParameterGroup param) {
double gravity[3] = {0.0}; double gravity[3] = {0.0};
boost::filesystem::path test_data("non_public/SPE1_opm.DATA"); boost::filesystem::path test_data("non_public/SPE1_opm.DATA");
std::string deck_filename = test_data.native_file_string(); std::string deck_filename = test_data.string();
deck.reset(new EclipseGridParser(deck_filename)); deck.reset(new EclipseGridParser(deck_filename));
// Grid init // Grid init
grid.reset(new GridManager(*deck)); grid.reset(new GridManager(*deck));
@@ -269,7 +269,7 @@ std::vector<BlackoilState> runWithNewParser(parameter::ParameterGroup param) {
BOOST_AUTO_TEST_CASE(SPE1_runWithOldAndNewParser_BlackOilStateEqual) { BOOST_AUTO_TEST_CASE(SPE1_runWithOldAndNewParser_BlackOilStateEqual) {
boost::filesystem::path test_data("non_public/spe1.xml"); boost::filesystem::path test_data("non_public/spe1.xml");
std::string deck_filename = test_data.native_file_string(); std::string deck_filename = test_data.string();
const char * argv[] = { "", deck_filename.c_str()}; const char * argv[] = { "", deck_filename.c_str()};
parameter::ParameterGroup param(2, argv, false); parameter::ParameterGroup param(2, argv, false);