Skip to content

Using fs::path for file path in arguments #88

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
andrsd merged 2 commits into from
Feb 22, 2026
Merged

Using fs::path for file path in arguments #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adaf6b8
Update file path parameters from std::string to fs::path
andrsd Feb 22, 2026
d7fc1d7
Removing `filesystem.h` and using `std::filesystem` directly
andrsd Feb 22, 2026
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
1 change: 0 additions & 1 deletion include/exodusIIcpp/exodusIIcpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
#include "error.h"
#include "exception.h"
#include "file.h"
#include "filesystem.h"
#include "node_set.h"
#include "side_set.h"
12 changes: 7 additions & 5 deletions include/exodusIIcpp/file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@

#include <vector>
#include <map>
#include <filesystem>
#include "element_block.h"
#include "enums.h"
#include "error.h"
#include "node_set.h"
#include "side_set.h"
#include "filesystem.h"

namespace fs = std::filesystem;

namespace exodusIIcpp {

Expand Down Expand Up @@ -68,23 +70,23 @@ class File {
/// - ``exodusIIcpp::FileAccess::READ`` for reading,
/// - ``exodusIIcpp::FileAccess::WRITE`` for writing,
/// - ``exodusIIcpp::FileAccess::APPEND`` for appending to an existing file.
explicit File(exodusIIcpp::fs::path file_path, exodusIIcpp::FileAccess file_access);
explicit File(fs::path file_path, exodusIIcpp::FileAccess file_access);
~File();

/// Open an ExodusII file
///
/// @param file_path Path to the file to open
void open(const std::string & file_path);
void open(const fs::path & file_path);

/// Create an ExodusII file
///
/// @param file_path Path to the file to create
void create(const std::string & file_path);
void create(const fs::path & file_path);

/// Open an existing ExodusII file for appending new time steps
///
/// @param file_path Path to the file to open
void append(const std::string & file_path);
void append(const fs::path & file_path);

/// Is file opened
///
Expand Down
18 changes: 0 additions & 18 deletions include/exodusIIcpp/filesystem.h
View file
Open in desktop

This file was deleted.

35 changes: 17 additions & 18 deletions src/file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ File::File() :
{
}

File::File(exodusIIcpp::fs::path file_path, exodusIIcpp::FileAccess file_access) :
File::File(fs::path file_path, FileAccess file_access) :
file_access(file_access),
cpu_word_size(sizeof(double)),
io_word_size(8),
Expand All @@ -101,16 +101,16 @@ File::File(exodusIIcpp::fs::path file_path, exodusIIcpp::FileAccess file_access)
n_node_sets(-1),
n_side_sets(-1)
{
if (file_access == exodusIIcpp::FileAccess::READ) {
open(file_path.string());
if (file_access == FileAccess::READ) {
open(file_path);
init();
}
else if (file_access == exodusIIcpp::FileAccess::APPEND) {
append(file_path.string());
else if (file_access == FileAccess::APPEND) {
append(file_path);
init();
}
else
create(file_path.string());
create(file_path);
}

File::~File()
Expand All @@ -119,39 +119,39 @@ File::~File()
}

void
File::open(const std::string & file_path)
File::open(const fs::path & file_path)
{
this->file_access = exodusIIcpp::FileAccess::READ;
this->file_access = FileAccess::READ;
this->exoid = ex_open(file_path.c_str(),
EX_READ,
&this->cpu_word_size,
&this->io_word_size,
&this->version);
if (this->exoid < 0)
throw Exception(fmt::sprintf("Unable to open file '%s'.", file_path));
throw Exception(fmt::sprintf("Unable to open file '%s'.", file_path.string()));
}

void
File::create(const std::string & file_path)
File::create(const fs::path & file_path)
{
this->file_access = exodusIIcpp::FileAccess::WRITE;
this->file_access = FileAccess::WRITE;
this->exoid =
ex_create(file_path.c_str(), EX_CLOBBER, &this->cpu_word_size, &this->io_word_size);
if (this->exoid < 0)
throw Exception(fmt::sprintf("Unable to open file '%s'.", file_path));
throw Exception(fmt::sprintf("Unable to open file '%s'.", file_path.string()));
}

void
File::append(const std::string & file_path)
File::append(const fs::path & file_path)
{
this->file_access = exodusIIcpp::FileAccess::APPEND;
this->file_access = FileAccess::APPEND;
this->exoid = ex_open(file_path.c_str(),
EX_WRITE,
&this->cpu_word_size,
&this->io_word_size,
&this->version);
if (this->exoid < 0)
throw Exception(fmt::sprintf("Unable to open file '%s'.", file_path));
throw Exception(fmt::sprintf("Unable to open file '%s'.", file_path.string()));
}

bool
Expand All @@ -163,8 +163,7 @@ File::is_opened() const
void
File::init()
{
if (this->file_access == exodusIIcpp::FileAccess::READ ||
this->file_access == exodusIIcpp::FileAccess::APPEND) {
if (this->file_access == FileAccess::READ || this->file_access == FileAccess::APPEND) {
char title[MAX_LINE_LENGTH + 1];
memset(title, 0, sizeof(title));
EXODUSIICPP_CHECK_ERROR(ex_get_init(this->exoid,
Expand All @@ -191,7 +190,7 @@ File::init(const char * title,
int n_node_sets,
int n_side_sets)
{
if (this->file_access == exodusIIcpp::FileAccess::WRITE) {
if (this->file_access == FileAccess::WRITE) {
EXODUSIICPP_CHECK_ERROR(ex_put_init(this->exoid,
title,
n_dims,
Expand Down
Loading