From: Wolfgang Bangerth Date: Tue, 11 Jan 2022 03:10:55 +0000 (-0700) Subject: Simplify code by using serialization functionality. X-Git-Tag: v9.4.0-rc1~595^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13265%2Fhead;p=dealii.git Simplify code by using serialization functionality. --- diff --git a/include/deal.II/fe/fe_tools_extrapolate.templates.h b/include/deal.II/fe/fe_tools_extrapolate.templates.h index a7ea840ab9..cf49dcfc66 100644 --- a/include/deal.II/fe/fe_tools_extrapolate.templates.h +++ b/include/deal.II/fe/fe_tools_extrapolate.templates.h @@ -132,17 +132,11 @@ namespace FETools operator<(const CellData &rhs) const; /** - * Pack the data of this object into a buffer. - */ - std::vector - pack_data() const; - - /** - * Unpack the data of the given buffer into the members of this object. + * Pack or unpack the data of this object into a buffer. */ + template void - unpack_data(const std::vector &buffer); - + serialize(Archive &ar, const unsigned int); /** * The values of degrees of freedom associated with the current cell. @@ -468,69 +462,20 @@ namespace FETools template - std::vector - ExtrapolateImplementation::CellData::pack_data() - const - { - // Compute how much memory we need to pack the data of this - // structure into a char[] buffer. - const unsigned int bytes_for_buffer = - (sizeof(unsigned int) + // dofs_per_cell - dof_values.size() * sizeof(value_type) + // dof_values - sizeof(unsigned int) + // tree_index - sizeof( - typename dealii::internal::p4est::types::quadrant)); // quadrant - std::vector buffer(bytes_for_buffer); - - char *ptr = buffer.data(); - - unsigned int n_dofs = dof_values.size(); - std::memcpy(ptr, &n_dofs, sizeof(unsigned int)); - ptr += sizeof(unsigned int); - - std::memcpy(ptr, dof_values.begin(), n_dofs * sizeof(value_type)); - ptr += n_dofs * sizeof(value_type); - - std::memcpy(ptr, &tree_index, sizeof(unsigned int)); - ptr += sizeof(unsigned int); - - std::memcpy(ptr, - &quadrant, - sizeof( - typename dealii::internal::p4est::types::quadrant)); - ptr += sizeof(typename dealii::internal::p4est::types::quadrant); - - Assert(ptr == buffer.data() + buffer.size(), ExcInternalError()); - - return buffer; - } - - - - template + template void - ExtrapolateImplementation::CellData::unpack_data( - const std::vector &buffer) + ExtrapolateImplementation::CellData::serialize( + Archive &ar, + const unsigned int) { - const char * ptr = buffer.data(); - unsigned int n_dofs; - memcpy(&n_dofs, ptr, sizeof(unsigned int)); - ptr += sizeof(unsigned int); - - dof_values.reinit(n_dofs); - std::memcpy(dof_values.begin(), ptr, n_dofs * sizeof(value_type)); - ptr += n_dofs * sizeof(value_type); - - std::memcpy(&tree_index, ptr, sizeof(unsigned int)); - ptr += sizeof(unsigned int); - - std::memcpy(&quadrant, - ptr, - sizeof( - typename dealii::internal::p4est::types::quadrant)); - ptr += sizeof(typename dealii::internal::p4est::types::quadrant); - - Assert(ptr == buffer.data() + buffer.size(), ExcInternalError()); + // Serialize those data types for which there are overloads: + ar &dof_values &tree_index; + + // Then also serialize the 'quadrant' variable for which there + // isn't an overload. Do so by simply copying the individual + // bytes + ar &boost::serialization::make_array(reinterpret_cast(&quadrant), + sizeof(quadrant)); } @@ -1199,18 +1144,12 @@ namespace FETools const auto create_request = [&cells_to_send](const types::subdomain_id other_rank, std::vector & send_buffer) { - // We have to create a single std::vector that encodes the - // information from all cells that are to be sent to 'other_rank'. - // Each of the objects we want to send has a 'pack_data()' - // function, so we can just create a vector of std::vector - // into which we put these strings, and then use the serialization - // framework to get it all into one string. - std::vector> array_of_strings; + std::vector cells_for_this_destination; for (const auto &cell : cells_to_send) if (cell.receiver == other_rank) - array_of_strings.emplace_back(cell.pack_data()); + cells_for_this_destination.emplace_back(cell); - send_buffer = Utilities::pack(array_of_strings, false); + send_buffer = Utilities::pack(cells_for_this_destination, false); }; const auto prepare_buffer_for_answer = @@ -1224,17 +1163,14 @@ namespace FETools const std::vector &buffer_recv, std::vector & request_buffer) { // We got a message from 'other_rank', so let us decode the - // message in the same way as we have assembled it above - const std::vector> array_of_strings = - Utilities::unpack>>(buffer_recv, - false); - - for (const auto &s : array_of_strings) + // message in the same way as we have assembled it above. + // Note that the cells just received do not contain + // information where they came from, and we have to add that + // ourselves for later use. + for (CellData &cell_data : + Utilities::unpack>(buffer_recv, false)) { - CellData cell_data; - cell_data.unpack_data(s); cell_data.receiver = other_rank; - received_cells.emplace_back(std::move(cell_data)); }