ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into more-clang-tidy-refactoring

Browse Source 
# Conflicts:
#	src/MANIFOLD/manifold_thylakoid.cpp
This commit is contained in:
Axel Kohlmeyer
2021-10-27 15:23:57 -04:00
parent 2a9a8adfc0 bd053d6841
commit da3115be2c
43 changed files with 228 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/platform.cpp
View File

@ -418,6 +418,24 @@ std::string platform::mpi_info(int &major, int &minor)
return {version};
}
/* ----------------------------------------------------------------------
collect available compression tool info
------------------------------------------------------------------------- */
std::string platform::compress_info()
{
std::string buf = "Available compression formats:\n\n";
bool none_found = true;
for (const auto &cmpi : compress_styles) {
if (cmpi.style == ::compress_info::NONE) continue;
if (find_exe_path(cmpi.command).size()) {
none_found = false;
buf += fmt::format("Extension: .{:6} Command: {}\n", cmpi.extension, cmpi.command);
}
}
if (none_found) buf += "None\n";
return buf;
}
/* ----------------------------------------------------------------------
set environment variable
------------------------------------------------------------------------- */
@ -930,7 +948,7 @@ bool platform::file_is_readable(const std::string &path)
bool platform::has_compress_extension(const std::string &file)
{
return find_compress_type(file).style != compress_info::NONE;
return find_compress_type(file).style != ::compress_info::NONE;
}
/* ----------------------------------------------------------------------
@ -943,7 +961,7 @@ FILE *platform::compressed_read(const std::string &file)
#if defined(LAMMPS_GZIP)
auto compress = find_compress_type(file);
if (compress.style == compress_info::NONE) return nullptr;
if (compress.style == ::compress_info::NONE) return nullptr;
if (find_exe_path(compress.command).size())
// put quotes around file name so that they may contain blanks
@ -962,7 +980,7 @@ FILE *platform::compressed_write(const std::string &file)
#if defined(LAMMPS_GZIP)
auto compress = find_compress_type(file);
if (compress.style == compress_info::NONE) return nullptr;
if (compress.style == ::compress_info::NONE) return nullptr;
if (find_exe_path(compress.command).size())
// put quotes around file name so that they may contain blanks