Commit 2e196286 authored by Naumann, Andreas's avatar Naumann, Andreas
Browse files

amdis initialize with pmtl and packages fixed to boost 1.42

parent 9ffc1f36
...@@ -425,8 +425,8 @@ configure_file(${AMDIS_SOURCE_DIR}/preinst.in ...@@ -425,8 +425,8 @@ configure_file(${AMDIS_SOURCE_DIR}/preinst.in
configure_file(${AMDIS_SOURCE_DIR}/postrm.in configure_file(${AMDIS_SOURCE_DIR}/postrm.in
${AMDIS_BINARY_DIR}/postrm ${AMDIS_BINARY_DIR}/postrm
@ONLY) @ONLY)
set(CPACK_RPM_PACKAGE_REQUIRES "boost-devel >= 1.42, ${RPM_DEPEND_STR}") set(CPACK_RPM_PACKAGE_REQUIRES "boost-devel == 1.42, ${RPM_DEPEND_STR}")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-dev (>= 1.42), libboost-iostreams-dev (>= 1.42), libboost-system-dev (>= 1.42), libboost-filesystem-dev (>= 1.42)") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-dev (== 1.42), libboost-iostreams-dev (== 1.42), libboost-system-dev (== 1.42), libboost-filesystem-dev (== 1.42)")
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${AMDIS_BINARY_DIR}/preinst" "${AMDIS_BINARY_DIR}/postrm") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${AMDIS_BINARY_DIR}/preinst" "${AMDIS_BINARY_DIR}/postrm")
include(CPack) include(CPack)
...@@ -20,13 +20,21 @@ namespace AMDiS { ...@@ -20,13 +20,21 @@ namespace AMDiS {
using namespace std; using namespace std;
#if defined(HAVE_PARALLEL_DOMAIN_AMDIS) && defined(HAVE_PARALLEL_MTL4)
mtl::par::environment* mtl_environment=NULL;
#endif
void init(int argc, char **argv) void init(int argc, char **argv)
{ {
FUNCNAME("AMDiS::init()"); FUNCNAME("AMDiS::init()");
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
#ifdef HAVE_PARALLEL_MTL4
mtl_environment = new mtl::par::environment(argc, argv);
#else
PetscInitialize(&argc, &argv, NULL, NULL); PetscInitialize(&argc, &argv, NULL, NULL);
mpi::startRand(); mpi::startRand();
#endif
#ifdef HAVE_ZOLTAN #ifdef HAVE_ZOLTAN
float zoltanVersion = 0.0; float zoltanVersion = 0.0;
...@@ -51,7 +59,12 @@ namespace AMDiS { ...@@ -51,7 +59,12 @@ namespace AMDiS {
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
MeshDistributor::globalMeshDistributor->exitParallelization(); MeshDistributor::globalMeshDistributor->exitParallelization();
#ifdef HAVE_PARALLEL_MTL4
if ( mtl_environment )
delete mtl_environment;
#else
PetscFinalize(); PetscFinalize();
#endif
#endif #endif
} }
......
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