diff --git a/.gitignore b/.gitignore
index 75a7f4cc39afdddee3271ae4240b4cbf842a9193..9a81c6da630ebb6f1093d28f325674b0333cf926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,7 +116,6 @@ perf.data.old
projectId.sh
/build
/Default/
-node_modules
/cmake-build-debug-gcc/
/cmake-build-falcon/
/cmake-build-release-gcc/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29334430c2f41e3e7d7d43159863e7d51536e896..3ee76a524b1a1826eb1655d02f2df73ceca763e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ if (POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
-set(openfpm_VERSION 3.2.0)
+set(openfpm_VERSION 3.3.0)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake_modules/)
@@ -285,16 +285,20 @@ add_subdirectory (src)
include(InstallRequiredSystemLibraries)
+string(REPLACE "." ";" VERSION_LIST ${openfpm_VERSION})
+list(GET VERSION_LIST 0 OPENFPM_VERSION_MAJOR)
+list(GET VERSION_LIST 1 OPENFPM_VERSION_MINOR)
+list(GET VERSION_LIST 2 OPENFPM_VERSION_PATCH)
if (CPACK_RUN_INSTALL_DEPENDENCIES)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenFPM distributed data-structures")
set(CPACK_PACKAGE_VENDOR "IBirdSoft")
- set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/gpl-3.0.txt")
- set(CPACK_PACKAGE_VERSION_MAJOR "3")
- set(CPACK_PACKAGE_VERSION_MINOR "2")
- set(CPACK_PACKAGE_VERSION_PATCH "0")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${OPENFPM_VERSION_MAJOR})
+ set(CPACK_PACKAGE_VERSION_MINOR ${OPENFPM_VERSION_MINOR})
+ set(CPACK_PACKAGE_VERSION_PATCH ${OPENFPM_VERSION_PATCH})
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY /usr/local/openfpm)
set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local/openfpm)
@@ -305,7 +309,7 @@ if (CPACK_RUN_INSTALL_DEPENDENCIES)
set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/scripts/postinst)
set(CPACK_POSTFLIGHT_OPENFPM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/src/scripts/postflight)
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/src/script/postinst")
- set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
+ set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
install(FILES $ENV{DEP_PACKING}/openfpm_vars
DESTINATION source
diff --git a/README b/README.txt
similarity index 100%
rename from README
rename to README.txt
diff --git a/example/Numerics/OdeInt/main.cpp b/example/Numerics/OdeInt/main.cpp
index 39908317d21aa113146e6f6eb9bb09b90234cb07..5761968dc72a7032e58df4d5f5798e00493182a2 100644
--- a/example/Numerics/OdeInt/main.cpp
+++ b/example/Numerics/OdeInt/main.cpp
@@ -8,7 +8,7 @@
* * We can use the Odeint library from boost with OpenFPM in two ways. The first example will cover a simple case where we control the time stepping ourselves (time loop of the simulation wriiten by us).
* The 2nd Example will cover a way of using odeint where the time is forwarded by odeint along with an observer.
*
- * * In the example links below, we solve the follwing advection-diffusion PDE for two chemicals with concentration \f$\vec{C}(x,y,t)=(C_x(x,y,t),C_y(x,y,t))\f$ with a fixed velocity \f$\vec{V}(x,y)=(-ye^{10(x^2+y^2)},xe^{10(x^2+y^2)})\f$:
+ * * In the example links below, we solve the follwing advection-diffusion PDE for two chemicals with concentration \f$\vec{C}(x,y,t)=(C_x(x,y,t),C_y(x,y,t))\f$ with a fixed velocity \f$\vec{V}(x,y)=(-ye^{-10(x^2+y^2)},xe^{-10(x^2+y^2)})\f$:
*
* @f[ \frac{\partial\vec{C}}{dt}=\vec{V}.\nabla_{\{x,y\}} \vec{C} + 0.1\Delta_{\{x,y\}} \vec{C} @f]
* in 2d domain [-1,-1]*[1,1] with the boundary conditions on the walls as no-slip for velocity \f$\vec{V}=0\f$ and sink for the chemicals \f$\vec{C}=0\f$ for all time \f$t\f$.
@@ -34,7 +34,7 @@
* In this example, we perform time integration in a 2d domain of particles of a following partial differential equation:
*
* @f[ \frac{\partial\vec{C}}{dt}=\vec{V}.\nabla C + 0.1\Delta C @f]
- * in 2d domain [-1,-1]*[1,1] with a fixed velocity \f$\vec{V}(x,y)=(-ye^{10(x^2+y^2)},xe^{10(x^2+y^2)})\f$, and the boundary conditions on the walls as no-slip for velocity \f$\vec{V}=0\f$ and sink for the chemicals \f$\vec{C}=0\f$ for all time \f$t\f$.
+ * in 2d domain [-1,-1]*[1,1] with a fixed velocity \f$\vec{V}(x,y)=(-ye^{-10(x^2+y^2)},xe^{-10(x^2+y^2)})\f$, and the boundary conditions on the walls as no-slip for velocity \f$\vec{V}=0\f$ and sink for the chemicals \f$\vec{C}=0\f$ for all time \f$t\f$.
* * Further, we start with the initial condition for the concentration as
* @f[\vec{C}=\begin{cases}
* (1,0)\text{ for } x=0,-0.5<y<0\\
diff --git a/example/Numerics/OdeInt/main2.cpp b/example/Numerics/OdeInt/main2.cpp
index 2355078198d29902563efeaf61a7f19cc7421ca9..b991e7c52c73590356e101bbbd3c7da931e50942 100644
--- a/example/Numerics/OdeInt/main2.cpp
+++ b/example/Numerics/OdeInt/main2.cpp
@@ -7,7 +7,7 @@
* In this example, we perform time integration in a 2d domain of particles of a following partial differential equation:
*
* @f[ \frac{\partial\vec{C}}{dt}=\vec{V}.\nabla_{\{x,y\}} U + 0.1*\Delta_{\{x,y\}} U @f]
- * in 2d domain [-1,-1]*[1,1] with a fixed velocity \f$\vec{V}(x,y)=(-ye^{10(x^2+y^2)},xe^{10(x^2+y^2)})\f$, and the boundary conditions on the walls as no-slip for velocity \f$\vec{V}=0\f$ and sink for the chemicals \f$\vec{C}=0\f$ for all time \f$t\f$.
+ * in 2d domain [-1,-1]*[1,1] with a fixed velocity \f$\vec{V}(x,y)=(-ye^{-10(x^2+y^2)},xe^{-10(x^2+y^2)})\f$, and the boundary conditions on the walls as no-slip for velocity \f$\vec{V}=0\f$ and sink for the chemicals \f$\vec{C}=0\f$ for all time \f$t\f$.
* Further, we start with the initial condition for the concentration as
* @f[\vec{C}=\begin{cases}
* (1,0)\text{ for } x=0,-0.5<y<0\\
diff --git a/install b/install
index 6b5903549f0e22b7e48740755ac3abde02ddee7e..fff9a319fedad10cbe57393abada4183b8ca4b91 100755
--- a/install
+++ b/install
@@ -1,4 +1,5 @@
#! /bin/bash
+
source script/help
source script/discover_os
source script/show_solutions
@@ -459,7 +460,7 @@ fi
################ Parallel debugger #######################
echo "Installing parallel debugger"
-install_gdbgui
+install_gdbgui $i_dir
###########################################################
diff --git a/openfpm_numerics b/openfpm_numerics
index b1adcbf14f08d382e1ff00871e6c633640bba75d..7edb74ce68f5fd3f71817877712f0dbf8f35ea79 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit b1adcbf14f08d382e1ff00871e6c633640bba75d
+Subproject commit 7edb74ce68f5fd3f71817877712f0dbf8f35ea79
diff --git a/openfpm_vcluster b/openfpm_vcluster
index 974a494a7cac5d47ae04921393d09f57fd3039f8..058d9619b0005871feb710c2270122e9bd93e096 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit 974a494a7cac5d47ae04921393d09f57fd3039f8
+Subproject commit 058d9619b0005871feb710c2270122e9bd93e096
diff --git a/script/install_gdbgui b/script/install_gdbgui
index ffc2ff46e7cd2ff92f55d54d169e0078e4320603..63d5098805dd320acba9bbeb871460ea7d282b48 100755
--- a/script/install_gdbgui
+++ b/script/install_gdbgui
@@ -10,12 +10,22 @@ source script/solve_gdbserver
source script/discover_package_manager
source script/solve_nodejs
source script/solve_python_devel
+source script/solve_llvm
node_js_inst=0
if [ x"$platform" == x"osx" ]; then
- echo -e "node\033[91;5;1m The parallel debugger at the moment is not supported on OSX \033[0m"
- return
+ solve_llvm $platform
+
+ echo "OSX installing lldb-mi"
+ rm lldb-mi-master.tar.gz
+ wget http://ppmcore.mpi-cbg.de/upload/lldb-mi-master.tar.gz
+ tar -xf lldb-mi-master.tar.gz
+ cd lldb-mi-master
+ mkdir build
+ cd build
+ cmake ../. -DCMAKE_PREFIX_PATH=$1/LLDB-MI
+ make
fi
solve_python_devel $platform
diff --git a/script/solve_llvm b/script/solve_llvm
new file mode 100755
index 0000000000000000000000000000000000000000..794daa6aeed22d4db5c15470edb11fffc4a90688
--- /dev/null
+++ b/script/solve_llvm
@@ -0,0 +1,25 @@
+#! /bin/bash
+
+function solve_llvm() {
+source script/show_solutions
+source script/discover_package_manager
+discover_package_manager $1
+pcman=$discover_package_manager_ret
+
+if [ x"$pcman" = x"" ]; then
+ exit 1
+fi
+
+
+if [ x"$pcman" == x"brew" ]; then
+ base_llvm_pkg="llvm"
+fi
+
+if [ x"$1" = x"osx" ]; then
+ pc_install_command "$pcman"
+ commands[0]="su -c \"$pc_install_command_ret $base_python_pkg \""
+ commands[1]="sudo $pc_install_command_ret $base_python_pkg "
+ possible_solutions "${commands[@]}"
+fi
+}
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 165e2a8a7ce4b981d0570706080112b8a7a09b9a..3148669a74322677e37a8342ffde69d6b35562d7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ add_definitions(-DSCAN_WITH_CUB)
if(CUDA_FOUND OR CUDA_ON_CPU OR HIP_FOUND)
set(CUDA_SOURCES
Grid/tests/sgrid_dist_id_gpu_unit_tests.cu
- Vector/cuda/vector_dist_gpu_MP_tests.cu
+ Vector/cuda/vector_dist_gpu_MP_tests.cu
Vector/cuda/vector_dist_cuda_func_test.cu
Decomposition/cuda/decomposition_cuda_tests.cu
Vector/cuda/vector_dist_gpu_unit_tests.cu
@@ -61,10 +61,10 @@ if ( HIP_ENABLE AND HIP_FOUND )
Decomposition/tests/CartDecomposition_unit_test.cpp
Decomposition/tests/shift_vect_converter_tests.cpp
Vector/performance/vector_dist_performance_util.cpp
- lib/pdata.cpp
+ lib/pdata.cpp
test_multiple_o.cpp
)
-
+
hip_add_library(ofpm_pdata STATIC lib/pdata.cpp)
@@ -81,14 +81,14 @@ else()
Grid/tests/staggered_grid_dist_unit_test.cpp
Vector/tests/vector_dist_cell_list_tests.cpp
Vector/tests/vector_dist_complex_prp_unit_test.cpp
- Vector/tests/vector_dist_HDF5_chckpnt_restart_test.cpp
- Vector/tests/vector_dist_MP_unit_tests.cpp
- Vector/tests/vector_dist_NN_tests.cpp
- Vector/tests/vector_dist_unit_test.cpp
- pdata_performance.cpp
- Decomposition/tests/CartDecomposition_unit_test.cpp
- Decomposition/tests/shift_vect_converter_tests.cpp
- Vector/performance/vector_dist_performance_util.cpp
+ Vector/tests/vector_dist_HDF5_chckpnt_restart_test.cpp
+ Vector/tests/vector_dist_MP_unit_tests.cpp
+ Vector/tests/vector_dist_NN_tests.cpp
+ Vector/tests/vector_dist_unit_test.cpp
+ pdata_performance.cpp
+ Decomposition/tests/CartDecomposition_unit_test.cpp
+ Decomposition/tests/shift_vect_converter_tests.cpp
+ Vector/performance/vector_dist_performance_util.cpp
lib/pdata.cpp test_multiple_o.cpp)
add_library(ofpm_pdata STATIC lib/pdata.cpp)
@@ -98,26 +98,12 @@ endif()
add_dependencies(pdata ofpmmemory)
add_dependencies(pdata vcluster)
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- target_compile_options(pdata PRIVATE "-Wno-undefined-var-template")
-
- # Instead of enabling this option let's check why is redefined
- #target_compile_options(pdata PRIVATE "-Wno-macro-redefined")
-endif()
-if ( CMAKE_COMPILER_IS_GNUCC )
- target_compile_options(pdata PRIVATE "-Wno-deprecated-declarations")
- target_compile_options(pdata PRIVATE "-Wno-undefined-var-template")
-
- # Instead of enabling this option let's check why is redefined
- #target_compile_options(pdata PRIVATE "-Wno-macro-redefined")
-endif()
-
#add_executable(isolation_pdata ${OPENFPM_INIT_FILE} isolation.cu
-# lib/pdata.cpp
-# ../openfpm_devices/src/memory/HeapMemory.cpp
+# lib/pdata.cpp
+# ../openfpm_devices/src/memory/HeapMemory.cpp
# ../openfpm_devices/src/memory/CudaMemory.cu
-# ../openfpm_devices/src/memory/PtrMemory.cpp
-# ../openfpm_vcluster/src/VCluster/VCluster.cpp
+# ../openfpm_devices/src/memory/PtrMemory.cpp
+# ../openfpm_vcluster/src/VCluster/VCluster.cpp
# )
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -174,10 +160,6 @@ target_include_directories (pdata PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../openfpm
target_include_directories (pdata PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (pdata PUBLIC ${PETSC_INCLUDES})
target_include_directories (pdata PUBLIC ${LIBHILBERT_INCLUDE_DIRS})
-if(EIGEN3_FOUND)
- target_include_directories (pdata PUBLIC ${EIGEN3_INCLUDE_DIR})
-endif()
-
target_include_directories (pdata PUBLIC ${ALPAKA_ROOT}/include)
target_include_directories (pdata PUBLIC ${Vc_INCLUDE_DIR})
target_include_directories (pdata PUBLIC ${Boost_INCLUDE_DIRS})
@@ -232,13 +214,7 @@ if (TEST_COVERAGE)
target_link_libraries(pdata -lgcov --coverage)
endif()
-# Debug!
-# Hack found at https://github.com/LLNL/scr/issues/130#issuecomment-402815952
-IF(MPI_CXX_FOUND)
- INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH})
-# LIST(APPEND SCR_EXTERNAL_LIBS ${MPI_CXX_LIBRARIES})
- target_link_libraries(pdata ${MPI_CXX_LIBRARIES})
-ENDIF(MPI_CXX_FOUND)
+
target_include_directories (ofpm_pdata PUBLIC ${CUDA_INCLUDE_DIRS})
target_include_directories (ofpm_pdata PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
@@ -278,7 +254,7 @@ install(FILES Decomposition/CartDecomposition.hpp
Decomposition/nn_processor.hpp Decomposition/ie_loc_ghost.hpp
Decomposition/ORB.hpp
Decomposition/dec_optimizer.hpp
- DESTINATION openfpm_pdata/include/Decomposition/
+ DESTINATION openfpm_pdata/include/Decomposition/
COMPONENT OpenFPM)
install(FILES Decomposition/Distribution/metis_util.hpp
@@ -288,16 +264,15 @@ install(FILES Decomposition/Distribution/metis_util.hpp
Decomposition/Distribution/MetisDistribution.hpp
Decomposition/Distribution/ParMetisDistribution.hpp
Decomposition/Distribution/DistParMetisDistribution.hpp
- Decomposition/Distribution/BoxDistribution.hpp
- DESTINATION openfpm_pdata/include/Decomposition/Distribution
+ Decomposition/Distribution/BoxDistribution.hpp
+ DESTINATION openfpm_pdata/include/Decomposition/Distribution
COMPONENT OpenFPM)
install(FILES Decomposition/cuda/ie_ghost_gpu.cuh
Decomposition/cuda/CartDecomposition_gpu.cuh
- DESTINATION openfpm_pdata/include/Decomposition/cuda
+ DESTINATION openfpm_pdata/include/Decomposition/cuda
COMPONENT OpenFPM)
-
install(FILES Grid/grid_dist_id.hpp
Grid/grid_dist_id_comm.hpp
Grid/grid_dist_util.hpp
@@ -305,18 +280,18 @@ install(FILES Grid/grid_dist_id.hpp
Grid/staggered_dist_grid.hpp
Grid/staggered_dist_grid_util.hpp
Grid/staggered_dist_grid_copy.hpp
- DESTINATION openfpm_pdata/include/Grid/
+ DESTINATION openfpm_pdata/include/Grid/
COMPONENT OpenFPM)
install(FILES Grid/cuda/grid_dist_id_kernels.cuh
Grid/cuda/grid_dist_id_iterator_gpu.cuh
- DESTINATION openfpm_pdata/include/Grid/cuda/
+ DESTINATION openfpm_pdata/include/Grid/cuda/
COMPONENT OpenFPM)
install(FILES Amr/grid_dist_amr_key_iterator.hpp
Amr/grid_dist_amr_key.hpp
Amr/grid_dist_amr.hpp
- DESTINATION openfpm_pdata/include/Amr/
+ DESTINATION openfpm_pdata/include/Amr/
COMPONENT OpenFPM)
install(FILES Grid/Iterators/grid_dist_id_iterator_util.hpp
@@ -324,7 +299,7 @@ install(FILES Grid/Iterators/grid_dist_id_iterator_util.hpp
Grid/Iterators/grid_dist_id_iterator_dec_skin.hpp
Grid/Iterators/grid_dist_id_iterator_sub.hpp
Grid/Iterators/grid_dist_id_iterator.hpp
- DESTINATION openfpm_pdata/include/Grid/Iterators
+ DESTINATION openfpm_pdata/include/Grid/Iterators
COMPONENT OpenFPM)
@@ -334,31 +309,31 @@ install(FILES Vector/se_class3_vector.hpp
Vector/vector_dist_ofb.hpp
Vector/vector_dist_key.hpp
Vector/vector_dist_kernel.hpp
- Vector/vector_dist_subset.hpp
- DESTINATION openfpm_pdata/include/Vector
- COMPONENT OpenFPM)
+ Vector/vector_dist_subset.hpp
+ DESTINATION openfpm_pdata/include/Vector
+ COMPONENT OpenFPM)
install(FILES util/common_pdata.hpp
DESTINATION openfpm_pdata/include/util
COMPONENT OpenFPM)
install(FILES Vector/Iterators/vector_dist_iterator.hpp
- DESTINATION openfpm_pdata/include/Vector/Iterators/
+ DESTINATION openfpm_pdata/include/Vector/Iterators/
COMPONENT OpenFPM)
install(FILES Vector/util/vector_dist_funcs.hpp
- DESTINATION openfpm_pdata/include/Vector/util
+ DESTINATION openfpm_pdata/include/Vector/util
COMPONENT OpenFPM)
install(FILES Vector/cuda/vector_dist_comm_util_funcs.cuh
Vector/cuda/vector_dist_cuda_funcs.cuh
Vector/cuda/vector_dist_operators_list_ker.hpp
- DESTINATION openfpm_pdata/include/Vector/cuda
+ DESTINATION openfpm_pdata/include/Vector/cuda
COMPONENT OpenFPM)
install(FILES Graph/ids.hpp Graph/dist_map_graph.hpp
Graph/DistGraphFactory.hpp
- DESTINATION openfpm_pdata/include/Graph
+ DESTINATION openfpm_pdata/include/Graph
COMPONENT OpenFPM)
install(FILES example.mk
@@ -366,19 +341,19 @@ install(FILES example.mk
DESTINATION openfpm_pdata/include/ )
install(FILES DLB/DLB.hpp DLB/LB_Model.hpp
- DESTINATION openfpm_pdata/include/DLB
+ DESTINATION openfpm_pdata/include/DLB
COMPONENT OpenFPM)
install(FILES config/config.h
- DESTINATION openfpm_pdata/include/config
+ DESTINATION openfpm_pdata/include/config
COMPONENT OpenFPM)
install(FILES lib/pdata.hpp
- DESTINATION openfpm_pdata/include/lib
+ DESTINATION openfpm_pdata/include/lib
COMPONENT OpenFPM)
install(FILES Debug/debug.hpp
- DESTINATION openfpm_pdata/include/Debug
+ DESTINATION openfpm_pdata/include/Debug
COMPONENT OpenFPM)
install(TARGETS ofpm_pdata EXPORT ofpm_pdata_config DESTINATION openfpm_pdata/lib COMPONENT OpenFPM)
@@ -389,7 +364,7 @@ add_library(binary_config INTERFACE)
target_include_directories(
binary_config
- INTERFACE
+ INTERFACE
${CMAKE_INSTALL_PREFIX}/openfpm_pdata/include
${CMAKE_INSTALL_PREFIX}/openfpm_data/include
${CMAKE_INSTALL_PREFIX}/openfpm_pdata/include/config
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 3bea8705d5a88b6c9d181492c6c168ee5bc628af..66ac010b09e1039abcd0c19974cb23f9c1c93a05 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -2708,10 +2708,13 @@ public:
VECTOR_POINTS> vtk_writer;
vtk_writer.add(v_pos,v_prp,g_m);
- std::string output = std::to_string(out + "_" + std::to_string(v_cl.getProcessUnitID()) + std::to_string(".vtk"));
+ std::string output = std::to_string(out + "_" + std::to_string(v_cl.getProcessUnitID()) + std::to_string(".vtp"));
// Write the VTK file
- return vtk_writer.write(output,prp_names,"particles",meta_info,ft);
+ bool ret=vtk_writer.write(output,prp_names,"particles",meta_info,ft);
+ if(v_cl.rank()==0)
+ {vtk_writer.write_pvtp(out,prp_names,v_cl.size()) ;}
+ return ret;
}
}
@@ -2800,10 +2803,13 @@ public:
openfpm::vector<prop,Memory,layout_base>>, VECTOR_POINTS> vtk_writer;
vtk_writer.add(v_pos,v_prp,g_m);
- std::string output = std::to_string(out + "_" + std::to_string(v_cl.getProcessUnitID()) + "_" + std::to_string(iteration) + std::to_string(".vtk"));
+ std::string output = std::to_string(out + "_" + std::to_string(v_cl.getProcessUnitID()) + "_" + std::to_string(iteration) + std::to_string(".vtp"));
// Write the VTK file
- return vtk_writer.write(output,prp_names,"particles",meta_info,ft);
+ bool ret=vtk_writer.write(output,prp_names,"particles",meta_info,ft);
+ if(v_cl.rank()==0)
+ {vtk_writer.write_pvtp(out,prp_names,v_cl.size(),iteration);}
+ return ret;
}
}
diff --git a/src/scripts/postflight b/src/scripts/postflight
index 0d246a362b86dbba3561f6395deda11cf7dfbe17..0a932ae788699b4fb700e0a6fb005b8608d3535c 100644
--- a/src/scripts/postflight
+++ b/src/scripts/postflight
@@ -1,6 +1,13 @@
#! /bin/bash
-sed -i '' -e 's/Users\/vagrant/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/source/openfpm_vars
-sed -i '' -e 's/Users\/vagrant/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+sed -i '' -e 's/Users\/rundeck/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/source/openfpm_vars
+sed -i '' -e 's/openfpm_pre/openfpm/g' /usr/local/openfpm/source/openfpm_vars
+sed -i '' -e 's/dependencies\/openfpm_dependencies/dependencies/g' /usr/local/openfpm/source/openfpm_vars
+sed -i '' -e 's/Users\/rundeck/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+sed -i '' -e 's/openfpm_pre/openfpm/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+sed -i '' -e 's/dependencies\/openfpm_dependencies/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+
+chmod a+x /usr/local/openfpm/dependencies/MPI/bin/*
+
echo "export OPAL_PREFIX=/usr/local/openfpm/dependencies/MPI" >> /usr/local/openfpm/source/openfpm_vars
-
+