diff --git a/openfpm_devices b/openfpm_devices index 669b60068daa79b454b32b3db50158cff1b49bc4..e79687e8594b0761330a34a0f3eecf514f9f9290 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit 669b60068daa79b454b32b3db50158cff1b49bc4 +Subproject commit e79687e8594b0761330a34a0f3eecf514f9f9290 diff --git a/openfpm_vcluster b/openfpm_vcluster index b9c14fadf0d9f5c5f53b4a9e57f29499f50652d9..104ee3d6f6992d8fad992f3405b5b2514a1cd25c 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit b9c14fadf0d9f5c5f53b4a9e57f29499f50652d9 +Subproject commit 104ee3d6f6992d8fad992f3405b5b2514a1cd25c diff --git a/src/Decomposition/Distribution/Distribution_unit_tests.hpp b/src/Decomposition/Distribution/Distribution_unit_tests.hpp index 372152809202ead16623c434099d06d180939ea9..d600a8930fe834e367735335fff5f21620854e99 100644 --- a/src/Decomposition/Distribution/Distribution_unit_tests.hpp +++ b/src/Decomposition/Distribution/Distribution_unit_tests.hpp @@ -669,7 +669,7 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators ) float r_cut = 0.01 / factor; // ghost - Ghost<2,float> ghost(0.01 / factor); + Ghost<2,float> ghost(r_cut); // Distributed vector vector_dist<2,float, animal, CartDecomposition<2, float, HeapMemory, ParMetisDistribution<2, float>>> vd(k,box,bc,ghost); @@ -746,7 +746,7 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators ) bool error = false; - auto NN = vd.getCellList(0.01 / factor); + auto NN = vd.getCellList(0.01 / factor); // iterate across the domain particle @@ -785,10 +785,10 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators ) vd.getProp<animal::status>(q) = DEAD; vd.getProp<animal::time_a>(q) = TIME_A; } - else if (gp == PREY && sp == DEAD) + else if (gp == PREY && gq == PREY && sq != DEAD) { - //animal n; - //n.template get<animal::status>() = DEAD; + vd.add(); + vd.getLastProp<animal::genre>() = 0; } } diff --git a/src/Decomposition/Distribution/parmetis_util.hpp b/src/Decomposition/Distribution/parmetis_util.hpp index f89378daece05a75caa348f7507d76fdd3532360..8b88af3d7844015eade38db72e712a1d4857c47e 100755 --- a/src/Decomposition/Distribution/parmetis_util.hpp +++ b/src/Decomposition/Distribution/parmetis_util.hpp @@ -447,6 +447,8 @@ public: Mg.itr = new real_t[1]; Mg.itr[0] = 1000.0; + Mg.objval = new idx_t[1]; + //! init tpwgts to have balanced vertices and ubvec Mg.tpwgts = new real_t[Mg.nparts[0]];