Commit 49d2dd26 authored by incardon's avatar incardon

Fixing pdata with grid_sm and changes on OpenFPM_data

parent 3a20e85c
...@@ -942,16 +942,18 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -942,16 +942,18 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
../../OpenFPM_data/src/memory.hpp ../../OpenFPM_data/src/config.h \ ../../OpenFPM_data/src/memory.hpp ../../OpenFPM_data/src/config.h \
../../OpenFPM_data/src/memory.hpp ../../OpenFPM_data/src/meta_copy.hpp \ ../../OpenFPM_data/src/memory.hpp ../../OpenFPM_data/src/meta_copy.hpp \
../../OpenFPM_data/src/Memleak_check.hpp \ ../../OpenFPM_data/src/Memleak_check.hpp \
../../OpenFPM_data/src/Grid/grid.hpp /usr/include/boost/shared_array.hpp \ ../../OpenFPM_data/src/for_each_ref.hpp \
../../OpenFPM_data/src/Grid/grid_sm.hpp \
/usr/include/boost/shared_array.hpp \
/usr/include/boost/smart_ptr/shared_array.hpp \ /usr/include/boost/smart_ptr/shared_array.hpp \
../../OpenFPM_data/src/Space/Shape/Box.hpp \ ../../OpenFPM_data/src/Space/Shape/Box.hpp \
../../OpenFPM_data/src/Space/Shape/Sphere.hpp \ ../../OpenFPM_data/src/Space/Shape/Sphere.hpp \
../../OpenFPM_data/src/base_type.hpp \ ../../OpenFPM_data/src/base_type.hpp \
../../OpenFPM_data/src/Space/Shape/Point.hpp \ ../../OpenFPM_data/src/Space/Shape/Point.hpp \
../../OpenFPM_data/src/Space/Shape/Point.hpp \
../../OpenFPM_data/src/Grid/grid_key.hpp \ ../../OpenFPM_data/src/Grid/grid_key.hpp \
../../OpenFPM_data/src/Grid/comb.hpp \ ../../OpenFPM_data/src/Grid/comb.hpp \
../../OpenFPM_data/src/Grid/grid_key_expression.hpp \ ../../OpenFPM_data/src/Grid/grid_key_expression.hpp \
../../OpenFPM_data/src/Space/Shape/Point.hpp \
../../OpenFPM_data/src/Grid/grid_key.hpp \ ../../OpenFPM_data/src/Grid/grid_key.hpp \
../../OpenFPM_data/src/Grid/Encap.hpp \ ../../OpenFPM_data/src/Grid/Encap.hpp \
../../OpenFPM_data/src/memory_array.hpp \ ../../OpenFPM_data/src/memory_array.hpp \
...@@ -3029,7 +3031,9 @@ config.h: ...@@ -3029,7 +3031,9 @@ config.h:
../../OpenFPM_data/src/Memleak_check.hpp: ../../OpenFPM_data/src/Memleak_check.hpp:
../../OpenFPM_data/src/Grid/grid.hpp: ../../OpenFPM_data/src/for_each_ref.hpp:
../../OpenFPM_data/src/Grid/grid_sm.hpp:
/usr/include/boost/shared_array.hpp: /usr/include/boost/shared_array.hpp:
...@@ -3043,14 +3047,14 @@ config.h: ...@@ -3043,14 +3047,14 @@ config.h:
../../OpenFPM_data/src/Space/Shape/Point.hpp: ../../OpenFPM_data/src/Space/Shape/Point.hpp:
../../OpenFPM_data/src/Space/Shape/Point.hpp:
../../OpenFPM_data/src/Grid/grid_key.hpp: ../../OpenFPM_data/src/Grid/grid_key.hpp:
../../OpenFPM_data/src/Grid/comb.hpp: ../../OpenFPM_data/src/Grid/comb.hpp:
../../OpenFPM_data/src/Grid/grid_key_expression.hpp: ../../OpenFPM_data/src/Grid/grid_key_expression.hpp:
../../OpenFPM_data/src/Space/Shape/Point.hpp:
../../OpenFPM_data/src/Grid/grid_key.hpp: ../../OpenFPM_data/src/Grid/grid_key.hpp:
../../OpenFPM_data/src/Grid/Encap.hpp: ../../OpenFPM_data/src/Grid/Encap.hpp:
......
...@@ -907,16 +907,18 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -907,16 +907,18 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
/usr/include/c++/4.8.3/bits/stl_tree.h \ /usr/include/c++/4.8.3/bits/stl_tree.h \
/usr/include/c++/4.8.3/bits/stl_map.h \ /usr/include/c++/4.8.3/bits/stl_map.h \
/usr/include/c++/4.8.3/bits/stl_multimap.h \ /usr/include/c++/4.8.3/bits/stl_multimap.h \
../../OpenFPM_data/src/Grid/grid.hpp /usr/include/boost/shared_array.hpp \ ../../OpenFPM_data/src/for_each_ref.hpp \
../../OpenFPM_data/src/Grid/grid_sm.hpp \
/usr/include/boost/shared_array.hpp \
/usr/include/boost/smart_ptr/shared_array.hpp \ /usr/include/boost/smart_ptr/shared_array.hpp \
../../OpenFPM_data/src/Space/Shape/Box.hpp \ ../../OpenFPM_data/src/Space/Shape/Box.hpp \
../../OpenFPM_data/src/Space/Shape/Sphere.hpp \ ../../OpenFPM_data/src/Space/Shape/Sphere.hpp \
../../OpenFPM_data/src/base_type.hpp \ ../../OpenFPM_data/src/base_type.hpp \
../../OpenFPM_data/src/Space/Shape/Point.hpp \ ../../OpenFPM_data/src/Space/Shape/Point.hpp \
../../OpenFPM_data/src/Space/Shape/Point.hpp \
../../OpenFPM_data/src/Grid/grid_key.hpp \ ../../OpenFPM_data/src/Grid/grid_key.hpp \
../../OpenFPM_data/src/Grid/comb.hpp \ ../../OpenFPM_data/src/Grid/comb.hpp \
../../OpenFPM_data/src/Grid/grid_key_expression.hpp \ ../../OpenFPM_data/src/Grid/grid_key_expression.hpp \
../../OpenFPM_data/src/Space/Shape/Point.hpp \
../../OpenFPM_data/src/Grid/grid_key.hpp \ ../../OpenFPM_data/src/Grid/grid_key.hpp \
../../OpenFPM_data/src/Grid/Encap.hpp \ ../../OpenFPM_data/src/Grid/Encap.hpp \
../../OpenFPM_data/src/memory_array.hpp \ ../../OpenFPM_data/src/memory_array.hpp \
...@@ -957,7 +959,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -957,7 +959,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
/home/i-bird/MPI/include/openmpi/ompi/mpi/cxx/file_inln.h \ /home/i-bird/MPI/include/openmpi/ompi/mpi/cxx/file_inln.h \
../../OpenFPM_data/src/Vector/map_vector_std.hpp \ ../../OpenFPM_data/src/Vector/map_vector_std.hpp \
../../OpenFPM_data/src/Graph/map_graph.hpp \ ../../OpenFPM_data/src/Graph/map_graph.hpp \
../../OpenFPM_data/src/Grid/grid.hpp \ ../../OpenFPM_data/src/Grid/grid_sm.hpp \
../../OpenFPM_data/src/Space/Shape/HyperCube.hpp \ ../../OpenFPM_data/src/Space/Shape/HyperCube.hpp \
../../OpenFPM_data/src/mathutil.hpp \ ../../OpenFPM_data/src/mathutil.hpp \
/usr/include/boost/test/included/unit_test.hpp \ /usr/include/boost/test/included/unit_test.hpp \
...@@ -3300,7 +3302,9 @@ config.h: ...@@ -3300,7 +3302,9 @@ config.h:
/usr/include/c++/4.8.3/bits/stl_multimap.h: /usr/include/c++/4.8.3/bits/stl_multimap.h:
../../OpenFPM_data/src/Grid/grid.hpp: ../../OpenFPM_data/src/for_each_ref.hpp:
../../OpenFPM_data/src/Grid/grid_sm.hpp:
/usr/include/boost/shared_array.hpp: /usr/include/boost/shared_array.hpp:
...@@ -3314,14 +3318,14 @@ config.h: ...@@ -3314,14 +3318,14 @@ config.h:
../../OpenFPM_data/src/Space/Shape/Point.hpp: ../../OpenFPM_data/src/Space/Shape/Point.hpp:
../../OpenFPM_data/src/Space/Shape/Point.hpp:
../../OpenFPM_data/src/Grid/grid_key.hpp: ../../OpenFPM_data/src/Grid/grid_key.hpp:
../../OpenFPM_data/src/Grid/comb.hpp: ../../OpenFPM_data/src/Grid/comb.hpp:
../../OpenFPM_data/src/Grid/grid_key_expression.hpp: ../../OpenFPM_data/src/Grid/grid_key_expression.hpp:
../../OpenFPM_data/src/Space/Shape/Point.hpp:
../../OpenFPM_data/src/Grid/grid_key.hpp: ../../OpenFPM_data/src/Grid/grid_key.hpp:
../../OpenFPM_data/src/Grid/Encap.hpp: ../../OpenFPM_data/src/Grid/Encap.hpp:
...@@ -3404,7 +3408,7 @@ config.h: ...@@ -3404,7 +3408,7 @@ config.h:
../../OpenFPM_data/src/Graph/map_graph.hpp: ../../OpenFPM_data/src/Graph/map_graph.hpp:
../../OpenFPM_data/src/Grid/grid.hpp: ../../OpenFPM_data/src/Grid/grid_sm.hpp:
../../OpenFPM_data/src/Space/Shape/HyperCube.hpp: ../../OpenFPM_data/src/Space/Shape/HyperCube.hpp:
......
...@@ -167,7 +167,7 @@ private: ...@@ -167,7 +167,7 @@ private:
{ {
// Create a grid where each point is a space // Create a grid where each point is a space
grid<3,void> g(div); grid_sm<dim,void> g(div);
// create a grid_key_dx iterator // create a grid_key_dx iterator
......
...@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_test_use) ...@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_test_use)
// Calculate the number of sub-domain on each dimension // Calculate the number of sub-domain on each dimension
for (int i = 0 ; i < 3 ; i++) for (int i = 0 ; i < 3 ; i++)
{div[i] = round_big_2(pow(n_sub,1.0/3));} {div[i] = openfpm::math::round_big_2(pow(n_sub,1.0/3));}
// Decompose // Decompose
dec.setParameters(div,box); dec.setParameters(div,box);
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#define ORB_HPP_ #define ORB_HPP_
#include "data_type/scalar.hpp" #include "data_type/scalar.hpp"
#include "mathutil.hpp"
/*! \brief this class is a functor for "for_each" algorithm /*! \brief this class is a functor for "for_each" algorithm
* *
...@@ -270,7 +270,7 @@ public: ...@@ -270,7 +270,7 @@ public:
dim_div = 0; dim_div = 0;
n_sub = round_big_2(n_sub); n_sub = openfpm::math::round_big_2(n_sub);
size_t nsub = log2(n_sub); size_t nsub = log2(n_sub);
// number of center or mass needed // number of center or mass needed
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "Vector/map_vector.hpp" #include "Vector/map_vector.hpp"
#include "Graph/map_graph.hpp" #include "Graph/map_graph.hpp"
#include "Grid/grid.hpp" #include "Grid/grid_sm.hpp"
#include "Space/Shape/Box.hpp" #include "Space/Shape/Box.hpp"
#include "Space/Shape/HyperCube.hpp" #include "Space/Shape/HyperCube.hpp"
...@@ -99,7 +99,7 @@ public: ...@@ -99,7 +99,7 @@ public:
// Construct a grid info // Construct a grid info
grid<dim,void> g(sz); grid_sm<dim,void> g(sz);
// Create a graph with the number of vertices equal to the number of // Create a graph with the number of vertices equal to the number of
// grid point // grid point
...@@ -209,7 +209,7 @@ public: ...@@ -209,7 +209,7 @@ public:
// Construct a grid info // Construct a grid info
grid<dim,void> g(sz); grid_sm<dim,void> g(sz);
// Create a graph with the number of vertices equal to the number of // Create a graph with the number of vertices equal to the number of
// grid point // grid point
......
...@@ -114,7 +114,7 @@ public: ...@@ -114,7 +114,7 @@ public:
// each dimension // each dimension
size_t div[dim]; size_t div[dim];
for (int i = 0 ; i < dim ; i++) for (int i = 0 ; i < dim ; i++)
{div[i] = round_big_2(pow(n_sub,1.0/dim));} {div[i] = openfpm::math::round_big_2(pow(n_sub,1.0/dim));}
// Create the sub-domains // Create the sub-domains
dec.setParameters(div); dec.setParameters(div);
...@@ -139,7 +139,7 @@ public: ...@@ -139,7 +139,7 @@ public:
// each dimension // each dimension
size_t div[dim]; size_t div[dim];
for (int i = 0 ; i < dim ; i++) for (int i = 0 ; i < dim ; i++)
{div[i] = round_big_2(pow(n_sub,1.0/dim));} {div[i] = openfpm::math::round_big_2(pow(n_sub,1.0/dim));}
// Box // Box
Box<dim,size_t> b(g_sz); Box<dim,size_t> b(g_sz);
......
...@@ -29,10 +29,10 @@ private: ...@@ -29,10 +29,10 @@ private:
//! Space Decomposition //! Space Decomposition
Decomposition dec; Decomposition dec;
// Particle position vector for each subdomain the last one is the unassigned particles vector // Particle position vector for each sub-domain the last one is the unassigned particles vector
Vcluster_object_array<openfpm::vector<point>> v_pos; Vcluster_object_array<openfpm::vector<point>> v_pos;
// Particle properties vector for each subdomain the last one is the unassigned particles vector // Particle properties vector for each sub-domain the last one is the unassigned particles vector
Vcluster_object_array<openfpm::vector<prop>> v_prp; Vcluster_object_array<openfpm::vector<prop>> v_prp;
// Virtual cluster // Virtual cluster
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
// each dimension // each dimension
size_t div[point::dims]; size_t div[point::dims];
for (int i = 0 ; i < point::dims ; i++) for (int i = 0 ; i < point::dims ; i++)
{div[i] = round_big_2(pow(n_sub,1.0/point::dims));} {div[i] = openfpm::math::round_big_2(pow(n_sub,1.0/point::dims));}
// Create the sub-domains // Create the sub-domains
dec.setParameters(div,box); dec.setParameters(div,box);
...@@ -113,7 +113,7 @@ public: ...@@ -113,7 +113,7 @@ public:
auto it = v_pos.get(up_v).getIterator(); auto it = v_pos.get(up_v).getIterator();
// Label all the particles it the processor id where they should go // Label all the particles with the processor id where they should go
while (it.isNext()) while (it.isNext())
{ {
auto key = it.get(); auto key = it.get();
......
...@@ -101,7 +101,7 @@ class dec_optimizer ...@@ -101,7 +101,7 @@ class dec_optimizer
{ {
// create a grid header for helping // create a grid header for helping
grid<dim,void> gh; grid_sm<dim,void> gh;
private: private:
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
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