Merge pull request #2356 from akva2/boost_prune

Lessen boost usage
This commit is contained in:
Markus Blatt
2020-02-21 13:15:03 +01:00
committed by GitHub
15 changed files with 71 additions and 61 deletions

View File

@@ -40,6 +40,8 @@
#include <opm/common/OpmLog/LogUtil.hpp>
#endif
#include <opm/parser/eclipse/Utility/String.hpp>
BEGIN_PROPERTIES
// forward declaration of property tags
@@ -93,11 +95,11 @@ static FileOutputMode setupLogging(int mpi_rank_, const std::string& deck_filena
std::ostringstream logFileStream;
// Strip extension "." or ".DATA"
std::string extension = boost::to_upper_copy(fpath.extension().string());
std::string extension = uppercase(fpath.extension().string());
if (extension == ".DATA" || extension == ".") {
baseName = boost::to_upper_copy(fpath.stem().string());
baseName = uppercase(fpath.stem().string());
} else {
baseName = boost::to_upper_copy(fpath.filename().string());
baseName = uppercase(fpath.filename().string());
}
std::string output_dir = cmdline_output_dir;