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

Merge pull request #1518 from atgeirr/rename-debug-file

Browse Source 
Rename .CASE.DEBUG -> CASE.DBG.
This commit is contained in:
Andreas Lauser 2018-06-26 10:17:23 +02:00 committed by GitHub
commit 01c830656d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/FlowMainEbos.hpp
View File

@ -273,7 +273,7 @@ namespace Opm
const std::string& output_dir = eclState().getIOConfig().getOutputDir(); const std::string& output_dir = eclState().getIOConfig().getOutputDir();
logFileStream << output_dir << "/" << baseName; logFileStream << output_dir << "/" << baseName;
debugFileStream << output_dir << "/" << "." << baseName; debugFileStream << output_dir << "/" << baseName;
if ( must_distribute_ && mpi_rank_ != 0 ) if ( must_distribute_ && mpi_rank_ != 0 )
{ {
@ -284,7 +284,7 @@ namespace Opm
logFileStream << "." << mpi_rank_; logFileStream << "." << mpi_rank_;
} }
logFileStream << ".PRT"; logFileStream << ".PRT";
debugFileStream << ".DEBUG"; debugFileStream << ".DBG";
logFile_ = logFileStream.str(); logFile_ = logFileStream.str();

8
opm/simulators/ParallelFileMerger.hpp
View File

@ -49,11 +49,11 @@ public:
/// \param deckanme The name of the deck. /// \param deckanme The name of the deck.
ParallelFileMerger(const fs::path& output_dir, ParallelFileMerger(const fs::path& output_dir,
const std::string& deckname) const std::string& deckname)
: debugFileRegex_("\\."+deckname+"\\.\\d+\\.DEBUG"), : debugFileRegex_(deckname+"\\.\\d+\\.DBG"),
logFileRegex_(deckname+"\\.\\d+\\.PRT") logFileRegex_(deckname+"\\.\\d+\\.PRT")
{ {
auto debugPath = output_dir; auto debugPath = output_dir;
debugPath /= (std::string(".") + deckname + ".DEBUG"); debugPath /= (deckname + ".DBG");
debugStream_.reset(new fs::ofstream(debugPath, debugStream_.reset(new fs::ofstream(debugPath,
std::ofstream::app)); std::ofstream::app));
auto logPath = output_dir; auto logPath = output_dir;
@ -119,11 +119,11 @@ private:
fs::remove(file); fs::remove(file);
} }
/// \brief Regex to capture .*.DEBUG /// \brief Regex to capture *.DBG
boost::regex debugFileRegex_; boost::regex debugFileRegex_;
/// \brief Regex to capture *.PRT /// \brief Regex to capture *.PRT
boost::regex logFileRegex_; boost::regex logFileRegex_;
/// \brief Stream to *.DEBUG file /// \brief Stream to *.DBG file
std::unique_ptr<fs::ofstream> debugStream_; std::unique_ptr<fs::ofstream> debugStream_;
/// \brief Stream to *.PRT file /// \brief Stream to *.PRT file
std::unique_ptr<fs::ofstream> logStream_; std::unique_ptr<fs::ofstream> logStream_;