diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp index 94fe342c8b25971e2fd03d78423df1b1e7682c23..e3464e3753b9c07380d5ee38679bc788502f79c4 100644 --- a/src/language/modules/MeshModule.cpp +++ b/src/language/modules/MeshModule.cpp @@ -355,4 +355,13 @@ MeshModule::registerCheckpointResume() const return readIZoneDescriptor(symbol_name, symbol_table_group); })); + CheckpointResumeRepository::instance() + .addCheckpointResume(ast_node_data_type_from<std::shared_ptr<const ItemType>>, + std::function([](const std::string& symbol_name, const EmbeddedData& embedded_data, + HighFive::File& file, HighFive::Group& checkpoint_group, + HighFive::Group& symbol_table_group) { + writeItemType(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 readItemType(symbol_name, symbol_table_group); })); } diff --git a/src/utils/checkpointing/CheckpointUtils.cpp b/src/utils/checkpointing/CheckpointUtils.cpp index 4335ee10022911ee8122ec7eb05528de992c428a..b686e89b0b160ebdb19d94b8c147808e5db6142d 100644 --- a/src/utils/checkpointing/CheckpointUtils.cpp +++ b/src/utils/checkpointing/CheckpointUtils.cpp @@ -7,8 +7,10 @@ #include <utils/checkpointing/IBoundaryDescriptorHFType.hpp> #include <utils/checkpointing/IInterfaceDescriptorHFType.hpp> #include <utils/checkpointing/IZoneDescriptorHFType.hpp> +#include <utils/checkpointing/ItemTypeHFType.hpp> #include <utils/checkpointing/RefItemListHFType.hpp> +#include <mesh/ItemType.hpp> #include <mesh/Mesh.hpp> #include <mesh/NamedBoundaryDescriptor.hpp> #include <mesh/NamedInterfaceDescriptor.hpp> @@ -285,3 +287,21 @@ writeIZoneDescriptor(const std::string& symbol_name, } } } + +void +writeItemType(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 ItemType> item_type_p = + dynamic_cast<const DataHandler<const ItemType>&>(embedded_data.get()).data_ptr(); + + const ItemType& item_type = *item_type_p; + + variable_group.createAttribute("type", dataTypeName(ast_node_data_type_from<decltype(item_type_p)>)); + variable_group.createAttribute("item_type", item_type); +} diff --git a/src/utils/checkpointing/CheckpointUtils.hpp b/src/utils/checkpointing/CheckpointUtils.hpp index 5cfeb0d4729f0a300816890fcb898fe8faee7bb2..dc4afe88f235963444a208590cd0df68ad23787a 100644 --- a/src/utils/checkpointing/CheckpointUtils.hpp +++ b/src/utils/checkpointing/CheckpointUtils.hpp @@ -66,4 +66,10 @@ void writeIZoneDescriptor(const std::string& symbol_name, HighFive::Group& checkpoint_group, HighFive::Group& symbol_table_group); +void writeItemType(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/ItemTypeHFType.hpp b/src/utils/checkpointing/ItemTypeHFType.hpp new file mode 100644 index 0000000000000000000000000000000000000000..e20d18861bb83d91a2048df82153f61d3c3159ff --- /dev/null +++ b/src/utils/checkpointing/ItemTypeHFType.hpp @@ -0,0 +1,14 @@ +#ifndef ITEM_TYPE_HF_TYPE_HPP +#define ITEM_TYPE_HF_TYPE_HPP + +#include <mesh/ItemType.hpp> +#include <utils/checkpointing/CheckpointUtils.hpp> + +HighFive::EnumType<ItemType> PUGS_INLINE +create_enum_item_type() +{ + return {{"node", ItemType::node}, {"edge", ItemType::edge}, {"face", ItemType::face}, {"cell", ItemType::cell}}; +} +HIGHFIVE_REGISTER_TYPE(ItemType, create_enum_item_type); + +#endif // ITEM_TYPE_HF_TYPE_HPP diff --git a/src/utils/checkpointing/ResumeUtils.cpp b/src/utils/checkpointing/ResumeUtils.cpp index d320f9616971941eec38189781b4a2055a1b98b9..e5483347b6faa0754382917cf6404bea268245c1 100644 --- a/src/utils/checkpointing/ResumeUtils.cpp +++ b/src/utils/checkpointing/ResumeUtils.cpp @@ -11,6 +11,7 @@ #include <utils/checkpointing/IBoundaryDescriptorHFType.hpp> #include <utils/checkpointing/IInterfaceDescriptorHFType.hpp> #include <utils/checkpointing/IZoneDescriptorHFType.hpp> +#include <utils/checkpointing/ItemTypeHFType.hpp> #include <utils/checkpointing/ResumingData.hpp> EmbeddedData @@ -109,3 +110,12 @@ readIZoneDescriptor(const std::string& symbol_name, const HighFive::Group& symbo return embedded_data; } + +EmbeddedData +readItemType(const std::string& symbol_name, const HighFive::Group& symbol_table_group) +{ + const HighFive::Group item_type_group = symbol_table_group.getGroup("embedded/" + symbol_name); + const ItemType item_type = item_type_group.getAttribute("item_type").read<ItemType>(); + + return {std::make_shared<DataHandler<const ItemType>>(std::make_shared<const ItemType>(item_type))}; +} diff --git a/src/utils/checkpointing/ResumeUtils.hpp b/src/utils/checkpointing/ResumeUtils.hpp index 8ac1ffcf22e00a3b5a87c516ae7f78d363cea02a..2c0b0d4861a0cb083e919799eee3d20e9bfb1397 100644 --- a/src/utils/checkpointing/ResumeUtils.hpp +++ b/src/utils/checkpointing/ResumeUtils.hpp @@ -32,5 +32,6 @@ EmbeddedData readMesh(const std::string& symbol_name, const HighFive::Group& sym EmbeddedData readIBoundaryDescriptor(const std::string& symbol_name, const HighFive::Group& symbol_table_group); EmbeddedData readIInterfaceDescriptor(const std::string& symbol_name, const HighFive::Group& symbol_table_group); EmbeddedData readIZoneDescriptor(const std::string& symbol_name, const HighFive::Group& symbol_table_group); +EmbeddedData readItemType(const std::string& symbol_name, const HighFive::Group& symbol_table_group); #endif // RESUME_UTILS_HPP