Commit c1c285ad authored by incardon's avatar incardon

Latest modules

parent 77da8be4
openfpm_io @ 43c5a58c
Subproject commit c352e6770565537e0dfa16f1e74eb32db3b9e739 Subproject commit 43c5a58c750a98531b3a76e5740432f7795cfe0a
openfpm_numerics @ 0b425037
Subproject commit cac8e24cc0d567f7408e64e9f60e40e5fd14829b Subproject commit 0b425037b139f9c2dbe989da5468eebb215bc623
...@@ -670,7 +670,7 @@ public: ...@@ -670,7 +670,7 @@ public:
{ {
// Get the number of elements in the cell // Get the number of elements in the cell
size_t e; size_t e = -1;
size_t cl = fine_s.getCell(p); size_t cl = fine_s.getCell(p);
size_t n_ele = fine_s.getNelements(cl); size_t n_ele = fine_s.getNelements(cl);
...@@ -953,6 +953,7 @@ public: ...@@ -953,6 +953,7 @@ public:
cart.commCostSet = commCostSet; cart.commCostSet = commCostSet;
cart.cd = cd; cart.cd = cd;
cart.domain = domain; cart.domain = domain;
cart.sub_domains_global = sub_domains_global;
for (size_t i = 0 ; i < dim ; i++) for (size_t i = 0 ; i < dim ; i++)
{cart.spacing[i] = spacing[i];}; {cart.spacing[i] = spacing[i];};
...@@ -988,6 +989,7 @@ public: ...@@ -988,6 +989,7 @@ public:
commCostSet = cart.commCostSet; commCostSet = cart.commCostSet;
cd = cart.cd; cd = cart.cd;
domain = cart.domain; domain = cart.domain;
sub_domains_global = cart.sub_domains_global;
for (size_t i = 0 ; i < dim ; i++) for (size_t i = 0 ; i < dim ; i++)
{ {
...@@ -1027,6 +1029,8 @@ public: ...@@ -1027,6 +1029,8 @@ public:
commCostSet = cart.commCostSet; commCostSet = cart.commCostSet;
cd = cart.cd; cd = cart.cd;
domain = cart.domain; domain = cart.domain;
sub_domains_global.swap(cart.sub_domains_global);
for (size_t i = 0 ; i < dim ; i++) for (size_t i = 0 ; i < dim ; i++)
{ {
spacing[i] = cart.spacing[i]; spacing[i] = cart.spacing[i];
......
...@@ -120,6 +120,11 @@ struct Box_map ...@@ -120,6 +120,11 @@ struct Box_map
Box<dim,T> box; Box<dim,T> box;
long int prc; long int prc;
static bool noPointers()
{
return true;
}
}; };
//! Case for local ghost box //! Case for local ghost box
......
...@@ -373,8 +373,8 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_check_cross_consistency_between_proc_idb ...@@ -373,8 +373,8 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_check_cross_consistency_between_proc_idb
const openfpm::vector<std::pair<size_t, size_t>> & vp_id1 = dec.template ghost_processorID_pair<typename CartDecomposition<3, double>::lc_processor_id, typename CartDecomposition<3, double>::shift_id>(p1, UNIQUE); const openfpm::vector<std::pair<size_t, size_t>> & vp_id1 = dec.template ghost_processorID_pair<typename CartDecomposition<3, double>::lc_processor_id, typename CartDecomposition<3, double>::shift_id>(p1, UNIQUE);
const openfpm::vector<std::pair<size_t, size_t>> & vp_id2 = dec.template ghost_processorID_pair<typename CartDecomposition<3, double>::lc_processor_id, typename CartDecomposition<3, double>::shift_id>(p2, UNIQUE); const openfpm::vector<std::pair<size_t, size_t>> & vp_id2 = dec.template ghost_processorID_pair<typename CartDecomposition<3, double>::lc_processor_id, typename CartDecomposition<3, double>::shift_id>(p2, UNIQUE);
BOOST_REQUIRE_EQUAL(proc1,1); BOOST_REQUIRE_EQUAL(proc1,1ul);
BOOST_REQUIRE_EQUAL(proc2,2); BOOST_REQUIRE_EQUAL(proc2,2ul);
if (vcl.rank() == 2) if (vcl.rank() == 2)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment