Commit 836978e9 authored by Praetorius, Simon's avatar Praetorius, Simon

removed all trailing whitespaces in all git files

parent 5f0ca3b5

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<body> <body>
<h1> Using AMDiS with cmake </h1> <h1> Using AMDiS with cmake </h1>
With this short page, I will show you, how to use the cmake buildsystem with AMDiS. The introduction consists of two main parts: With this short page, I will show you, how to use the cmake buildsystem with AMDiS. The introduction consists of two main parts:
<ol> <ol>
<li> <a href="#compiling" > compiling and installing AMDiS with CMake </a ></li> <li> <a href="#compiling" > compiling and installing AMDiS with CMake </a ></li>
<li> <a href="#using" > using the cmake installed AMDiS in your project </a ></li> <li> <a href="#using" > using the cmake installed AMDiS in your project </a ></li>
<li> <a href="#faq" > some frequently asked questions </a ></li> <li> <a href="#faq" > some frequently asked questions </a ></li>
...@@ -37,7 +37,7 @@ cd ${HOME}/work/amdis_build </pre> ...@@ -37,7 +37,7 @@ cd ${HOME}/work/amdis_build </pre>
The simplest configuration of AMDiS, i.e. without umfpack and parallelization, only sets the install destination to the directory "${HOME}/programs/". To do this, you have to call cmake with your install destination and the AMDiS source directory as commandline arguments The simplest configuration of AMDiS, i.e. without umfpack and parallelization, only sets the install destination to the directory "${HOME}/programs/". To do this, you have to call cmake with your install destination and the AMDiS source directory as commandline arguments
<pre class="desc" > <pre class="desc" >
cmake -DCMAKE_INSTALL_PREFIX=${HOME}/programs/ ../amdis/AMDiS</pre> cmake -DCMAKE_INSTALL_PREFIX=${HOME}/programs/ ../amdis/AMDiS</pre>
Compilation and installation is the same as with automake/autoconf: Compilation and installation is the same as with automake/autoconf:
<pre class="desc"> <pre class="desc">
make && make install </pre > make && make install </pre >
...@@ -80,7 +80,7 @@ and we have to tell cmake, that we need the library amdis and each library amdis ...@@ -80,7 +80,7 @@ and we have to tell cmake, that we need the library amdis and each library amdis
target_link_libraries(fooProg ${AMDIS_LIBRARIES}) target_link_libraries(fooProg ${AMDIS_LIBRARIES})
</pre > </pre >
If cmake does not find AMDiS, you have to set the variable AMDIS_DIR to the directory containing the file AMDiSConfig.cmake. This file resides in If cmake does not find AMDiS, you have to set the variable AMDIS_DIR to the directory containing the file AMDiSConfig.cmake. This file resides in
<pre class="desc" > <pre class="desc" >
${CMAKE_INSTALL_PREFIX}/share/amdis/ ${CMAKE_INSTALL_PREFIX}/share/amdis/
</pre > </pre >
......
set(COMPILER_TEST_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/compilerTest) set(COMPILER_TEST_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/compilerTest)
file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt
"project(compilerTest) "project(compilerTest)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
add_definitions(-std=c++11) add_definitions(-std=c++11)
...@@ -28,25 +28,25 @@ file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt ...@@ -28,25 +28,25 @@ file(WRITE ${COMPILER_TEST_DIR}/CMakeLists.txt
# RANGE-BASED FOR LOOPS # RANGE-BASED FOR LOOPS
add_executable(test_range_based_for test_range_based_for.cpp) add_executable(test_range_based_for test_range_based_for.cpp)
target_link_libraries(test_range_based_for)") target_link_libraries(test_range_based_for)")
file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_class.cpp file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_class.cpp
"template<class... Ts> struct A{}; int main(){A<int, double> a;}") "template<class... Ts> struct A{}; int main(){A<int, double> a;}")
file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_fct.cpp file(WRITE ${COMPILER_TEST_DIR}/test_variadic_templ_fct.cpp
"template<class... Ts> void foo(Ts... ts){}; int main(){foo(1, 2.0, 3.0f);}") "template<class... Ts> void foo(Ts... ts){}; int main(){foo(1, 2.0, 3.0f);}")
file(WRITE ${COMPILER_TEST_DIR}/test_alias_templates.cpp file(WRITE ${COMPILER_TEST_DIR}/test_alias_templates.cpp
"template<class T> struct A{}; template<class T> using B=A<T>; int main(){B<int> b;}") "template<class T> struct A{}; template<class T> using B=A<T>; int main(){B<int> b;}")
file(WRITE ${COMPILER_TEST_DIR}/test_decltype.cpp file(WRITE ${COMPILER_TEST_DIR}/test_decltype.cpp
"int main(){decltype(1) a = 1;}") "int main(){decltype(1) a = 1;}")
file(WRITE ${COMPILER_TEST_DIR}/test_auto.cpp file(WRITE ${COMPILER_TEST_DIR}/test_auto.cpp
"int main(){auto a = 1;}") "int main(){auto a = 1;}")
file(WRITE ${COMPILER_TEST_DIR}/test_constexpr.cpp file(WRITE ${COMPILER_TEST_DIR}/test_constexpr.cpp
"constexpr int foo(){return 1;}; int main(){static constexpr int f = foo();}") "constexpr int foo(){return 1;}; int main(){static constexpr int f = foo();}")
file(WRITE ${COMPILER_TEST_DIR}/test_delegating_constructors.cpp file(WRITE ${COMPILER_TEST_DIR}/test_delegating_constructors.cpp
"struct A{ A(){} A(int) : A(){} }; int main(){ A a(1);}") "struct A{ A(){} A(int) : A(){} }; int main(){ A a(1);}")
file(WRITE ${COMPILER_TEST_DIR}/test_range_based_for.cpp file(WRITE ${COMPILER_TEST_DIR}/test_range_based_for.cpp
"int main(){ int vec[10]; for (int& elem : vec) { elem = 1; } }") "int main(){ int vec[10]; for (int& elem : vec) { elem = 1; } }")
set(COMPILER_CXX11_FEATURES "") set(COMPILER_CXX11_FEATURES "")
try_compile(TEST_VARIADIC_TEMPL_CLASS ${COMPILER_TEST_DIR} ${COMPILER_TEST_DIR} compilerTest test_variadic_templ_class) try_compile(TEST_VARIADIC_TEMPL_CLASS ${COMPILER_TEST_DIR} ${COMPILER_TEST_DIR} compilerTest test_variadic_templ_class)
......
#!/bin/sh #!/bin/sh
if test "$1" = "upgrade" ; then if test "$1" = "upgrade" ; then
exit 0 exit 0
fi fi
NEWDIRS_SEMI="@deb_add_dirs@" NEWDIRS_SEMI="@deb_add_dirs@"
......
...@@ -2,7 +2,7 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -2,7 +2,7 @@ if (ENABLE_PARALLEL_DOMAIN)
option(ENABLE_ZOLTAN "Add support for the Parallel Partitioning suite Zoltan" false) option(ENABLE_ZOLTAN "Add support for the Parallel Partitioning suite Zoltan" false)
option(ENABLE_PARALLEL_SOLVERS "Add some problem dependent solver, e.g. Feti, Navier-Stokes and Cahn-Hilliard" true) option(ENABLE_PARALLEL_SOLVERS "Add some problem dependent solver, e.g. Feti, Navier-Stokes and Cahn-Hilliard" true)
mark_as_advanced(ENABLE_PARALLEL_SOLVERS) mark_as_advanced(ENABLE_PARALLEL_SOLVERS)
add_library(amdis_parallel INTERFACE) add_library(amdis_parallel INTERFACE)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/DofComm.cc ${SOURCE_DIR}/parallel/DofComm.cc
...@@ -21,14 +21,14 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -21,14 +21,14 @@ if (ENABLE_PARALLEL_DOMAIN)
${SOURCE_DIR}/parallel/ParMetisPartitioner.cc ${SOURCE_DIR}/parallel/ParMetisPartitioner.cc
${SOURCE_DIR}/parallel/StdMpi.cc ${SOURCE_DIR}/parallel/StdMpi.cc
) )
target_sources(amdis_debug INTERFACE target_sources(amdis_debug INTERFACE
${SOURCE_DIR}/parallel/ParallelDebug.cc ${SOURCE_DIR}/parallel/ParallelDebug.cc
) )
target_compile_definitions(amdis_parallel INTERFACE target_compile_definitions(amdis_parallel INTERFACE
HAVE_PARALLEL_DOMAIN_AMDIS=1) HAVE_PARALLEL_DOMAIN_AMDIS=1)
# MPI is required # MPI is required
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
if (MPI_FOUND) if (MPI_FOUND)
...@@ -37,15 +37,15 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -37,15 +37,15 @@ if (ENABLE_PARALLEL_DOMAIN)
target_compile_options(amdis_parallel INTERFACE target_compile_options(amdis_parallel INTERFACE
${MPI_COMPILE_FLAGS}) ${MPI_COMPILE_FLAGS})
endif (MPI_FOUND) endif (MPI_FOUND)
# PETSc library is required # PETSc library is required
set(PETSC_EXECUTABLE_RUNS ON) set(PETSC_EXECUTABLE_RUNS ON)
include(find_petsc) include(find_petsc)
if (PETSc_FOUND) if (PETSc_FOUND)
target_include_directories(amdis_parallel INTERFACE target_include_directories(amdis_parallel INTERFACE
${PETSC_DIR}/include ${PETSC_DIR}/include
${PETSC_DIR}/${PETSC_ARCH}/include) ${PETSC_DIR}/${PETSC_ARCH}/include)
# parmetis is required # parmetis is required
find_file(PARMETIS_HEADER_FILE "parmetis.h" HINTS ${PETSC_DIR}/include ) find_file(PARMETIS_HEADER_FILE "parmetis.h" HINTS ${PETSC_DIR}/include )
if (PARMETIS_HEADER_FILE) if (PARMETIS_HEADER_FILE)
...@@ -54,7 +54,7 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -54,7 +54,7 @@ if (ENABLE_PARALLEL_DOMAIN)
else() else()
message(FATAL_ERROR "Could not find ParMetis header file 'parmetis.h'!") message(FATAL_ERROR "Could not find ParMetis header file 'parmetis.h'!")
endif (PARMETIS_HEADER_FILE) endif (PARMETIS_HEADER_FILE)
# add support for the zoltan library # add support for the zoltan library
if (ENABLE_ZOLTAN) if (ENABLE_ZOLTAN)
find_file(ZOLTAN_HEADER_FILE "zoltan_cpp.h" HINTS ${PETSC_DIR}/include) find_file(ZOLTAN_HEADER_FILE "zoltan_cpp.h" HINTS ${PETSC_DIR}/include)
...@@ -64,18 +64,18 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -64,18 +64,18 @@ if (ENABLE_PARALLEL_DOMAIN)
else() else()
message(FATAL_ERROR "Could not find Zoltan include file 'zoltan_cpp.h'!") message(FATAL_ERROR "Could not find Zoltan include file 'zoltan_cpp.h'!")
endif(ZOLTAN_HEADER_FILE) endif(ZOLTAN_HEADER_FILE)
target_compile_definitions(amdis_parallel INTERFACE HAVE_ZOLTAN=1) target_compile_definitions(amdis_parallel INTERFACE HAVE_ZOLTAN=1)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/ZoltanPartitioner.cc) ${SOURCE_DIR}/parallel/ZoltanPartitioner.cc)
endif (ENABLE_ZOLTAN) endif (ENABLE_ZOLTAN)
if (ENABLE_BDDCML) if (ENABLE_BDDCML)
target_compile_definitions(amdis_parallel INTERFACE HAVE_BDDCML=1) target_compile_definitions(amdis_parallel INTERFACE HAVE_BDDCML=1)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/BddcMlSolver.cc) ${SOURCE_DIR}/parallel/BddcMlSolver.cc)
endif (ENABLE_BDDCML) endif (ENABLE_BDDCML)
# add some more source-files that need petsc # add some more source-files that need petsc
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/MatrixNnzStructure.cc ${SOURCE_DIR}/parallel/MatrixNnzStructure.cc
...@@ -86,7 +86,7 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -86,7 +86,7 @@ if (ENABLE_PARALLEL_DOMAIN)
${SOURCE_DIR}/parallel/PetscSolverGlobalBlockMatrix.cc ${SOURCE_DIR}/parallel/PetscSolverGlobalBlockMatrix.cc
${SOURCE_DIR}/solver/PetscTypes.cc ${SOURCE_DIR}/solver/PetscTypes.cc
) )
if (ENABLE_PARALLEL_SOLVERS) if (ENABLE_PARALLEL_SOLVERS)
target_sources(amdis PRIVATE target_sources(amdis PRIVATE
${SOURCE_DIR}/parallel/PetscSolverFeti.cc ${SOURCE_DIR}/parallel/PetscSolverFeti.cc
...@@ -103,23 +103,23 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -103,23 +103,23 @@ if (ENABLE_PARALLEL_DOMAIN)
target_compile_definitions(amdis_parallel INTERFACE target_compile_definitions(amdis_parallel INTERFACE
HAVE_PARALLEL_SOLVERS=1) HAVE_PARALLEL_SOLVERS=1)
endif (ENABLE_PARALLEL_SOLVERS)