Skip to content

Minor correction to have the filesystem header same as dump and vtk #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glesur merged 2 commits into from
Sep 27, 2024
Merged

Minor correction to have the filesystem header same as dump and vtk #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85c67d
[FIX] xdmf datatype agnostic dump
Sep 9, 2024
4d79e07
[ENH] xdmf io now supports experimental filesystems like dump and vtk
dutta-alankar Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/output/xdmf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@
#include <vector>
#include <algorithm>
#include <iomanip>
#if __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#else
#error "Missing the <filesystem> header."
#endif

#include "xdmf.hpp"
#include "version.hpp"
#include "idefix.hpp"
Expand Down Expand Up @@ -39,9 +49,9 @@ Xdmf::Xdmf(Input &input, DataBlock *datain) {
}

if(idfx::prank==0) {
if(!std::filesystem::is_directory(outputDirectory)) {
if(!fs::is_directory(outputDirectory)) {
try {
if(!std::filesystem::create_directory(outputDirectory)) {
if(!fs::create_directory(outputDirectory)) {
std::stringstream msg;
msg << "Cannot create directory " << outputDirectory << std::endl;
IDEFIX_ERROR(msg);
Expand Down Expand Up @@ -165,7 +175,7 @@ Xdmf::Xdmf(Input &input, DataBlock *datain) {
cellsubsize[3]);
*/
// Temporary storage on host for 3D arrays
this->vect3D = new float[nx1loc*nx2loc*nx3loc];
this->vect3D = new DUMP_DATATYPE[nx1loc*nx2loc*nx3loc];

// fill the node_coord array
DUMP_DATATYPE x1 = 0.0;
Expand Down Expand Up @@ -274,8 +284,8 @@ Xdmf::Xdmf(Input &input, DataBlock *datain) {

int Xdmf::Write() {
idfx::pushRegion("Xdmf::Write");
std::filesystem::path filename;
std::filesystem::path filename_xmf;
fs::path filename;
fs::path filename_xmf;
hid_t err;
idfx::cout << "Xdmf: Write file n " << xdmfFileNumber << "..." << std::flush;
timer.reset();
Expand Down