Commit 31ccd933 authored by incardon's avatar incardon
Browse files

Fixing build system of pdata

parent d137ad5d
SUBDIRS = src vtk openfpm_data SUBDIRS = src vtk openfpm_data openfpm_io openfpm_devices openfpm_vcluster
bin_PROGRAMS = bin_PROGRAMS =
...@@ -7,7 +7,10 @@ AC_PREREQ(2.59) ...@@ -7,7 +7,10 @@ AC_PREREQ(2.59)
AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_SUBDIRS([openfpm_data]) AC_CONFIG_SUBDIRS([openfpm_data openfpm_devices openfpm_vcluster openfpm_io])
#### Adding --with-pdata
ac_configure_args="$ac_configure_args --with-pdata=../../src"
########################
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_HEADER([src/config/config.h]) AC_CONFIG_HEADER([src/config/config.h])
m4_ifdef([ACX_PTHREAD],,[m4_include([m4/acx_pthread.m4])]) m4_ifdef([ACX_PTHREAD],,[m4_include([m4/acx_pthread.m4])])
...@@ -21,10 +24,14 @@ CXXFLAGS+=" --std=c++11 " ...@@ -21,10 +24,14 @@ CXXFLAGS+=" --std=c++11 "
NVCCFLAGS=" " NVCCFLAGS=" "
INCLUDES_PATH=" " INCLUDES_PATH=" "
# Add openfpm_pdata to prefix forlder # Add openfpm_pdata to prefix folder
prefix="$prefix//openfpm_pdata" base=$prefix
prefix="$prefix/openfpm_pdata"
echo "Installation dir is: $prefix" echo "Installation dir is: $prefix"
# Create a file with the install base folder
echo "$base" > install_dir
# Checks for programs. # Checks for programs.
AC_PROG_CXX AC_PROG_CXX
......
openfpm_vcluster @ 9c35483a
Subproject commit e858a42b603fb632696045edb35b41bcf286aa14 Subproject commit 9c35483a5aed877c1b82b5befb5ed5f8f7cd548b
...@@ -883,7 +883,7 @@ public: ...@@ -883,7 +883,7 @@ public:
* * grid_X.vtk Output each local grids for each local processor X * * grid_X.vtk Output each local grids for each local processor X
* * internal_ghost_X.vtk Internal ghost boxes in grid units for the local processor X * * internal_ghost_X.vtk Internal ghost boxes in grid units for the local processor X
* *
* \param output directory where to put the files * \param output directory where to put the files + prefix
* *
*/ */
bool write(std::string output) bool write(std::string output)
...@@ -895,7 +895,7 @@ public: ...@@ -895,7 +895,7 @@ public:
Point<dim,St> offset = Point<dim,St>(gdb_ext.get(i).origin) * cd_sm.getCellBox().getP2(); Point<dim,St> offset = Point<dim,St>(gdb_ext.get(i).origin) * cd_sm.getCellBox().getP2();
vtk_g.add(loc_grid.get(i),offset,cd_sm.getCellBox().getP2(),gdb_ext.get(i).Dbox); vtk_g.add(loc_grid.get(i),offset,cd_sm.getCellBox().getP2(),gdb_ext.get(i).Dbox);
} }
vtk_g.write(output + "/grid_" + std::to_string(v_cl.getProcessUnitID()) + ".vtk"); vtk_g.write(output + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + ".vtk");
// Write internal ghost box // Write internal ghost box
VTKWriter<openfpm::vector<::Box<dim,size_t>>,VECTOR_BOX> vtk_box1; VTKWriter<openfpm::vector<::Box<dim,size_t>>,VECTOR_BOX> vtk_box1;
......
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