diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp index cae2399da5002bf356ba33ffe32d899153c1ff89..32836f21e9e282b34629a4da5f96e689279bbf11 100644 --- a/src/language/modules/MeshModule.cpp +++ b/src/language/modules/MeshModule.cpp @@ -314,9 +314,6 @@ MeshModule::registerCheckpointResume() const HighFive::Group& symbol_table_group) { writeMesh(symbol_name, embedded_data, file, checkpoint_group, symbol_table_group); }), - std::function([](const HighFive::File& file, const HighFive::Group& checkpoint_group, - const std::string& symbol_name, - const HighFive::Group& symbol_table_group) -> EmbeddedData { - return readMesh(file, checkpoint_group, symbol_name, symbol_table_group); - })); + std::function([](const std::string& symbol_name, const HighFive::Group& symbol_table_group) + -> EmbeddedData { return readMesh(symbol_name, symbol_table_group); })); } diff --git a/src/language/utils/CheckpointResumeRepository.cpp b/src/language/utils/CheckpointResumeRepository.cpp index 180f60b66100898b4b5033230956e48a4e8e836d..1e9b14d2f7ce68a091f77b1c2b482383f59c586e 100644 --- a/src/language/utils/CheckpointResumeRepository.cpp +++ b/src/language/utils/CheckpointResumeRepository.cpp @@ -24,16 +24,14 @@ CheckpointResumeRepository::checkpoint(const ASTNodeDataType& data_type, } EmbeddedData -CheckpointResumeRepository::resume(const HighFive::File& file, - const HighFive::Group& checkpoint_group, - const ASTNodeDataType& data_type, +CheckpointResumeRepository::resume(const ASTNodeDataType& data_type, const std::string& symbol_name, const HighFive::Group& symbol_table_group) const { std::string data_type_name = dataTypeName(data_type); if (auto i_dt_function = m_data_type_resuming.find(data_type_name); i_dt_function != m_data_type_resuming.end()) { const ResumeFunction& function = i_dt_function->second; - return function(file, checkpoint_group, symbol_name, symbol_table_group); + return function(symbol_name, symbol_table_group); } else { std::ostringstream error_msg; error_msg << "cannot find resuming function for type '" << rang::fgB::yellow << data_type_name << rang::fg::reset diff --git a/src/language/utils/CheckpointResumeRepository.hpp b/src/language/utils/CheckpointResumeRepository.hpp index 491c235901fa58b690db28a85603b536a6a26b2f..73419282d185b4c84d5a81731c10e42f090ca762 100644 --- a/src/language/utils/CheckpointResumeRepository.hpp +++ b/src/language/utils/CheckpointResumeRepository.hpp @@ -19,10 +19,8 @@ class CheckpointResumeRepository HighFive::Group& checkpoint_group, HighFive::Group& symbol_table_group)>; - using ResumeFunction = std::function<EmbeddedData(const HighFive::File& symbol, - const HighFive::Group& file, - const std::string& symbol_name, - const HighFive::Group& symbol_table_group)>; + using ResumeFunction = + std::function<EmbeddedData(const std::string& symbol_name, const HighFive::Group& symbol_table_group)>; private: std::unordered_map<std::string, CheckpointFunction> m_data_type_checkpointing; @@ -59,9 +57,7 @@ class CheckpointResumeRepository HighFive::Group& checkpoint_group, HighFive::Group& symbol_table_group) const; - EmbeddedData resume(const HighFive::File& file, - const HighFive::Group& checkpoint_group, - const ASTNodeDataType& data_type, + EmbeddedData resume(const ASTNodeDataType& data_type, const std::string& symbol_name, const HighFive::Group& symbol_table_group) const; diff --git a/src/utils/checkpointing/Resume.cpp b/src/utils/checkpointing/Resume.cpp index e34c621782c741a98825b5ee7c63d43e117abf93..0bddcac0758bed7bd6c9a6f4071fa724c9b38318 100644 --- a/src/utils/checkpointing/Resume.cpp +++ b/src/utils/checkpointing/Resume.cpp @@ -234,16 +234,15 @@ resume() for (size_t i_component = 0; i_component < number_of_components; ++i_component) { embedded_tuple[i_component] = - CheckpointResumeRepository::instance().resume(file, checkpoint, - p_symbol->attributes().dataType().contentType(), + CheckpointResumeRepository::instance().resume(p_symbol->attributes().dataType().contentType(), p_symbol->name() + "/" + std::to_string(i_component), saved_symbol_table); } p_symbol->attributes().value() = embedded_tuple; } else { p_symbol->attributes().value() = - CheckpointResumeRepository::instance().resume(file, checkpoint, p_symbol->attributes().dataType(), - p_symbol->name(), saved_symbol_table); + CheckpointResumeRepository::instance().resume(p_symbol->attributes().dataType(), p_symbol->name(), + saved_symbol_table); } } } diff --git a/src/utils/checkpointing/ResumeUtils.cpp b/src/utils/checkpointing/ResumeUtils.cpp index 91a6e9faed6d506a95bc1eb870eaabc95710b38c..1054c277864fd79517f65d351ca1d28614c6aa53 100644 --- a/src/utils/checkpointing/ResumeUtils.cpp +++ b/src/utils/checkpointing/ResumeUtils.cpp @@ -5,10 +5,7 @@ #include <utils/checkpointing/ResumingData.hpp> EmbeddedData -readMesh([[maybe_unused]] const HighFive::File& file, - [[maybe_unused]] const HighFive::Group& checkpoint_group, - const std::string& symbol_name, - const HighFive::Group& symbol_table_group) +readMesh(const std::string& symbol_name, const HighFive::Group& symbol_table_group) { const HighFive::Group mesh_group = symbol_table_group.getGroup("embedded/" + symbol_name); diff --git a/src/utils/checkpointing/ResumeUtils.hpp b/src/utils/checkpointing/ResumeUtils.hpp index 64e978449b5dfaa33642f9393a536271f2b4968a..848fc9100d98c2ee967409585d8e284f4a89835e 100644 --- a/src/utils/checkpointing/ResumeUtils.hpp +++ b/src/utils/checkpointing/ResumeUtils.hpp @@ -28,9 +28,6 @@ read(const HighFive::Group& group, const std::string& name) return array; } -EmbeddedData readMesh(const HighFive::File& file, - const HighFive::Group& checkpoint_group, - const std::string& symbol_name, - const HighFive::Group& symbol_table_group); +EmbeddedData readMesh(const std::string& symbol_name, const HighFive::Group& symbol_table_group); #endif // RESUME_UTILS_HPP