From bcb501e3d323314d94134774f65aba65d5506bfd Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Mon, 19 Feb 2018 08:59:51 +0100 Subject: [PATCH] Fix default output dir --- opm/autodiff/FlowMainEbos.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp index 25d27dca8..b65fab1aa 100755 --- a/opm/autodiff/FlowMainEbos.hpp +++ b/opm/autodiff/FlowMainEbos.hpp @@ -274,8 +274,9 @@ namespace Opm baseName = path(fpath.filename()).string(); } - logFileStream << output_dir_ << "/" << baseName; - debugFileStream << output_dir_ << "/" << "." << baseName; + const std::string& output_dir = eclState().getIOConfig().getOutputDir(); + logFileStream << output_dir << "/" << baseName; + debugFileStream << output_dir << "/" << "." << baseName; if ( must_distribute_ && mpi_rank_ != 0 ) { @@ -375,13 +376,13 @@ namespace Opm namespace fs = boost::filesystem; fs::path output_path("."); + const std::string& output_dir = eclState().getIOConfig().getOutputDir(); if ( param_.has("output_dir") ) { - output_path = fs::path(output_dir_); + output_path = fs::path(output_dir); } fs::path deck_filename(param_.get("deck_filename")); - std::for_each(fs::directory_iterator(output_path), fs::directory_iterator(), detail::ParallelFileMerger(output_path, deck_filename.stem().string())); @@ -398,12 +399,12 @@ namespace Opm deckFileParam += deckFileName; argv.push_back(deckFileParam.c_str()); - const std::string default_output_dir = boost::filesystem::basename(deckFileName); - output_dir_ = param_.getDefault("output_dir", default_output_dir); - std::string outputDirParam("--ecl-output-dir="); - outputDirParam += output_dir_; - argv.push_back(outputDirParam.c_str()); + if (param_.has("output_dir")) { + const std::string& output_dir = param_.get("output_dir"); + outputDirParam += output_dir; + argv.push_back(outputDirParam.c_str()); + } const bool restart_double_si = param_.getDefault("restart_double_si", false); std::string outputDoublePrecisionParam("--ecl-output-double-precision="); @@ -662,7 +663,6 @@ namespace Opm bool must_distribute_ = false; ParameterGroup param_; bool output_to_files_ = false; - std::string output_dir_ = std::string("."); std::unique_ptr output_writer_; boost::any parallel_information_; std::unique_ptr fis_solver_;