From e50e2e57875af83443f0330e2d393036ad16d16e Mon Sep 17 00:00:00 2001 From: Paul Heinzlreiter Date: Thu, 27 Oct 2016 12:00:40 +0200 Subject: [PATCH] * directory structure cleanup --- bhtree_mpi/CMakeLists.txt | 44 +++++++++++++++---- bhtree_mpi/datastructures/CMakeLists.txt | 2 - bhtree_mpi/simulation/CMakeLists.txt | 4 -- bhtree_mpi/{ => src}/data/tab1024.dat | 0 bhtree_mpi/{ => src}/data/tab128.dat | 0 bhtree_mpi/{ => src}/data/tab65536.dat | 0 bhtree_mpi/{ => src}/data/tab8096.dat | 0 .../datastructures/BarnesHutTree.cpp | 0 .../datastructures/BarnesHutTree.hpp | 0 bhtree_mpi/{ => src}/datastructures/Body.cpp | 0 bhtree_mpi/{ => src}/datastructures/Body.hpp | 0 bhtree_mpi/{ => src}/datastructures/Box.cpp | 0 bhtree_mpi/{ => src}/datastructures/Box.hpp | 0 bhtree_mpi/src/datastructures/CMakeLists.txt | 12 +++++ bhtree_mpi/{ => src}/datastructures/Node.cpp | 0 bhtree_mpi/{ => src}/datastructures/Node.hpp | 0 bhtree_mpi/{ => src}/datastructures/Tree.cpp | 0 bhtree_mpi/{ => src}/datastructures/Tree.hpp | 0 bhtree_mpi/{ => src}/mpimain.cpp | 0 bhtree_mpi/src/simulation/CMakeLists.txt | 14 ++++++ .../{ => src}/simulation/MpiSimulation.cpp | 0 .../{ => src}/simulation/MpiSimulation.hpp | 0 .../{ => src}/simulation/Simulation.cpp | 0 .../{ => src}/simulation/Simulation.hpp | 0 24 files changed, 61 insertions(+), 15 deletions(-) delete mode 100644 bhtree_mpi/datastructures/CMakeLists.txt delete mode 100644 bhtree_mpi/simulation/CMakeLists.txt rename bhtree_mpi/{ => src}/data/tab1024.dat (100%) rename bhtree_mpi/{ => src}/data/tab128.dat (100%) rename bhtree_mpi/{ => src}/data/tab65536.dat (100%) rename bhtree_mpi/{ => src}/data/tab8096.dat (100%) rename bhtree_mpi/{ => src}/datastructures/BarnesHutTree.cpp (100%) rename bhtree_mpi/{ => src}/datastructures/BarnesHutTree.hpp (100%) rename bhtree_mpi/{ => src}/datastructures/Body.cpp (100%) rename bhtree_mpi/{ => src}/datastructures/Body.hpp (100%) rename bhtree_mpi/{ => src}/datastructures/Box.cpp (100%) rename bhtree_mpi/{ => src}/datastructures/Box.hpp (100%) create mode 100644 bhtree_mpi/src/datastructures/CMakeLists.txt rename bhtree_mpi/{ => src}/datastructures/Node.cpp (100%) rename bhtree_mpi/{ => src}/datastructures/Node.hpp (100%) rename bhtree_mpi/{ => src}/datastructures/Tree.cpp (100%) rename bhtree_mpi/{ => src}/datastructures/Tree.hpp (100%) rename bhtree_mpi/{ => src}/mpimain.cpp (100%) create mode 100644 bhtree_mpi/src/simulation/CMakeLists.txt rename bhtree_mpi/{ => src}/simulation/MpiSimulation.cpp (100%) rename bhtree_mpi/{ => src}/simulation/MpiSimulation.hpp (100%) rename bhtree_mpi/{ => src}/simulation/Simulation.cpp (100%) rename bhtree_mpi/{ => src}/simulation/Simulation.hpp (100%) diff --git a/bhtree_mpi/CMakeLists.txt b/bhtree_mpi/CMakeLists.txt index befc150..2b78ca2 100644 --- a/bhtree_mpi/CMakeLists.txt +++ b/bhtree_mpi/CMakeLists.txt @@ -1,23 +1,49 @@ -cmake_minimum_required (VERSION 2.6) -project (bhtree_mpi) +# ================================================================================================== +# This file is part of the CodeVault project. The project is licensed under Apache Version 2.0. +# CodeVault is part of the EU-project PRACE-4IP (WP7.3.C). +# +# Author(s): +# Paul Heinzlreiter +# +# ================================================================================================== + +cmake_minimum_required (VERSION 3.0 FATAL_ERROR) +project ("bhtree_mpi") +include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/common.cmake) + +# ================================================================================================== + +if ("${DWARF_PREFIX}" STREQUAL "") + set(DWARF_PREFIX 4_nbody) +endif() +set(NAME ${DWARF_PREFIX}_bhtree_mpi) + +enable_language(CXX) +if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + message("## Skipping '${NAME}': requires GNU C++ compiler ") + install(CODE "MESSAGE(\"bhtree can only be built with GNU C++ compiler.\")") + return() +endif() +message("** Enabling '${NAME}'") + find_package(MPI REQUIRED) -include_directories(${MPI_INCLUDE_PATH} datastructures simulation) +include_directories(${MPI_INCLUDE_PATH} src/datastructures src/simulation) -add_subdirectory(datastructures) -add_subdirectory(simulation) +add_subdirectory(src/datastructures) +add_subdirectory(src/simulation) -add_executable(bhtree_mpi mpimain.cpp) -target_link_libraries(bhtree_mpi datastructures simulation ${MPI_LIBRARIES}) +add_executable(${NAME} src/mpimain.cpp) +target_link_libraries(${NAME} datastructures simulation ${MPI_LIBRARIES}) if(MPI_COMPILE_FLAGS) - set_target_properties(bhtree_mpi PROPERTIES + set_target_properties(${NAME} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") endif() if(MPI_LINK_FLAGS) - set_target_properties(bhtree_mpi PROPERTIES + set_target_properties(${NAME} PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") endif() diff --git a/bhtree_mpi/datastructures/CMakeLists.txt b/bhtree_mpi/datastructures/CMakeLists.txt deleted file mode 100644 index 17b86d0..0000000 --- a/bhtree_mpi/datastructures/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -file( GLOB datastructures_SOURCES *.hpp *.cpp ) -add_library( datastructures ${datastructures_SOURCES} ) diff --git a/bhtree_mpi/simulation/CMakeLists.txt b/bhtree_mpi/simulation/CMakeLists.txt deleted file mode 100644 index 3049556..0000000 --- a/bhtree_mpi/simulation/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -file( GLOB simulation_SOURCES *.hpp *.cpp ) -include_directories(../datastructures) -add_library( simulation ${simulation_SOURCES} ) -target_link_libraries(simulation datastructures ${MPI_LIBRARIES}) \ No newline at end of file diff --git a/bhtree_mpi/data/tab1024.dat b/bhtree_mpi/src/data/tab1024.dat similarity index 100% rename from bhtree_mpi/data/tab1024.dat rename to bhtree_mpi/src/data/tab1024.dat diff --git a/bhtree_mpi/data/tab128.dat b/bhtree_mpi/src/data/tab128.dat similarity index 100% rename from bhtree_mpi/data/tab128.dat rename to bhtree_mpi/src/data/tab128.dat diff --git a/bhtree_mpi/data/tab65536.dat b/bhtree_mpi/src/data/tab65536.dat similarity index 100% rename from bhtree_mpi/data/tab65536.dat rename to bhtree_mpi/src/data/tab65536.dat diff --git a/bhtree_mpi/data/tab8096.dat b/bhtree_mpi/src/data/tab8096.dat similarity index 100% rename from bhtree_mpi/data/tab8096.dat rename to bhtree_mpi/src/data/tab8096.dat diff --git a/bhtree_mpi/datastructures/BarnesHutTree.cpp b/bhtree_mpi/src/datastructures/BarnesHutTree.cpp similarity index 100% rename from bhtree_mpi/datastructures/BarnesHutTree.cpp rename to bhtree_mpi/src/datastructures/BarnesHutTree.cpp diff --git a/bhtree_mpi/datastructures/BarnesHutTree.hpp b/bhtree_mpi/src/datastructures/BarnesHutTree.hpp similarity index 100% rename from bhtree_mpi/datastructures/BarnesHutTree.hpp rename to bhtree_mpi/src/datastructures/BarnesHutTree.hpp diff --git a/bhtree_mpi/datastructures/Body.cpp b/bhtree_mpi/src/datastructures/Body.cpp similarity index 100% rename from bhtree_mpi/datastructures/Body.cpp rename to bhtree_mpi/src/datastructures/Body.cpp diff --git a/bhtree_mpi/datastructures/Body.hpp b/bhtree_mpi/src/datastructures/Body.hpp similarity index 100% rename from bhtree_mpi/datastructures/Body.hpp rename to bhtree_mpi/src/datastructures/Body.hpp diff --git a/bhtree_mpi/datastructures/Box.cpp b/bhtree_mpi/src/datastructures/Box.cpp similarity index 100% rename from bhtree_mpi/datastructures/Box.cpp rename to bhtree_mpi/src/datastructures/Box.cpp diff --git a/bhtree_mpi/datastructures/Box.hpp b/bhtree_mpi/src/datastructures/Box.hpp similarity index 100% rename from bhtree_mpi/datastructures/Box.hpp rename to bhtree_mpi/src/datastructures/Box.hpp diff --git a/bhtree_mpi/src/datastructures/CMakeLists.txt b/bhtree_mpi/src/datastructures/CMakeLists.txt new file mode 100644 index 0000000..68204ec --- /dev/null +++ b/bhtree_mpi/src/datastructures/CMakeLists.txt @@ -0,0 +1,12 @@ +# ================================================================================================== +# This file is part of the CodeVault project. The project is licensed under Apache Version 2.0. +# CodeVault is part of the EU-project PRACE-4IP (WP7.3.C). +# +# Author(s): +# Paul Heinzlreiter +# +# ================================================================================================== + +cmake_minimum_required (VERSION 3.0 FATAL_ERROR) +file( GLOB datastructures_SOURCES *.hpp *.cpp ) +add_library( datastructures ${datastructures_SOURCES} ) diff --git a/bhtree_mpi/datastructures/Node.cpp b/bhtree_mpi/src/datastructures/Node.cpp similarity index 100% rename from bhtree_mpi/datastructures/Node.cpp rename to bhtree_mpi/src/datastructures/Node.cpp diff --git a/bhtree_mpi/datastructures/Node.hpp b/bhtree_mpi/src/datastructures/Node.hpp similarity index 100% rename from bhtree_mpi/datastructures/Node.hpp rename to bhtree_mpi/src/datastructures/Node.hpp diff --git a/bhtree_mpi/datastructures/Tree.cpp b/bhtree_mpi/src/datastructures/Tree.cpp similarity index 100% rename from bhtree_mpi/datastructures/Tree.cpp rename to bhtree_mpi/src/datastructures/Tree.cpp diff --git a/bhtree_mpi/datastructures/Tree.hpp b/bhtree_mpi/src/datastructures/Tree.hpp similarity index 100% rename from bhtree_mpi/datastructures/Tree.hpp rename to bhtree_mpi/src/datastructures/Tree.hpp diff --git a/bhtree_mpi/mpimain.cpp b/bhtree_mpi/src/mpimain.cpp similarity index 100% rename from bhtree_mpi/mpimain.cpp rename to bhtree_mpi/src/mpimain.cpp diff --git a/bhtree_mpi/src/simulation/CMakeLists.txt b/bhtree_mpi/src/simulation/CMakeLists.txt new file mode 100644 index 0000000..0672732 --- /dev/null +++ b/bhtree_mpi/src/simulation/CMakeLists.txt @@ -0,0 +1,14 @@ +# ================================================================================================== +# This file is part of the CodeVault project. The project is licensed under Apache Version 2.0. +# CodeVault is part of the EU-project PRACE-4IP (WP7.3.C). +# +# Author(s): +# Paul Heinzlreiter +# +# ================================================================================================== + +cmake_minimum_required (VERSION 3.0 FATAL_ERROR) +file( GLOB simulation_SOURCES *.hpp *.cpp ) +include_directories(../datastructures) +add_library( simulation ${simulation_SOURCES} ) +target_link_libraries(simulation datastructures ${MPI_LIBRARIES}) \ No newline at end of file diff --git a/bhtree_mpi/simulation/MpiSimulation.cpp b/bhtree_mpi/src/simulation/MpiSimulation.cpp similarity index 100% rename from bhtree_mpi/simulation/MpiSimulation.cpp rename to bhtree_mpi/src/simulation/MpiSimulation.cpp diff --git a/bhtree_mpi/simulation/MpiSimulation.hpp b/bhtree_mpi/src/simulation/MpiSimulation.hpp similarity index 100% rename from bhtree_mpi/simulation/MpiSimulation.hpp rename to bhtree_mpi/src/simulation/MpiSimulation.hpp diff --git a/bhtree_mpi/simulation/Simulation.cpp b/bhtree_mpi/src/simulation/Simulation.cpp similarity index 100% rename from bhtree_mpi/simulation/Simulation.cpp rename to bhtree_mpi/src/simulation/Simulation.cpp diff --git a/bhtree_mpi/simulation/Simulation.hpp b/bhtree_mpi/src/simulation/Simulation.hpp similarity index 100% rename from bhtree_mpi/simulation/Simulation.hpp rename to bhtree_mpi/src/simulation/Simulation.hpp -- GitLab