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

Use a std::array instead of a C-style array for tensor elements. #16474

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Use a std::array instead of a C-style array for tensor elements. #16474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 19 additions & 6 deletions include/deal.II/base/tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@
# include <adolc/adouble.h> // Taped double
#endif

// boost::serialization::make_array used to be in array.hpp, but was
// moved to a different file in BOOST 1.64
#include <boost/version.hpp>
#if BOOST_VERSION >= 106400
# include <boost/serialization/array_wrapper.hpp>
#else
# include <boost/serialization/array.hpp>
#endif


#include <cmath>
#include <ostream>

Expand Down Expand Up @@ -874,9 +884,7 @@ class Tensor
/**
* Array of tensors holding the subelements.
*/
Tensor<rank_ - 1, dim, Number> values[(dim != 0) ? dim : 1];
// ... avoid a compiler warning in case of dim == 0 and ensure that the
// array always has positive size.
std::array<Tensor<rank_ - 1, dim, Number>, dim> values;

/**
* This constructor is for internal use. It provides a way
Expand Down Expand Up @@ -1289,7 +1297,7 @@ template <typename ArrayLike, std::size_t... indices>
constexpr DEAL_II_HOST_DEVICE_ALWAYS_INLINE
Tensor<rank_, dim, Number>::Tensor(const ArrayLike &initializer,
std::index_sequence<indices...>)
: values{Tensor<rank_ - 1, dim, Number>(initializer[indices])...}
: values{{Tensor<rank_ - 1, dim, Number>(initializer[indices])...}}
{
static_assert(sizeof...(indices) == dim,
"dim should match the number of indices");
Expand Down Expand Up @@ -1356,7 +1364,9 @@ template <typename OtherNumber>
constexpr DEAL_II_ALWAYS_INLINE Tensor<rank_, dim, Number>::
operator Tensor<1, dim, Tensor<rank_ - 1, dim, OtherNumber>>() const
{
return Tensor<1, dim, Tensor<rank_ - 1, dim, OtherNumber>>(values);
Tensor<1, dim, Tensor<rank_ - 1, dim, OtherNumber>> x;
std::copy(values.begin(), values.end(), x.values.begin());
return x;
}


Expand Down Expand Up @@ -1841,7 +1851,10 @@ template <class Archive>
inline void
Tensor<rank_, dim, Number>::serialize(Archive &ar, const unsigned int)
{
ar &values;
if constexpr (rank_ > 1)
ar &values;
else
ar &boost::serialization::make_array(&values[0], dim);
Comment on lines -1844 to +1857
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me add here that we could have used the first case also for the std::array in the base case (rank==1) but that I expose the array explicitly because I would like to replace the std::array in the base case by a VectorizedArray and I don't want to change the serialization output again at that point.

(VectorizedArray does not have the infrastructure to serialize itself, but in any case, I can only use it when available and need to fall back to std::array otherwise. This would lead to platform-dependent serialization output, which I can avoid by just describing the elements here as an explicit array.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am looking forward to that - albeit I would note that we need to look out for some places, e.g. for what happens with Tensor<1, dim, VectorizedArray<double>>. (It should just work fine, because VectorizedArray<VectorizedArray<double>> is valid; nonetheless, we might need to have a closer look there.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. std::conditional is what is necessary, and I know how to do it :-)

}


Expand Down
56 changes: 28 additions & 28 deletions tests/fullydistributed_grids/copy_serial_tria_grouped_01.mpirun=7.output
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/serialization/fe_series_01.output
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/serialization/fe_series_02.output
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions tests/serialization/parallel_fullydistributed_construction_data_1.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

DEAL:0::0 0 0 0 1 0 0 0 2 0 0 1 0 0 4294967295 0 0 2 0 0 0 0 0 1 0 0 0.00000000000000000e+00 1 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 1 0 0 4294967294 4294967294 4294967295 0 0 2 0 0 0 0 0 1 1 2 0 4 0 5 0 0 0 0 4294967295 1 0 0 0 4 0 5 1 0 0 0 4294967295 1 0 1 1 0 0
DEAL:0::0 0 0 0 1 0 0 0 2 0 0 1 0 0 4294967295 0 0 2 0 0 0 0 0 0 0 0.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 1 0 0 4294967294 4294967294 4294967295 0 0 2 0 0 0 0 0 1 1 2 0 4 0 5 0 0 0 0 4294967295 1 0 0 0 4 0 5 1 0 0 0 4294967295 1 0 1 1 0 0

DEAL:0::0 0 0 0 1 0 0 0 2 0 0 1 0 0 4294967295 0 0 2 0 0 0 0 0 1 0 0 0.00000000000000000e+00 1 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 1 0 0 4294967294 4294967294 4294967295 0 0 2 0 0 0 0 0 1 1 2 0 4 0 5 0 0 0 0 4294967295 1 0 0 0 4 0 5 1 0 0 0 4294967295 1 0 1 1 0 0
DEAL:0::0 0 0 0 1 0 0 0 2 0 0 1 0 0 4294967295 0 0 2 0 0 0 0 0 0 0 0.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 1 0 0 4294967294 4294967294 4294967295 0 0 2 0 0 0 0 0 1 1 2 0 4 0 5 0 0 0 0 4294967295 1 0 0 0 4 0 5 1 0 0 0 4294967295 1 0 1 1 0 0

DEAL:0::0 0 0 0 1 0 0 0 4 0 0 1 2 3 0 0 4294967295 0 0 4 0 0 0 0 0 2 0 0 0.00000000000000000e+00 0.00000000000000000e+00 2 1.00000000000000000e+00 0.00000000000000000e+00 2 0.00000000000000000e+00 1.00000000000000000e+00 2 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 2 0 0 4294967294 4294967294 4294967295 4 4294967295 4294967295 4294967295 4294967295 0 0 4 0 0 0 0 0 1 0 2 0 3 0 4 0 4 0 6 0 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 2 0 4 0 6 1 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 2 0 4 0 6 2 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 3 0 4 0 6 3 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 3 0 0 0
DEAL:0::0 0 0 0 1 0 0 0 4 0 0 1 2 3 0 0 4294967295 0 0 4 0 0 0 0 0 0 0 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 2 0 0 4294967294 4294967294 4294967295 4 4294967295 4294967295 4294967295 4294967295 0 0 4 0 0 0 0 0 1 0 2 0 3 0 4 0 4 0 6 0 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 2 0 4 0 6 1 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 2 0 4 0 6 2 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 3 0 4 0 6 3 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 3 0 0 0

DEAL:0::0 0 0 0 1 0 0 0 4 0 0 1 2 3 0 0 4294967295 0 0 4 0 0 0 0 0 2 0 0 0.00000000000000000e+00 0.00000000000000000e+00 2 1.00000000000000000e+00 0.00000000000000000e+00 2 0.00000000000000000e+00 1.00000000000000000e+00 2 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 2 0 0 4294967294 4294967294 4294967295 4 4294967295 4294967295 4294967295 4294967295 0 0 4 0 0 0 0 0 1 0 2 0 3 0 4 0 4 0 6 0 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 2 0 4 0 6 1 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 2 0 4 0 6 2 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 3 0 4 0 6 3 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 3 0 0 0
DEAL:0::0 0 0 0 1 0 0 0 4 0 0 1 2 3 0 0 4294967295 0 0 4 0 0 0 0 0 0 0 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 2 0 0 4294967294 4294967294 4294967295 4 4294967295 4294967295 4294967295 4294967295 0 0 4 0 0 0 0 0 1 0 2 0 3 0 4 0 4 0 6 0 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 2 0 4 0 6 1 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 2 0 4 0 6 2 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 0 0 3 0 4 0 6 3 0 0 0 4294967295 4 4294967295 4294967295 4294967295 4294967295 2 0 1 0 3 0 0 0

DEAL:0::0 0 0 0 1 0 0 0 8 0 0 1 2 3 4 5 6 7 0 0 4294967295 0 0 8 0 0 0 0 0 3 0 0 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 3 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 3 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 3 1.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 3 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 3 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 3 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 3 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 3 0 0 4294967294 4294967294 4294967295 0 0 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 0 0 0 0 0 1 0 2 0 3 0 4 0 5 0 8 0 4 0 7 0 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 4 0 4 0 7 1 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 4 0 4 0 7 2 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 4 0 4 0 7 3 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 4 0 4 0 7 4 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 5 0 4 0 7 5 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 5 0 4 0 7 6 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 5 0 4 0 7 7 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 5 0 0 0
DEAL:0::0 0 0 0 1 0 0 0 8 0 0 1 2 3 4 5 6 7 0 0 4294967295 0 0 8 0 0 0 0 0 0 0 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 3 0 0 4294967294 4294967294 4294967295 0 0 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 0 0 0 0 0 1 0 2 0 3 0 4 0 5 0 8 0 4 0 7 0 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 4 0 4 0 7 1 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 4 0 4 0 7 2 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 4 0 4 0 7 3 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 4 0 4 0 7 4 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 5 0 4 0 7 5 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 5 0 4 0 7 6 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 5 0 4 0 7 7 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 5 0 0 0

DEAL:0::0 0 0 0 1 0 0 0 8 0 0 1 2 3 4 5 6 7 0 0 4294967295 0 0 8 0 0 0 0 0 3 0 0 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 3 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 3 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 3 1.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 3 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 3 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 3 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 3 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 3 0 0 4294967294 4294967294 4294967295 0 0 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 0 0 0 0 0 1 0 2 0 3 0 4 0 5 0 8 0 4 0 7 0 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 4 0 4 0 7 1 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 4 0 4 0 7 2 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 4 0 4 0 7 3 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 4 0 4 0 7 4 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 5 0 4 0 7 5 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 5 0 4 0 7 6 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 5 0 4 0 7 7 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 5 0 0 0
DEAL:0::0 0 0 0 1 0 0 0 8 0 0 1 2 3 4 5 6 7 0 0 4294967295 0 0 8 0 0 0 0 0 0 0 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 0.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1.00000000000000000e+00 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 4 0 3 0 0 4294967294 4294967294 4294967295 0 0 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 0 0 6 0 0 0 0 0 1 0 2 0 3 0 4 0 5 0 8 0 4 0 7 0 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 4 0 4 0 7 1 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 4 0 4 0 7 2 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 4 0 4 0 7 3 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 4 0 4 0 7 4 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 2 0 5 0 4 0 7 5 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 2 0 5 0 4 0 7 6 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 0 0 3 0 5 0 4 0 7 7 0 0 0 4294967295 12 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 6 4294967295 4294967295 4294967295 4294967295 4294967295 4294967295 3 0 1 0 3 0 5 0 0 0

DEAL:0::OK
6 changes: 3 additions & 3 deletions tests/serialization/particle_01.with_p4est=true.mpirun=1.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

DEAL:0:2d/2d::Before serialization particle id 6 has location 0.00000 0.300000, has reference location 0.00000 0.500000, and has properties 0.100000 0.700000
DEAL:0:2d/2d::Serialized string: 0 0 0 0 0 0 2 0 0 0.00000000000000000e+00 2.99999999999999989e-01 2 0.00000000000000000e+00 5.00000000000000000e-01 6 2 1.00000000000000006e-01 6.99999999999999956e-01
DEAL:0:2d/2d::Serialized string: 0 0 0 0 0 0 0 0 0.00000000000000000e+00 2.99999999999999989e-01 0.00000000000000000e+00 5.00000000000000000e-01 6 2 1.00000000000000006e-01 6.99999999999999956e-01

DEAL:0:2d/2d::After serialization particle id 6 has location 0.00000 0.300000, has reference location 0.00000 0.500000, and has properties 0.100000 0.700000
DEAL:0:2d/2d::OK
DEAL:0:2d/2d::
DEAL:0:2d/3d::Before serialization particle id 6 has location 0.00000 0.00000 0.300000, has reference location 0.00000 0.500000, and has properties 0.100000 0.700000
DEAL:0:2d/3d::Serialized string: 0 0 0 0 0 0 3 0 0 0.00000000000000000e+00 0.00000000000000000e+00 2.99999999999999989e-01 0 0 0 0 2 0 0 0.00000000000000000e+00 5.00000000000000000e-01 6 2 1.00000000000000006e-01 6.99999999999999956e-01
DEAL:0:2d/3d::Serialized string: 0 0 0 0 0 0 0 0 0.00000000000000000e+00 0.00000000000000000e+00 2.99999999999999989e-01 0 0 0 0 0 0 0.00000000000000000e+00 5.00000000000000000e-01 6 2 1.00000000000000006e-01 6.99999999999999956e-01

DEAL:0:2d/3d::After serialization particle id 6 has location 0.00000 0.00000 0.300000, has reference location 0.00000 0.500000, and has properties 0.100000 0.700000
DEAL:0:2d/3d::OK
DEAL:0:2d/3d::
DEAL:0:3d/3d::Before serialization particle id 6 has location 0.00000 0.00000 0.300000, has reference location 0.00000 0.00000 0.500000, and has properties 0.100000 0.700000
DEAL:0:3d/3d::Serialized string: 0 0 0 0 0 0 3 0 0 0.00000000000000000e+00 0.00000000000000000e+00 2.99999999999999989e-01 3 0.00000000000000000e+00 0.00000000000000000e+00 5.00000000000000000e-01 6 2 1.00000000000000006e-01 6.99999999999999956e-01
DEAL:0:3d/3d::Serialized string: 0 0 0 0 0 0 0 0 0.00000000000000000e+00 0.00000000000000000e+00 2.99999999999999989e-01 0.00000000000000000e+00 0.00000000000000000e+00 5.00000000000000000e-01 6 2 1.00000000000000006e-01 6.99999999999999956e-01

DEAL:0:3d/3d::After serialization particle id 6 has location 0.00000 0.00000 0.300000, has reference location 0.00000 0.00000 0.500000, and has properties 0.100000 0.700000
DEAL:0:3d/3d::OK
Expand Down