Skip to content
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

Jump to bottom

Add function to combine H5 dat files #6298

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+785 −208
Open

Add function to combine H5 dat files #6298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0eedca2
Rename combine_h5 to combine_h5_vol
knelli2 Sep 14, 2024
8f7bb08
Add function to combine H5 dat files
knelli2 Sep 18, 2024
aa42e7b
Reorganize an H5 helper
knelli2 Sep 27, 2024
e9f4bcf
Add overload to dat and cce get_data functions
knelli2 Sep 27, 2024
a67d874
fixup. Combine H5 dat
knelli2 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
64 changes: 48 additions & 16 deletions src/IO/H5/Cce.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <cstdint>
#include <hdf5.h>
#include <string>
#include <type_traits>
#include <unordered_map>
#include <unordered_set>
#include <vector>
Expand All @@ -23,6 +24,7 @@
#include "Utilities/Algorithm.hpp"
#include "Utilities/ConstantExpressions.hpp"
#include "Utilities/ErrorHandling/Error.hpp"
#include "Utilities/GenerateInstantiations.hpp"
#include "Utilities/MakeString.hpp"
#include "Utilities/StdHelpers.hpp"

Expand Down Expand Up @@ -182,41 +184,44 @@ void Cce::append(
}
}

std::unordered_map<std::string, Matrix> Cce::get_data() const {
std::unordered_map<std::string, Matrix> result{};
template <typename T>
std::unordered_map<std::string, T> Cce::get_data() const {
std::unordered_map<std::string, T> result{};

for (const std::string& bondi_var : bondi_variables_) {
const DataSet& dataset = bondi_datasets_.at(bondi_var);
result[bondi_var] = h5::retrieve_dataset(dataset.id, dataset.size);
result[bondi_var] = h5::retrieve_dataset<T>(dataset.id, dataset.size);
}

return result;
}

Matrix Cce::get_data(const std::string& bondi_variable_name) const {
template <typename T>
T Cce::get_data(const std::string& bondi_variable_name) const {
check_bondi_variable(bondi_variable_name);

const DataSet& dataset = bondi_datasets_.at(bondi_variable_name);
return h5::retrieve_dataset(dataset.id, dataset.size);
return h5::retrieve_dataset<T>(dataset.id, dataset.size);
}

std::unordered_map<std::string, Matrix> Cce::get_data_subset(
template <typename T>
std::unordered_map<std::string, T> Cce::get_data_subset(
const std::vector<size_t>& these_ell, const size_t first_row,
const size_t num_rows) const {
std::unordered_map<std::string, Matrix> result{};
std::unordered_map<std::string, T> result{};

for (const std::string& bondi_var : bondi_variables_) {
result[bondi_var] =
get_data_subset(bondi_var, these_ell, first_row, num_rows);
get_data_subset<T>(bondi_var, these_ell, first_row, num_rows);
}

return result;
}

Matrix Cce::get_data_subset(const std::string& bondi_variable_name,
const std::vector<size_t>& these_ell,
const size_t first_row,
const size_t num_rows) const {
template <typename T>
T Cce::get_data_subset(const std::string& bondi_variable_name,
const std::vector<size_t>& these_ell,
const size_t first_row, const size_t num_rows) const {
check_bondi_variable(bondi_variable_name);

if (alg::any_of(these_ell,
Expand All @@ -226,7 +231,11 @@ Matrix Cce::get_data_subset(const std::string& bondi_variable_name,
}

if (these_ell.empty()) {
return {num_rows, 0, 0.0};
if constexpr (std::is_same_v<T, Matrix>) {
return {num_rows, 0, 0.0};
} else {
return std::vector<std::vector<double>>(num_rows);
}
}

// Always grab the time
Expand All @@ -252,12 +261,16 @@ Matrix Cce::get_data_subset(const std::string& bondi_variable_name,
}

if (num_rows == 0) {
return {0, these_columns.size(), 0.0};
if constexpr (std::is_same_v<T, Matrix>) {
return {0, these_columns.size(), 0.0};
} else {
return std::vector<std::vector<double>>{};
}
}

const DataSet& dataset = bondi_datasets_.at(bondi_variable_name);
return h5::retrieve_dataset_subset(dataset.id, these_columns, first_row,
num_rows, dataset.size);
return h5::retrieve_dataset_subset<T>(dataset.id, these_columns, first_row,
num_rows, dataset.size);
}

void Cce::check_bondi_variable(const std::string& bondi_variable_name) const {
Expand All @@ -273,4 +286,23 @@ const std::array<hsize_t, 2>& Cce::get_dimensions(

return bondi_datasets_.at(bondi_variable_name).size;
}

#define TYPE(data) BOOST_PP_TUPLE_ELEM(0, data)

#define INSTANTIATE(_, data) \
template std::unordered_map<std::string, TYPE(data)> Cce::get_data() const; \
template TYPE(data) Cce::get_data(const std::string& bondi_variable_name) \
const; \
template std::unordered_map<std::string, TYPE(data)> Cce::get_data_subset( \
const std::vector<size_t>& these_ell, const size_t first_row, \
const size_t num_rows) const; \
template TYPE(data) Cce::get_data_subset( \
const std::string& bondi_variable_name, \
const std::vector<size_t>& these_ell, const size_t first_row, \
const size_t num_rows) const;

GENERATE_INSTANTIATIONS(INSTANTIATE, (Matrix, std::vector<std::vector<double>>))

#undef INSTANTIATE
#undef TYPE
} // namespace h5
19 changes: 12 additions & 7 deletions src/IO/H5/Cce.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,14 @@ class Cce : public h5::Object {
/// @{
/*!
* \brief Return all currently stored data in the `h5::Cce` file in the form
* of a `Matrix` for each bondi variable
* of a `Matrix` or a `std::vector<std::vector<double>>` for each bondi
* variable
*/
std::unordered_map<std::string, Matrix> get_data() const;
template <typename T = Matrix>
std::unordered_map<std::string, T> get_data() const;

Matrix get_data(const std::string& bondi_variable_name) const;
template <typename T = Matrix>
T get_data(const std::string& bondi_variable_name) const;
/// @}

/// @{
Expand All @@ -119,13 +122,15 @@ class Cce : public h5::Object {
* l_max that this file was constructed with. Also both the first and last row
* requested must be less than or equal to the total number of rows.
*/
std::unordered_map<std::string, Matrix> get_data_subset(
template <typename T = Matrix>
std::unordered_map<std::string, T> get_data_subset(
const std::vector<size_t>& these_ell, size_t first_row = 0,
size_t num_rows = 1) const;

Matrix get_data_subset(const std::string& bondi_variable_name,
const std::vector<size_t>& these_ell,
size_t first_row = 0, size_t num_rows = 1) const;
template <typename T = Matrix>
T get_data_subset(const std::string& bondi_variable_name,
const std::vector<size_t>& these_ell, size_t first_row = 0,
size_t num_rows = 1) const;
/// @}

/*!
Expand Down
Loading
Loading