From 6168d1877cf2b5028b91a8d8f715275aee4a1052 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sun, 17 Dec 2017 11:32:43 +0100
Subject: [PATCH] Latest modules
---
.../3_gray_scott_3d_vectorization/main.cpp | 48 +------------------
openfpm_io | 2 +-
2 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/example/Grid/3_gray_scott_3d_vectorization/main.cpp b/example/Grid/3_gray_scott_3d_vectorization/main.cpp
index fc1625b3b..d99e431b0 100644
--- a/example/Grid/3_gray_scott_3d_vectorization/main.cpp
+++ b/example/Grid/3_gray_scott_3d_vectorization/main.cpp
@@ -264,53 +264,10 @@ int main(int argc, char* argv[])
grid_dist_id<3, double, aggregate<double>> OldU(sz,domain,g,bc);
grid_dist_id<3, double, aggregate<double>> OldV(OldU.getDecomposition(),sz,g);
- OldU.getDecomposition().write("Test");
-
// New grid with the decomposition of the old grid
grid_dist_id<3, double, aggregate<double>> NewU(OldU.getDecomposition(),sz,g);
grid_dist_id<3, double, aggregate<double>> NewV(OldV.getDecomposition(),sz,g);
- //////////// DEBUG /////////////////////////
- //
- //
- //
-
- auto debug_it = OldU.getDomainIterator();
-
- int count_ = 0;
-
- while (debug_it.isNext())
- {
- auto key = debug_it.get();
-
- count_++;
-
- ++debug_it;
- }
-
- auto debug_it2 = OldU.getDomainGhostIterator();
-
- int count_dg = 0;
-
- while (debug_it2.isNext())
- {
- auto key = debug_it2.get();
-
- count_dg++;
-
- ++debug_it2;
- }
-
- auto & v_cl = create_vcluster();
-
- count_dg -= count_;
- v_cl.sum(count_dg);
- v_cl.execute();
-
- std::cout << "Ghost points: " << count_dg << std::endl;
-
- //////////////////////////////////////////////
-
// spacing of the grid on x and y
double spacing[3] = {OldU.spacing(0),OldU.spacing(1),OldU.spacing(2)};
@@ -340,7 +297,7 @@ int main(int argc, char* argv[])
{-1,0,0},
{1,0,0}};
- for (size_t i = 0; i < 1 /*timeSteps*/; ++i)
+ for (size_t i = 0; i < timeSteps; ++i)
{
if (i % 300 == 0)
std::cout << "STEP: " << i << std::endl;
@@ -371,11 +328,8 @@ int main(int argc, char* argv[])
{
step(OldU,OldV,NewU,NewV,star_stencil_3D,uFactor,vFactor,deltaT,F,K);
- for (size_t i = 0 ; i < 10000 ; i++)
- {
NewU.ghost_get<0>();
NewV.ghost_get<0>();
- }
}
else
{
diff --git a/openfpm_io b/openfpm_io
index fac23ddd9..89411e76f 160000
--- a/openfpm_io
+++ b/openfpm_io
@@ -1 +1 @@
-Subproject commit fac23ddd992dc17d82904bd5083f5235416c2255
+Subproject commit 89411e76fbed1ab098d2bfec13e7759aca51a14d
--
GitLab