diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp index 32836f21e9e282b34629a4da5f96e689279bbf11..40d5d2304596a988c91b1d139d0f6552eae0acc7 100644 --- a/src/language/modules/MeshModule.cpp +++ b/src/language/modules/MeshModule.cpp @@ -316,4 +316,17 @@ MeshModule::registerCheckpointResume() const }), std::function([](const std::string& symbol_name, const HighFive::Group& symbol_table_group) -> EmbeddedData { return readMesh(symbol_name, symbol_table_group); })); + + CheckpointResumeRepository::instance() + .addCheckpointResume(ast_node_data_type_from<std::shared_ptr<const IBoundaryDescriptor>>, + std::function([](const std::string& symbol_name, const EmbeddedData& embedded_data, + HighFive::File& file, HighFive::Group& checkpoint_group, + HighFive::Group& symbol_table_group) { + writeIBoundaryDescriptor(symbol_name, embedded_data, file, checkpoint_group, + symbol_table_group); + }), + std::function([](const std::string& symbol_name, + const HighFive::Group& symbol_table_group) -> EmbeddedData { + return readIBoundaryDescriptor(symbol_name, symbol_table_group); + })); } diff --git a/src/mesh/NamedBoundaryDescriptor.hpp b/src/mesh/NamedBoundaryDescriptor.hpp index 7ee732c59df7814da24b684df9bed60f4676742c..34ef2370fbd66ae539b8ab882058c43ef7db8311 100644 --- a/src/mesh/NamedBoundaryDescriptor.hpp +++ b/src/mesh/NamedBoundaryDescriptor.hpp @@ -19,6 +19,12 @@ class NamedBoundaryDescriptor final : public IBoundaryDescriptor } public: + [[nodiscard]] const std::string& + name() const + { + return m_name; + } + [[nodiscard]] bool operator==(const RefId& ref_id) const final { diff --git a/src/mesh/NumberedBoundaryDescriptor.hpp b/src/mesh/NumberedBoundaryDescriptor.hpp index 2abab93956f9fd2dc98a7d3967484444cba4a0fb..9367d67468779cb5f629cc28002b5f5b44b860c9 100644 --- a/src/mesh/NumberedBoundaryDescriptor.hpp +++ b/src/mesh/NumberedBoundaryDescriptor.hpp @@ -24,6 +24,12 @@ class NumberedBoundaryDescriptor final : public IBoundaryDescriptor } public: + [[nodiscard]] unsigned int + number() const + { + return m_number; + } + [[nodiscard]] Type type() const final { diff --git a/src/utils/checkpointing/CheckpointUtils.cpp b/src/utils/checkpointing/CheckpointUtils.cpp index aace16bdd2093c011f0d2ce349fa6ceaf97d8fae..338ceee96dbda839e00f1e4b2bdd4f651bac43c3 100644 --- a/src/utils/checkpointing/CheckpointUtils.cpp +++ b/src/utils/checkpointing/CheckpointUtils.cpp @@ -4,9 +4,13 @@ #include <language/utils/ASTNodeDataTypeTraits.hpp> #include <language/utils/DataHandler.hpp> #include <mesh/MeshVariant.hpp> +#include <utils/checkpointing/IBoundaryDescriptorHFType.hpp> #include <utils/checkpointing/RefItemListHFType.hpp> +#include <mesh/IBoundaryDescriptor.hpp> #include <mesh/Mesh.hpp> +#include <mesh/NamedBoundaryDescriptor.hpp> +#include <mesh/NumberedBoundaryDescriptor.hpp> template <ItemType item_type, size_t Dimension> void @@ -178,3 +182,36 @@ writeMesh(const std::string& symbol_name, }, mesh_v->variant()); } + +void +writeIBoundaryDescriptor(const std::string& symbol_name, + const EmbeddedData& embedded_data, + HighFive::File&, + HighFive::Group&, + HighFive::Group& symbol_table_group) +{ + HighFive::Group variable_group = symbol_table_group.createGroup("embedded/" + symbol_name); + + std::shared_ptr<const IBoundaryDescriptor> iboundary_descriptor_p = + dynamic_cast<const DataHandler<const IBoundaryDescriptor>&>(embedded_data.get()).data_ptr(); + + const IBoundaryDescriptor& iboundary_descriptor = *iboundary_descriptor_p; + + variable_group.createAttribute("type", dataTypeName(ast_node_data_type_from<decltype(iboundary_descriptor_p)>)); + variable_group.createAttribute("iboundary_descriptor_type", iboundary_descriptor.type()); + + switch (iboundary_descriptor.type()) { + case IBoundaryDescriptor::Type::named: { + const NamedBoundaryDescriptor& named_boundary_descriptor = + dynamic_cast<const NamedBoundaryDescriptor&>(iboundary_descriptor); + variable_group.createAttribute("name", named_boundary_descriptor.name()); + break; + } + case IBoundaryDescriptor::Type::numbered: { + const NumberedBoundaryDescriptor& numbered_boundary_descriptor = + dynamic_cast<const NumberedBoundaryDescriptor&>(iboundary_descriptor); + variable_group.createAttribute("number", numbered_boundary_descriptor.number()); + break; + } + } +} diff --git a/src/utils/checkpointing/CheckpointUtils.hpp b/src/utils/checkpointing/CheckpointUtils.hpp index 9b79c8ec9c898c96ea03c252d756d70b9d9ea388..e9b7167960ed8b0004c522388a28b03edc6363d8 100644 --- a/src/utils/checkpointing/CheckpointUtils.hpp +++ b/src/utils/checkpointing/CheckpointUtils.hpp @@ -48,4 +48,10 @@ void writeMesh(const std::string& symbol_name, HighFive::Group& checkpoint_group, HighFive::Group& symbol_table_group); +void writeIBoundaryDescriptor(const std::string& symbol_name, + const EmbeddedData& embedded_data, + HighFive::File& file, + HighFive::Group& checkpoint_group, + HighFive::Group& symbol_table_group); + #endif // CHECKPOINT_UTILS_HPP diff --git a/src/utils/checkpointing/IBoundaryDescriptorHFType.hpp b/src/utils/checkpointing/IBoundaryDescriptorHFType.hpp new file mode 100644 index 0000000000000000000000000000000000000000..ea67598c7db32c2707812911069d944600eef99c --- /dev/null +++ b/src/utils/checkpointing/IBoundaryDescriptorHFType.hpp @@ -0,0 +1,14 @@ +#ifndef I_BOUNDARY_DESCRIPTOR_HF_TYPE_HPP +#define I_BOUNDARY_DESCRIPTOR_HF_TYPE_HPP + +#include <mesh/IBoundaryDescriptor.hpp> +#include <utils/checkpointing/CheckpointUtils.hpp> + +HighFive::EnumType<IBoundaryDescriptor::Type> PUGS_INLINE +create_enum_i_boundary_descriptor_type() +{ + return {{"named", IBoundaryDescriptor::Type::named}, {"numbered", IBoundaryDescriptor::Type::numbered}}; +} +HIGHFIVE_REGISTER_TYPE(IBoundaryDescriptor::Type, create_enum_i_boundary_descriptor_type); + +#endif // I_BOUNDARY_DESCRIPTOR_HF_TYPE_HPP diff --git a/src/utils/checkpointing/ResumeUtils.cpp b/src/utils/checkpointing/ResumeUtils.cpp index 1054c277864fd79517f65d351ca1d28614c6aa53..32317896c8d2a59778650e5e430a04c934fee8ee 100644 --- a/src/utils/checkpointing/ResumeUtils.cpp +++ b/src/utils/checkpointing/ResumeUtils.cpp @@ -2,6 +2,9 @@ #include <language/utils/DataHandler.hpp> #include <language/utils/SymbolTable.hpp> +#include <mesh/NamedBoundaryDescriptor.hpp> +#include <mesh/NumberedBoundaryDescriptor.hpp> +#include <utils/checkpointing/IBoundaryDescriptorHFType.hpp> #include <utils/checkpointing/ResumingData.hpp> EmbeddedData @@ -11,5 +14,34 @@ readMesh(const std::string& symbol_name, const HighFive::Group& symbol_table_gro const size_t mesh_id = mesh_group.getAttribute("id").read<uint64_t>(); - return {std::make_shared<DataHandler<const MeshVariant>>(ResumingData::instance().meshVariant(mesh_id))}; + return EmbeddedData{std::make_shared<DataHandler<const MeshVariant>>(ResumingData::instance().meshVariant(mesh_id))}; +} + +EmbeddedData +readIBoundaryDescriptor(const std::string& symbol_name, const HighFive::Group& symbol_table_group) +{ + const HighFive::Group iboundarydecriptor_group = symbol_table_group.getGroup("embedded/" + symbol_name); + const IBoundaryDescriptor::Type iboundary_descriptor_type = + iboundarydecriptor_group.getAttribute("iboundary_descriptor_type").read<IBoundaryDescriptor::Type>(); + + EmbeddedData embedded_data; + + switch (iboundary_descriptor_type) { + case IBoundaryDescriptor::Type::named: { + const std::string name = iboundarydecriptor_group.getAttribute("name").read<std::string>(); + + embedded_data = { + std::make_shared<DataHandler<const IBoundaryDescriptor>>(std::make_shared<const NamedBoundaryDescriptor>(name))}; + break; + } + case IBoundaryDescriptor::Type::numbered: { + const unsigned int number = iboundarydecriptor_group.getAttribute("number").read<unsigned int>(); + + embedded_data = {std::make_shared<DataHandler<const IBoundaryDescriptor>>( + std::make_shared<const NumberedBoundaryDescriptor>(number))}; + break; + } + } + + return embedded_data; } diff --git a/src/utils/checkpointing/ResumeUtils.hpp b/src/utils/checkpointing/ResumeUtils.hpp index 848fc9100d98c2ee967409585d8e284f4a89835e..ce2423256eaae440b6c0c044918a21bbf2cb2e09 100644 --- a/src/utils/checkpointing/ResumeUtils.hpp +++ b/src/utils/checkpointing/ResumeUtils.hpp @@ -29,5 +29,6 @@ read(const HighFive::Group& group, const std::string& name) } EmbeddedData readMesh(const std::string& symbol_name, const HighFive::Group& symbol_table_group); +EmbeddedData readIBoundaryDescriptor(const std::string& symbol_name, const HighFive::Group& symbol_table_group); #endif // RESUME_UTILS_HPP