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

Default output dir is current active directory

Browse Source 
Optionally specify using IOCondig::setOutputDir()
This commit is contained in:
Kjell W. Kongsvik
2016-04-28 13:09:10 +02:00
parent 5fb3a6fc53
commit 79ab818c3a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp
View File

@@ -49,12 +49,9 @@ namespace Opm {
m_FMTOUT(false),
m_ignore_RPTSCHED_RESTART(false),
m_deck_filename(input_path),
m_output_enabled(true)
m_output_enabled(true),
m_output_dir(".")
{
m_output_dir = boost::filesystem::path(input_path).parent_path().string();
if (m_output_dir.length() < 1) {
m_output_dir = ".";
}
m_base_name = boost::filesystem::path(input_path).stem().string();
}

12
opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp
View File

@@ -466,15 +466,19 @@ BOOST_AUTO_TEST_CASE(IOConfigTest) {
BOOST_CHECK_EQUAL("", ioConfigPtr5->getDeckFileName());
std::string testString = "testString";
std::string testString = "testString.DATA";
IOConfigPtr ioConfigPtr6 = std::make_shared<IOConfig>(testString);
std::string output_dir6 = ".";
ioConfigPtr6->setOutputDir(output_dir6);
BOOST_CHECK_EQUAL(testString, ioConfigPtr6->getDeckFileName());
BOOST_CHECK_EQUAL(".", ioConfigPtr6->getOutputDir());
BOOST_CHECK_EQUAL(output_dir6, ioConfigPtr6->getOutputDir());
std::string absTestPath = "/path/to/testString.DATA";
std::string absTestPath = "testString.DATA";
IOConfigPtr ioConfigPtr7 = std::make_shared<IOConfig>(absTestPath);
std::string output_dir7 = "/path/to";
ioConfigPtr7->setOutputDir(output_dir7);
BOOST_CHECK_EQUAL(absTestPath, ioConfigPtr7->getDeckFileName());
BOOST_CHECK_EQUAL("/path/to", ioConfigPtr7->getOutputDir());
BOOST_CHECK_EQUAL(output_dir7, ioConfigPtr7->getOutputDir());
BOOST_CHECK_EQUAL("testString", ioConfigPtr7->getBaseName());
}