From f337116f282b01ef3d755fa86d8408751fce85a3 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 28 Apr 2020 10:51:36 +0200
Subject: [PATCH] Move constructFileName from BaseLib to ProcessLib.
---
BaseLib/FileTools.cpp | 9 +++++++++
BaseLib/FileTools.h | 5 +++++
ProcessLib/Output/Output.cpp | 15 ++++-----------
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/BaseLib/FileTools.cpp b/BaseLib/FileTools.cpp
index feac1373cf2..7bacc0dfb93 100644
--- a/BaseLib/FileTools.cpp
+++ b/BaseLib/FileTools.cpp
@@ -37,6 +37,15 @@ bool IsFileExisting(const std::string &strFilename)
return fs::exists(fs::path(strFilename));
}
+std::string constructFileName(std::string const& prefix,
+ int const process_id,
+ int const timestep,
+ double const t)
+{
+ return prefix + "_pcs_" + std::to_string(process_id) + "_ts_" +
+ std::to_string(timestep) + "_t_" + std::to_string(t);
+}
+
double swapEndianness(double const& v)
{
union
diff --git a/BaseLib/FileTools.h b/BaseLib/FileTools.h
index daf67284e39..d8c3e9d5738 100644
--- a/BaseLib/FileTools.h
+++ b/BaseLib/FileTools.h
@@ -29,6 +29,11 @@ namespace BaseLib
*/
bool IsFileExisting(const std::string &strFilename);
+std::string constructFileName(std::string const& prefix,
+ int const process_id,
+ int const timestep,
+ double const t);
+
/**
* \brief write value as binary into the given output stream
*
diff --git a/ProcessLib/Output/Output.cpp b/ProcessLib/Output/Output.cpp
index 029a941d71c..e0e907a69c8 100644
--- a/ProcessLib/Output/Output.cpp
+++ b/ProcessLib/Output/Output.cpp
@@ -44,15 +44,6 @@ int convertVtkDataMode(std::string const& data_mode)
"Binary, or Appended.",
data_mode);
}
-
-std::string constructFileName(std::string const& prefix,
- int const process_id,
- int const timestep,
- double const t)
-{
- return prefix + "_pcs_" + std::to_string(process_id) + "_ts_" +
- std::to_string(timestep) + "_t_" + std::to_string(t);
-}
} // namespace
namespace ProcessLib
@@ -156,7 +147,8 @@ struct Output::OutputFile
OutputFile(std::string const& directory, std::string const& prefix,
int const process_id, int const timestep, double const t,
int const data_mode_, bool const compression_)
- : name(constructFileName(prefix, process_id, timestep, t) + ".vtu"),
+ : name(BaseLib::constructFileName(prefix, process_id, timestep, t) +
+ ".vtu"),
path(BaseLib::joinPaths(directory, name)),
data_mode(data_mode_),
compression(compression_)
@@ -372,7 +364,8 @@ void Output::doOutputNonlinearIteration(Process const& process,
findProcessData(process, process_id);
std::string const output_file_name =
- constructFileName(_output_file_prefix, process_id, timestep, t) +
+ BaseLib::constructFileName(_output_file_prefix, process_id, timestep,
+ t) +
"_nliter_" + std::to_string(iteration) + ".vtu";
std::string const output_file_path =
BaseLib::joinPaths(_output_directory, output_file_name);
--
GitLab