Commit db2c2ecc authored by incardon's avatar incardon

Working with 4 processors

parent d1b11807
...@@ -74,9 +74,10 @@ pdata-HeapMemory.o: ../../OpenFPM_devices/src/memory/HeapMemory.cpp \ ...@@ -74,9 +74,10 @@ pdata-HeapMemory.o: ../../OpenFPM_devices/src/memory/HeapMemory.cpp \
/usr/include/sys/types.h /usr/include/sys/select.h \ /usr/include/sys/types.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/sys/sysmacros.h /usr/include/alloca.h \ /usr/include/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/bits/stdlib-float.h /usr/include/c++/4.9.2/cstdio \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
/usr/include/libio.h /usr/include/_G_config.h \ /usr/include/c++/4.9.2/cstdio /usr/include/libio.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
/usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
/usr/include/c++/4.9.2/cerrno /usr/include/errno.h \ /usr/include/c++/4.9.2/cerrno /usr/include/errno.h \
/usr/include/bits/errno.h /usr/include/linux/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \
/usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
...@@ -301,6 +302,8 @@ pdata-HeapMemory.o: ../../OpenFPM_devices/src/memory/HeapMemory.cpp \ ...@@ -301,6 +302,8 @@ pdata-HeapMemory.o: ../../OpenFPM_devices/src/memory/HeapMemory.cpp \
/usr/include/alloca.h: /usr/include/alloca.h:
/usr/include/bits/stdlib-bsearch.h:
/usr/include/bits/stdlib-float.h: /usr/include/bits/stdlib-float.h:
/usr/include/c++/4.9.2/cstdio: /usr/include/c++/4.9.2/cstdio:
...@@ -313,6 +316,8 @@ pdata-HeapMemory.o: ../../OpenFPM_devices/src/memory/HeapMemory.cpp \ ...@@ -313,6 +316,8 @@ pdata-HeapMemory.o: ../../OpenFPM_devices/src/memory/HeapMemory.cpp \
/usr/include/bits/sys_errlist.h: /usr/include/bits/sys_errlist.h:
/usr/include/bits/stdio.h:
/usr/include/c++/4.9.2/cerrno: /usr/include/c++/4.9.2/cerrno:
/usr/include/errno.h: /usr/include/errno.h:
......
...@@ -71,9 +71,10 @@ pdata-Memleak_check.o: ../../OpenFPM_data/src/Memleak_check.cpp \ ...@@ -71,9 +71,10 @@ pdata-Memleak_check.o: ../../OpenFPM_data/src/Memleak_check.cpp \
/usr/include/sys/types.h /usr/include/sys/select.h \ /usr/include/sys/types.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/sys/sysmacros.h /usr/include/alloca.h \ /usr/include/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/bits/stdlib-float.h /usr/include/c++/4.9.2/cstdio \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
/usr/include/libio.h /usr/include/_G_config.h \ /usr/include/c++/4.9.2/cstdio /usr/include/libio.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
/usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
/usr/include/c++/4.9.2/cerrno /usr/include/errno.h \ /usr/include/c++/4.9.2/cerrno /usr/include/errno.h \
/usr/include/bits/errno.h /usr/include/linux/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \
/usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
...@@ -302,6 +303,8 @@ pdata-Memleak_check.o: ../../OpenFPM_data/src/Memleak_check.cpp \ ...@@ -302,6 +303,8 @@ pdata-Memleak_check.o: ../../OpenFPM_data/src/Memleak_check.cpp \
/usr/include/alloca.h: /usr/include/alloca.h:
/usr/include/bits/stdlib-bsearch.h:
/usr/include/bits/stdlib-float.h: /usr/include/bits/stdlib-float.h:
/usr/include/c++/4.9.2/cstdio: /usr/include/c++/4.9.2/cstdio:
...@@ -314,6 +317,8 @@ pdata-Memleak_check.o: ../../OpenFPM_data/src/Memleak_check.cpp \ ...@@ -314,6 +317,8 @@ pdata-Memleak_check.o: ../../OpenFPM_data/src/Memleak_check.cpp \
/usr/include/bits/sys_errlist.h: /usr/include/bits/sys_errlist.h:
/usr/include/bits/stdio.h:
/usr/include/c++/4.9.2/cerrno: /usr/include/c++/4.9.2/cerrno:
/usr/include/errno.h: /usr/include/errno.h:
......
...@@ -78,9 +78,10 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -78,9 +78,10 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
/usr/include/sys/types.h /usr/include/sys/select.h \ /usr/include/sys/types.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/sys/sysmacros.h /usr/include/alloca.h \ /usr/include/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/bits/stdlib-float.h /usr/include/c++/4.9.2/cstdio \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
/usr/include/libio.h /usr/include/_G_config.h \ /usr/include/c++/4.9.2/cstdio /usr/include/libio.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
/usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
/usr/include/c++/4.9.2/cerrno /usr/include/errno.h \ /usr/include/c++/4.9.2/cerrno /usr/include/errno.h \
/usr/include/bits/errno.h /usr/include/linux/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \
/usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
...@@ -789,7 +790,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -789,7 +790,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
/usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
/usr/include/bits/inf.h /usr/include/bits/nan.h \ /usr/include/bits/inf.h /usr/include/bits/nan.h \
/usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
/usr/include/c++/4.9.2/sstream /usr/include/c++/4.9.2/bits/sstream.tcc \ /usr/include/bits/mathinline.h /usr/include/c++/4.9.2/sstream \
/usr/include/c++/4.9.2/bits/sstream.tcc \
/usr/include/boost/type_traits/is_compound.hpp \ /usr/include/boost/type_traits/is_compound.hpp \
/usr/include/boost/type_traits/is_copy_constructible.hpp \ /usr/include/boost/type_traits/is_copy_constructible.hpp \
/usr/include/boost/noncopyable.hpp \ /usr/include/boost/noncopyable.hpp \
...@@ -998,11 +1000,6 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -998,11 +1000,6 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IallreduceW.hpp \ ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IallreduceW.hpp \
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IrecvW.hpp \ ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IrecvW.hpp \
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp \ ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp \
../../OpenFPM_data/src/util/check_no_pointers.hpp \
../../OpenFPM_data/src/util/common.hpp \
../../OpenFPM_data/src/util/util_debug.hpp \
/usr/include/c++/4.9.2/cxxabi.h \
/usr/include/c++/4.9.2/x86_64-redhat-linux/bits/cxxabi_tweaks.h \
../../OpenFPM_vcluster/src/util/Vcluster_log.hpp \ ../../OpenFPM_vcluster/src/util/Vcluster_log.hpp \
/usr/include/c++/4.9.2/fstream /usr/include/c++/4.9.2/bits/codecvt.h \ /usr/include/c++/4.9.2/fstream /usr/include/c++/4.9.2/bits/codecvt.h \
/usr/include/c++/4.9.2/x86_64-redhat-linux/bits/basic_file.h \ /usr/include/c++/4.9.2/x86_64-redhat-linux/bits/basic_file.h \
...@@ -1226,6 +1223,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -1226,6 +1223,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
/usr/include/alloca.h: /usr/include/alloca.h:
/usr/include/bits/stdlib-bsearch.h:
/usr/include/bits/stdlib-float.h: /usr/include/bits/stdlib-float.h:
/usr/include/c++/4.9.2/cstdio: /usr/include/c++/4.9.2/cstdio:
...@@ -1238,6 +1237,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -1238,6 +1237,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
/usr/include/bits/sys_errlist.h: /usr/include/bits/sys_errlist.h:
/usr/include/bits/stdio.h:
/usr/include/c++/4.9.2/cerrno: /usr/include/c++/4.9.2/cerrno:
/usr/include/errno.h: /usr/include/errno.h:
...@@ -2738,6 +2739,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -2738,6 +2739,8 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
/usr/include/bits/mathcalls.h: /usr/include/bits/mathcalls.h:
/usr/include/bits/mathinline.h:
/usr/include/c++/4.9.2/sstream: /usr/include/c++/4.9.2/sstream:
/usr/include/c++/4.9.2/bits/sstream.tcc: /usr/include/c++/4.9.2/bits/sstream.tcc:
...@@ -3184,16 +3187,6 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \ ...@@ -3184,16 +3187,6 @@ pdata-VCluster.o: ../../OpenFPM_vcluster/src/VCluster.cpp \
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp: ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp:
../../OpenFPM_data/src/util/check_no_pointers.hpp:
../../OpenFPM_data/src/util/common.hpp:
../../OpenFPM_data/src/util/util_debug.hpp:
/usr/include/c++/4.9.2/cxxabi.h:
/usr/include/c++/4.9.2/x86_64-redhat-linux/bits/cxxabi_tweaks.h:
../../OpenFPM_vcluster/src/util/Vcluster_log.hpp: ../../OpenFPM_vcluster/src/util/Vcluster_log.hpp:
/usr/include/c++/4.9.2/fstream: /usr/include/c++/4.9.2/fstream:
......
...@@ -70,9 +70,10 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -70,9 +70,10 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
/usr/include/sys/types.h /usr/include/sys/select.h \ /usr/include/sys/types.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/sys/sysmacros.h /usr/include/alloca.h \ /usr/include/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/bits/stdlib-float.h /usr/include/c++/4.9.2/cstdio \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
/usr/include/libio.h /usr/include/_G_config.h \ /usr/include/c++/4.9.2/cstdio /usr/include/libio.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
/usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
/usr/include/c++/4.9.2/cerrno /usr/include/errno.h \ /usr/include/c++/4.9.2/cerrno /usr/include/errno.h \
/usr/include/bits/errno.h /usr/include/linux/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \
/usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
...@@ -737,7 +738,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -737,7 +738,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
/usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
/usr/include/bits/inf.h /usr/include/bits/nan.h \ /usr/include/bits/inf.h /usr/include/bits/nan.h \
/usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
/usr/include/c++/4.9.2/sstream /usr/include/c++/4.9.2/bits/sstream.tcc \ /usr/include/bits/mathinline.h /usr/include/c++/4.9.2/sstream \
/usr/include/c++/4.9.2/bits/sstream.tcc \
/usr/include/boost/type_traits/is_compound.hpp \ /usr/include/boost/type_traits/is_compound.hpp \
/usr/include/boost/type_traits/is_copy_constructible.hpp \ /usr/include/boost/type_traits/is_copy_constructible.hpp \
/usr/include/boost/noncopyable.hpp \ /usr/include/boost/noncopyable.hpp \
...@@ -1111,6 +1113,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1111,6 +1113,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
/usr/include/boost/math/tools/user.hpp \ /usr/include/boost/math/tools/user.hpp \
/usr/include/boost/detail/fenv.hpp /usr/include/c++/4.9.2/fenv.h \ /usr/include/boost/detail/fenv.hpp /usr/include/c++/4.9.2/fenv.h \
/usr/include/fenv.h /usr/include/bits/fenv.h \ /usr/include/fenv.h /usr/include/bits/fenv.h \
/usr/include/bits/fenvinline.h \
/usr/include/boost/math/special_functions/math_fwd.hpp \ /usr/include/boost/math/special_functions/math_fwd.hpp \
/usr/include/boost/math/special_functions/detail/round_fwd.hpp \ /usr/include/boost/math/special_functions/detail/round_fwd.hpp \
/usr/include/boost/math/tools/promotion.hpp \ /usr/include/boost/math/tools/promotion.hpp \
...@@ -1306,11 +1309,6 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1306,11 +1309,6 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IallreduceW.hpp \ ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IallreduceW.hpp \
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IrecvW.hpp \ ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IrecvW.hpp \
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp \ ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp \
../../OpenFPM_data/src/util/check_no_pointers.hpp \
../../OpenFPM_data/src/util/common.hpp \
../../OpenFPM_data/src/util/util_debug.hpp \
/usr/include/c++/4.9.2/cxxabi.h \
/usr/include/c++/4.9.2/x86_64-redhat-linux/bits/cxxabi_tweaks.h \
../../OpenFPM_vcluster/src/util/Vcluster_log.hpp \ ../../OpenFPM_vcluster/src/util/Vcluster_log.hpp \
../../OpenFPM_data/src/timer.hpp \ ../../OpenFPM_data/src/timer.hpp \
../../OpenFPM_data/src/Space/SpaceBox.hpp \ ../../OpenFPM_data/src/Space/SpaceBox.hpp \
...@@ -1324,7 +1322,10 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1324,7 +1322,10 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
../../OpenFPM_data/src/util/object_util.hpp \ ../../OpenFPM_data/src/util/object_util.hpp \
../../OpenFPM_data/src/util/object_creator.hpp \ ../../OpenFPM_data/src/util/object_creator.hpp \
../../OpenFPM_data/src/util/util_debug.hpp \ ../../OpenFPM_data/src/util/util_debug.hpp \
/usr/include/c++/4.9.2/cxxabi.h \
/usr/include/c++/4.9.2/x86_64-redhat-linux/bits/cxxabi_tweaks.h \
../../OpenFPM_data/src/util/check_no_pointers.hpp \ ../../OpenFPM_data/src/util/check_no_pointers.hpp \
../../OpenFPM_data/src/util/common.hpp \
../../OpenFPM_data/src/util/object_s_di.hpp \ ../../OpenFPM_data/src/util/object_s_di.hpp \
../../OpenFPM_data/src/util/object_si_d.hpp \ ../../OpenFPM_data/src/util/object_si_d.hpp \
../../OpenFPM_devices/src/memory/ExtPreAlloc.hpp \ ../../OpenFPM_devices/src/memory/ExtPreAlloc.hpp \
...@@ -1399,6 +1400,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1399,6 +1400,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
../../OpenFPM_vcluster/src/Packer.hpp \ ../../OpenFPM_vcluster/src/Packer.hpp \
../../OpenFPM_data/src/Grid/util.hpp \ ../../OpenFPM_data/src/Grid/util.hpp \
../../OpenFPM_data/src/Vector/util.hpp \ ../../OpenFPM_data/src/Vector/util.hpp \
../../OpenFPM_data/src/util/util_debug.hpp \
../../OpenFPM_vcluster/src/Pack_stat.hpp \ ../../OpenFPM_vcluster/src/Pack_stat.hpp \
../../OpenFPM_vcluster/src/Pack_selector.hpp \ ../../OpenFPM_vcluster/src/Pack_selector.hpp \
../../OpenFPM_vcluster/src/Unpacker.hpp \ ../../OpenFPM_vcluster/src/Unpacker.hpp \
...@@ -1418,7 +1420,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1418,7 +1420,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
../../OpenFPM_data/src/NN/CellList/CellListBal.hpp \ ../../OpenFPM_data/src/NN/CellList/CellListBal.hpp \
../../OpenFPM_data/src/NN/CellList/CellListMem.hpp \ ../../OpenFPM_data/src/NN/CellList/CellListMem.hpp \
../../OpenFPM_data/src/Space/Ghost.hpp ../../OpenFPM_IO/src/util.hpp \ ../../OpenFPM_data/src/Space/Ghost.hpp ../../OpenFPM_IO/src/util.hpp \
unit_test_init_cleanup.hpp Decomposition/ORB_unit_test.hpp \ unit_test_init_cleanup.hpp Decomposition/CartDecomposition_unit_test.hpp \
Decomposition/CartDecomposition.hpp Decomposition/ORB_unit_test.hpp \
Decomposition/ORB.hpp ../../OpenFPM_data/src/data_type/scalar.hpp \ Decomposition/ORB.hpp ../../OpenFPM_data/src/data_type/scalar.hpp \
Graph/CartesianGraphFactory_unit_test.hpp \ Graph/CartesianGraphFactory_unit_test.hpp \
Graph/CartesianGraphFactory.hpp metis_util_unit_test.hpp metis_util.hpp \ Graph/CartesianGraphFactory.hpp metis_util_unit_test.hpp metis_util.hpp \
...@@ -1430,9 +1433,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1430,9 +1433,7 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
../../OpenFPM_devices/src/memory/PreAllocHeapMemory.hpp \ ../../OpenFPM_devices/src/memory/PreAllocHeapMemory.hpp \
../../OpenFPM_devices/src/memory/HeapMemory.hpp \ ../../OpenFPM_devices/src/memory/HeapMemory.hpp \
../../OpenFPM_IO/src/CSVWriter.hpp \ ../../OpenFPM_IO/src/CSVWriter.hpp \
../../OpenFPM_IO/src/csv_multiarray.hpp \ ../../OpenFPM_IO/src/csv_multiarray.hpp
Decomposition/CartDecomposition_unit_test.hpp \
Decomposition/CartDecomposition.hpp
/usr/include/stdc-predef.h: /usr/include/stdc-predef.h:
...@@ -1628,6 +1629,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1628,6 +1629,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
/usr/include/alloca.h: /usr/include/alloca.h:
/usr/include/bits/stdlib-bsearch.h:
/usr/include/bits/stdlib-float.h: /usr/include/bits/stdlib-float.h:
/usr/include/c++/4.9.2/cstdio: /usr/include/c++/4.9.2/cstdio:
...@@ -1640,6 +1643,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \ ...@@ -1640,6 +1643,8 @@ pdata-main.o: main.cpp /usr/include/stdc-predef.h \
/usr/include/bits/sys_errlist.h: /usr/include/bits/sys_errlist.h:
/usr/include/bits/stdio.h:
/usr/include/c++/4.9.2/cerrno: /usr/include/c++/4.9.2/cerrno:
/usr/include/errno.h: /usr/include/errno.h:
...@@ -3052,6 +3057,8 @@ Graph/CartesianGraphFactory.hpp: ...@@ -3052,6 +3057,8 @@ Graph/CartesianGraphFactory.hpp:
/usr/include/bits/mathcalls.h: /usr/include/bits/mathcalls.h:
/usr/include/bits/mathinline.h:
/usr/include/c++/4.9.2/sstream: /usr/include/c++/4.9.2/sstream:
/usr/include/c++/4.9.2/bits/sstream.tcc: /usr/include/c++/4.9.2/bits/sstream.tcc:
...@@ -3884,6 +3891,8 @@ Graph/CartesianGraphFactory.hpp: ...@@ -3884,6 +3891,8 @@ Graph/CartesianGraphFactory.hpp:
/usr/include/bits/fenv.h: /usr/include/bits/fenv.h:
/usr/include/bits/fenvinline.h:
/usr/include/boost/math/special_functions/math_fwd.hpp: /usr/include/boost/math/special_functions/math_fwd.hpp:
/usr/include/boost/math/special_functions/detail/round_fwd.hpp: /usr/include/boost/math/special_functions/detail/round_fwd.hpp:
...@@ -4314,16 +4323,6 @@ Grid/grid_dist_id.hpp: ...@@ -4314,16 +4323,6 @@ Grid/grid_dist_id.hpp:
../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp: ../../OpenFPM_vcluster/src/MPI_wrapper/MPI_IsendW.hpp:
../../OpenFPM_data/src/util/check_no_pointers.hpp:
../../OpenFPM_data/src/util/common.hpp:
../../OpenFPM_data/src/util/util_debug.hpp:
/usr/include/c++/4.9.2/cxxabi.h:
/usr/include/c++/4.9.2/x86_64-redhat-linux/bits/cxxabi_tweaks.h:
../../OpenFPM_vcluster/src/util/Vcluster_log.hpp: ../../OpenFPM_vcluster/src/util/Vcluster_log.hpp:
../../OpenFPM_data/src/timer.hpp: ../../OpenFPM_data/src/timer.hpp:
...@@ -4352,8 +4351,14 @@ Grid/grid_dist_key.hpp: ...@@ -4352,8 +4351,14 @@ Grid/grid_dist_key.hpp:
../../OpenFPM_data/src/util/util_debug.hpp: ../../OpenFPM_data/src/util/util_debug.hpp:
/usr/include/c++/4.9.2/cxxabi.h:
/usr/include/c++/4.9.2/x86_64-redhat-linux/bits/cxxabi_tweaks.h:
../../OpenFPM_data/src/util/check_no_pointers.hpp: ../../OpenFPM_data/src/util/check_no_pointers.hpp:
../../OpenFPM_data/src/util/common.hpp:
../../OpenFPM_data/src/util/object_s_di.hpp: ../../OpenFPM_data/src/util/object_s_di.hpp:
../../OpenFPM_data/src/util/object_si_d.hpp: ../../OpenFPM_data/src/util/object_si_d.hpp:
...@@ -4502,6 +4507,8 @@ Grid/grid_dist_key.hpp: ...@@ -4502,6 +4507,8 @@ Grid/grid_dist_key.hpp:
../../OpenFPM_data/src/Vector/util.hpp: ../../OpenFPM_data/src/Vector/util.hpp:
../../OpenFPM_data/src/util/util_debug.hpp:
../../OpenFPM_vcluster/src/Pack_stat.hpp: ../../OpenFPM_vcluster/src/Pack_stat.hpp:
../../OpenFPM_vcluster/src/Pack_selector.hpp: ../../OpenFPM_vcluster/src/Pack_selector.hpp:
...@@ -4552,6 +4559,10 @@ dec_optimizer.hpp: ...@@ -4552,6 +4559,10 @@ dec_optimizer.hpp:
unit_test_init_cleanup.hpp: unit_test_init_cleanup.hpp:
Decomposition/CartDecomposition_unit_test.hpp:
Decomposition/CartDecomposition.hpp:
Decomposition/ORB_unit_test.hpp: Decomposition/ORB_unit_test.hpp:
Decomposition/ORB.hpp: Decomposition/ORB.hpp:
...@@ -4591,7 +4602,3 @@ Vector/vector_dist_key.hpp: ...@@ -4591,7 +4602,3 @@ Vector/vector_dist_key.hpp:
../../OpenFPM_IO/src/CSVWriter.hpp: ../../OpenFPM_IO/src/CSVWriter.hpp:
../../OpenFPM_IO/src/csv_multiarray.hpp: ../../OpenFPM_IO/src/csv_multiarray.hpp:
Decomposition/CartDecomposition_unit_test.hpp:
Decomposition/CartDecomposition.hpp:
...@@ -104,6 +104,23 @@ class CartDecomposition ...@@ -104,6 +104,23 @@ class CartDecomposition
} }
}; };
//! Particular case for internal ghost boxes, in contain the internal local ghost box
struct Box_sub_k : Box<dim,T>
{
// Domain id
size_t sub;
//! k \see getLocalGhostIBoxE
long int k;
Box_sub_k operator=(const Box<dim,T> & box)
{
::Box<dim,T>::operator=(box);
return *this;
}
};
struct Box_dom struct Box_dom
{ {
// Intersection between the local sub-domain enlarged by the ghost and the contiguous processor // Intersection between the local sub-domain enlarged by the ghost and the contiguous processor
...@@ -115,6 +132,18 @@ class CartDecomposition ...@@ -115,6 +132,18 @@ class CartDecomposition
openfpm::vector_std< Box_sub> ibx; openfpm::vector_std< Box_sub> ibx;
}; };
//! Case for local ghost box
struct lBox_dom
{
// Intersection between the local sub-domain enlarged by the ghost and the contiguous processor
// sub-domains (External ghost)
openfpm::vector_std< Box_sub > ebx;
// Intersection between the contiguous processor sub-domain enlarged by the ghost with the
// local sub-domain (Internal ghost)
openfpm::vector_std< Box_sub_k> ibx;
};
public: public:
//! Type of the domain we are going to decompose //! Type of the domain we are going to decompose
...@@ -154,7 +183,7 @@ private: ...@@ -154,7 +183,7 @@ private:
std::unordered_map<size_t, N_box> nn_processor_subdomains; std::unordered_map<size_t, N_box> nn_processor_subdomains;
//! it contain the internal ghosts of the local processor //! it contain the internal ghosts of the local processor
openfpm::vector<Box_dom> loc_ghost_box; openfpm::vector<lBox_dom> loc_ghost_box;
//! Structure that contain for each sub-domain box the processor id //! Structure that contain for each sub-domain box the processor id
//! exist for efficient global communication //! exist for efficient global communication
...@@ -176,10 +205,12 @@ private: ...@@ -176,10 +205,12 @@ private:
//! Runtime virtual cluster machine //! Runtime virtual cluster machine
Vcluster & v_cl; Vcluster & v_cl;
//! Cell-list that store the geometrical information about the intersection between the local sub-domain //! Cell-list that store the geometrical information of the internal ghost boxes
//! and the near processor sub-domains
CellList<dim,T,FAST> geo_cell; CellList<dim,T,FAST> geo_cell;
//! Cell-list that store the geometrical information of the local internal ghost boxes
CellList<dim,T,FAST> lgeo_cell;
/*! \brief Create internally the decomposition /*! \brief Create internally the decomposition
* *
...@@ -332,8 +363,12 @@ private: ...@@ -332,8 +363,12 @@ private:
// Initialize the geo_cell structure // Initialize the geo_cell structure
geo_cell.Initialize(domain,div,orig); geo_cell.Initialize(domain,div,orig);
lgeo_cell.Initialize(domain,div,orig);
} }
// Save the ghost boundaries
Ghost<dim,T> ghost;
/*! \brief Create the external local ghost boxes /*! \brief Create the external local ghost boxes
* *
* \param ghost margin to enlarge * \param ghost margin to enlarge
...@@ -341,13 +376,18 @@ private: ...@@ -341,13 +376,18 @@ private:
*/ */
void create_loc_ghost_ebox(Ghost<dim,T> & ghost) void create_loc_ghost_ebox(Ghost<dim,T> & ghost)
{ {
// Save the ghost
this->ghost = ghost;
loc_ghost_box.resize(sub_domains.size()); loc_ghost_box.resize(sub_domains.size());
// For each sub-domain // For each sub-domain
for (size_t i = 0 ; i < sub_domains.size() ; i++) for (size_t i = 0 ; i < sub_domains.size() ; i++)
{ {
// add a local ghost box SpaceBox<dim,T> sub_with_ghost = sub_domains.get(i);
loc_ghost_box.add();
// enlarge the sub-domain with the ghost
sub_with_ghost.enlarge(ghost);
// intersect with the other local sub-domains // intersect with the other local sub-domains
for (size_t j = 0 ; j < sub_domains.size() ; j++) for (size_t j = 0 ; j < sub_domains.size() ; j++)
...@@ -355,10 +395,6 @@ private: ...@@ -355,10 +395,6 @@ private:
if (i == j) if (i == j)
continue; continue;
SpaceBox<dim,T> sub_with_ghost = sub_domains.get(j);
// enlarge the sub-domain with the ghost
sub_with_ghost.enlarge(ghost);
::Box<dim,T> bi; ::Box<dim,T> bi;
bool intersect = sub_with_ghost.Intersect(::SpaceBox<dim,T>(sub_domains.get(j)),bi); bool intersect = sub_with_ghost.Intersect(::SpaceBox<dim,T>(sub_domains.get(j)),bi);
...@@ -369,7 +405,18 @@ private: ...@@ -369,7 +405,18 @@ private:
b.sub = j; b.sub = j;
b = bi; b = bi;
loc_ghost_box.get(i).ibx.add(b); // local external ghost box
loc_ghost_box.get(i).ebx.add(b);
// search this box in the internal box of the sub-domain j
for (size_t k = 0; k < loc_ghost_box.get(j).ibx.size() ; k++)
{
if (loc_ghost_box.get(j).ibx.get(k).sub == i)
{
loc_ghost_box.get(j).ibx.get(k).k = loc_ghost_box.get(i).ebx.size()-1;
break;
}
}
} }
} }
} }
...@@ -387,29 +434,26 @@ private: ...@@ -387,29 +434,26 @@ private:
// For each sub-domain // For each sub-domain
for (size_t i = 0 ; i < sub_domains.size() ; i++) for (size_t i = 0 ; i < sub_domains.size() ; i++)
{ {
SpaceBox<dim,T> sub_with_ghost = sub_domains.get(i);
// enlarge the sub-domain with the ghost
sub_with_ghost.enlarge(ghost);
// add a local ghost box
loc_ghost_box.add();