diff --git a/cmake/MyConfig.cmake b/cmake/MyConfig.cmake index c0fbb5c9097..ef81522c715 100644 --- a/cmake/MyConfig.cmake +++ b/cmake/MyConfig.cmake @@ -37,9 +37,9 @@ if(NOT MYCONFIG_FILE) endif() configure_file(${MYCONFIG_FILE} - ${CMAKE_BINARY_DIR}/src/config/myconfig-final.hpp COPYONLY) + ${CMAKE_BINARY_DIR}/src/config/include/config/myconfig-final.hpp COPYONLY) add_custom_target(myconfig - DEPENDS ${CMAKE_BINARY_DIR}/src/config/myconfig-final.hpp) + DEPENDS ${CMAKE_BINARY_DIR}/src/config/include/config/myconfig-final.hpp) message(STATUS "Config file: ${MYCONFIG_FILE}") # Clear variable, otherwise cmake must be run by hand to detect myconfig. # Also prevents find_file from skipping when variable is already set. diff --git a/cmake/version.cmake b/cmake/version.cmake index a29ec0be474..09ef3e3d2f9 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -25,6 +25,8 @@ if(GIT_EXECUTABLE) endif(GIT_EXECUTABLE) -configure_file(${PROJECT_SOURCE_DIR}/src/config/version.hpp.in version.hpp.tmp) -execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different version.hpp.tmp - version.hpp) +configure_file(${PROJECT_SOURCE_DIR}/src/config/include/config/version.hpp.in + ${CMAKE_BINARY_DIR}/include/config/version.hpp.tmp) +execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_BINARY_DIR}/include/config/version.hpp.tmp + ${CMAKE_BINARY_DIR}/include/config/version.hpp) diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt index 223ddba14ed..b9edbbfd4a9 100644 --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -17,29 +17,34 @@ # along with this program. If not, see . # -configure_file(${CMAKE_SOURCE_DIR}/cmake/cmake_config.cmakein cmake_config.hpp) +add_subdirectory(include/config) +add_subdirectory(src) + +configure_file(${CMAKE_SOURCE_DIR}/cmake/cmake_config.cmakein + ${CMAKE_CURRENT_BINARY_DIR}/include/config/cmake_config.hpp) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/config-features.hpp - ${CMAKE_CURRENT_BINARY_DIR}/config-features.cpp + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/config/config-features.hpp + ${CMAKE_CURRENT_BINARY_DIR}/src/config-features.cpp COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen_featureconfig.py ${CMAKE_CURRENT_SOURCE_DIR}/features.def - ${CMAKE_CURRENT_BINARY_DIR}/config-features.hpp - ${CMAKE_CURRENT_BINARY_DIR}/config-features.cpp + ${CMAKE_CURRENT_BINARY_DIR}/include/config/config-features.hpp + ${CMAKE_CURRENT_BINARY_DIR}/src/config-features.cpp DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/features.def ${CMAKE_CURRENT_SOURCE_DIR}/gen_featureconfig.py) add_custom_target( generate_config_features - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config-features.hpp - ${CMAKE_CURRENT_BINARY_DIR}/config-features.cpp) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/config/config-features.hpp + ${CMAKE_CURRENT_BINARY_DIR}/src/config-features.cpp) add_custom_target( check_myconfig COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/check_myconfig.py ${CMAKE_CXX_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR}/features.def - ${CMAKE_CURRENT_BINARY_DIR}/myconfig-final.hpp cmake_config.hpp + ${CMAKE_CURRENT_BINARY_DIR}/include/config/myconfig-final.hpp + ${CMAKE_CURRENT_BINARY_DIR}/include/config/cmake_config.hpp DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/features.def myconfig) execute_process( @@ -47,14 +52,15 @@ execute_process( ${CMAKE_CURRENT_SOURCE_DIR}/features.def OUTPUT_FILE ${CMAKE_BINARY_DIR}/myconfig-sample.hpp) -add_library(espresso_config SHARED config-features.cpp) +add_library(espresso_config SHARED src/config-features.cpp) add_library(espresso::config ALIAS espresso_config) add_dependencies(espresso_config myconfig check_myconfig generate_config_features) install(TARGETS espresso_config LIBRARY DESTINATION ${ESPRESSO_INSTALL_PYTHON}/espressomd) -target_include_directories(espresso_config PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories( + espresso_config PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_BINARY_DIR}/include) find_package(Git) # Parse repository info from git if available Run this at build time to avoid @@ -66,6 +72,8 @@ add_custom_target( -DPROJECT_VERSION=${PROJECT_VERSION} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake) -set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES version.hpp - version.hpp.tmp) +set_property( + DIRECTORY APPEND + PROPERTY ADDITIONAL_MAKE_CLEAN_FILES include/config/version.hpp + include/config/version.hpp.tmp) add_dependencies(espresso_config version) diff --git a/src/config/gen_featureconfig.py b/src/config/gen_featureconfig.py index b8d713e9479..04edc08bf84 100644 --- a/src/config/gen_featureconfig.py +++ b/src/config/gen_featureconfig.py @@ -61,8 +61,8 @@ /* Handle definitions from CMake */ /*********************************/ -#include "cmake_config.hpp" -#include "myconfig-final.hpp" +#include "config/cmake_config.hpp" +#include "config/myconfig-final.hpp" """) external_template = string.Template(""" // $feature is external @@ -75,7 +75,7 @@ # Include definitions from CMake hfile.write(""" -#include "cmake_config.hpp" +#include "config/cmake_config.hpp" """) @@ -132,8 +132,8 @@ cfile.write(disclaimer) cfile.write(f""" -#include "config-features.hpp" -#include "config.hpp" +#include "config/config-features.hpp" +#include "config/config.hpp" /***********************/ /* Handle requirements */ diff --git a/src/config/include/config/CMakeLists.txt b/src/config/include/config/CMakeLists.txt new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/src/config/include/config/CMakeLists.txt @@ -0,0 +1 @@ + diff --git a/src/config/config.hpp b/src/config/include/config/config.hpp similarity index 98% rename from src/config/config.hpp rename to src/config/include/config/config.hpp index 03634264667..f392f9fff80 100644 --- a/src/config/config.hpp +++ b/src/config/include/config/config.hpp @@ -37,7 +37,7 @@ #define MPICH_SKIP_MPICXX #endif -#include "config-features.hpp" +#include "config/config-features.hpp" /** P3M: Default for offset of first mesh point from the origin (left * down corner of the simulation box). diff --git a/src/config/version.hpp.in b/src/config/include/config/version.hpp.in similarity index 100% rename from src/config/version.hpp.in rename to src/config/include/config/version.hpp.in diff --git a/src/config/src/CMakeLists.txt b/src/config/src/CMakeLists.txt new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/src/config/src/CMakeLists.txt @@ -0,0 +1 @@ + diff --git a/src/core/EspressoSystemInterface.hpp b/src/core/EspressoSystemInterface.hpp index 9cfde74c391..335390f52f7 100644 --- a/src/core/EspressoSystemInterface.hpp +++ b/src/core/EspressoSystemInterface.hpp @@ -20,7 +20,7 @@ #define ESPRESSOSYSTEMINTERFACE_H #include "SystemInterface.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "cuda_interface.hpp" #include diff --git a/src/core/EspressoSystemStandAlone.cpp b/src/core/EspressoSystemStandAlone.cpp index 694818a1193..cfa2aa0c5e6 100644 --- a/src/core/EspressoSystemStandAlone.cpp +++ b/src/core/EspressoSystemStandAlone.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "EspressoSystemStandAlone.hpp" #include "MpiCallbacks.hpp" diff --git a/src/core/Observable_stat.cpp b/src/core/Observable_stat.cpp index 96d9892b624..527bad5da96 100644 --- a/src/core/Observable_stat.cpp +++ b/src/core/Observable_stat.cpp @@ -21,7 +21,7 @@ #include "Observable_stat.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "bonded_interactions/bonded_interaction_data.hpp" #include "communication.hpp" diff --git a/src/core/Particle.hpp b/src/core/Particle.hpp index 5aea6ceacdd..4c9a21d5f0f 100644 --- a/src/core/Particle.hpp +++ b/src/core/Particle.hpp @@ -19,7 +19,7 @@ #ifndef ESPRESSO_CORE_PARTICLE_HPP #define ESPRESSO_CORE_PARTICLE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "BondList.hpp" diff --git a/src/core/SystemInterface.cpp b/src/core/SystemInterface.cpp index b3014dcaef2..47df16f2115 100644 --- a/src/core/SystemInterface.cpp +++ b/src/core/SystemInterface.cpp @@ -17,4 +17,4 @@ * along with this program. If not, see . */ #include "SystemInterface.hpp" -#include "config.hpp" +#include "config/config.hpp" diff --git a/src/core/SystemInterface.hpp b/src/core/SystemInterface.hpp index 9ffd1174563..3dfbf014351 100644 --- a/src/core/SystemInterface.hpp +++ b/src/core/SystemInterface.hpp @@ -19,7 +19,7 @@ #ifndef SYSTEMINTERFACE_H #define SYSTEMINTERFACE_H -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/bonded_interactions/angle_common.hpp b/src/core/bonded_interactions/angle_common.hpp index 63ca6df11a8..aa4cf70fdfe 100644 --- a/src/core/bonded_interactions/angle_common.hpp +++ b/src/core/bonded_interactions/angle_common.hpp @@ -24,7 +24,7 @@ * Common code for functions calculating angle forces. */ -#include "config.hpp" +#include "config/config.hpp" #include "grid.hpp" #include diff --git a/src/core/bonded_interactions/bonded_coulomb.hpp b/src/core/bonded_interactions/bonded_coulomb.hpp index 927715daa0d..9665bffe422 100644 --- a/src/core/bonded_interactions/bonded_coulomb.hpp +++ b/src/core/bonded_interactions/bonded_coulomb.hpp @@ -25,7 +25,7 @@ * particle pairs. */ -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/bonded_interactions/bonded_coulomb_sr.hpp b/src/core/bonded_interactions/bonded_coulomb_sr.hpp index 9d60d7b4b74..d59f865c11e 100644 --- a/src/core/bonded_interactions/bonded_coulomb_sr.hpp +++ b/src/core/bonded_interactions/bonded_coulomb_sr.hpp @@ -26,7 +26,7 @@ * interactions in combination with Thole damping. */ -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" diff --git a/src/core/bonded_interactions/bonded_tab.hpp b/src/core/bonded_interactions/bonded_tab.hpp index 450189b937f..0725aad8fe1 100644 --- a/src/core/bonded_interactions/bonded_tab.hpp +++ b/src/core/bonded_interactions/bonded_tab.hpp @@ -28,7 +28,7 @@ * Implementation in \ref bonded_tab.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #include "TabulatedPotential.hpp" #include "angle_common.hpp" diff --git a/src/core/bonded_interactions/dihedral.hpp b/src/core/bonded_interactions/dihedral.hpp index 665ed59fc86..63c28fef1cd 100644 --- a/src/core/bonded_interactions/dihedral.hpp +++ b/src/core/bonded_interactions/dihedral.hpp @@ -28,7 +28,7 @@ */ #include "BoxGeometry.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "grid.hpp" #include diff --git a/src/core/bonded_interactions/fene.hpp b/src/core/bonded_interactions/fene.hpp index 944ce8b4221..68091784336 100644 --- a/src/core/bonded_interactions/fene.hpp +++ b/src/core/bonded_interactions/fene.hpp @@ -26,7 +26,7 @@ * Implementation in \ref fene.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #include "errorhandling.hpp" #include diff --git a/src/core/bonded_interactions/harmonic.hpp b/src/core/bonded_interactions/harmonic.hpp index 108d64ebcca..d4af01869f3 100644 --- a/src/core/bonded_interactions/harmonic.hpp +++ b/src/core/bonded_interactions/harmonic.hpp @@ -24,7 +24,7 @@ * Routines to calculate the harmonic bond potential between particle pairs. */ -#include "config.hpp" +#include "config/config.hpp" #include "errorhandling.hpp" #include diff --git a/src/core/cell_system/CellStructure.hpp b/src/core/cell_system/CellStructure.hpp index cfee3c2fa72..42777ba94a0 100644 --- a/src/core/cell_system/CellStructure.hpp +++ b/src/core/cell_system/CellStructure.hpp @@ -33,7 +33,7 @@ #include "bond_error.hpp" #include "cell_system/Cell.hpp" #include "cell_system/CellStructureType.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "ghosts.hpp" #include diff --git a/src/core/cluster_analysis/Cluster.cpp b/src/core/cluster_analysis/Cluster.cpp index 1256bcce05e..f691169c584 100644 --- a/src/core/cluster_analysis/Cluster.cpp +++ b/src/core/cluster_analysis/Cluster.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef GSL #include "gsl/gsl_fit.h" diff --git a/src/core/collision.hpp b/src/core/collision.hpp index 77fdd5247ff..e46a6d7baf2 100644 --- a/src/core/collision.hpp +++ b/src/core/collision.hpp @@ -19,7 +19,7 @@ #ifndef CORE_COLLISION_HPP #define CORE_COLLISION_HPP -#include "config.hpp" +#include "config/config.hpp" #include "BondList.hpp" #include "Particle.hpp" diff --git a/src/core/constraints/HomogeneousMagneticField.cpp b/src/core/constraints/HomogeneousMagneticField.cpp index c45927ec0d2..05fb65ba0ef 100644 --- a/src/core/constraints/HomogeneousMagneticField.cpp +++ b/src/core/constraints/HomogeneousMagneticField.cpp @@ -20,7 +20,7 @@ #include "Observable_stat.hpp" #include "Particle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/constraints/ShapeBasedConstraint.cpp b/src/core/constraints/ShapeBasedConstraint.cpp index 197dd5cb57f..a8121142114 100644 --- a/src/core/constraints/ShapeBasedConstraint.cpp +++ b/src/core/constraints/ShapeBasedConstraint.cpp @@ -22,7 +22,7 @@ #include "BoxGeometry.hpp" #include "Observable_stat.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "dpd.hpp" #include "energy_inline.hpp" #include "errorhandling.hpp" diff --git a/src/core/cuda_common_cuda.cu b/src/core/cuda_common_cuda.cu index f9006da8264..40240add32f 100644 --- a/src/core/cuda_common_cuda.cu +++ b/src/core/cuda_common_cuda.cu @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "ParticleRange.hpp" #include "cuda_init.hpp" diff --git a/src/core/cuda_init.cpp b/src/core/cuda_init.cpp index 975ac802c6f..fba9c233cf8 100644 --- a/src/core/cuda_init.cpp +++ b/src/core/cuda_init.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA diff --git a/src/core/cuda_init.hpp b/src/core/cuda_init.hpp index 3e9d10eca65..a663224db86 100644 --- a/src/core/cuda_init.hpp +++ b/src/core/cuda_init.hpp @@ -19,7 +19,7 @@ #ifndef CORE_CUDA_INIT_H #define CORE_CUDA_INIT_H -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA diff --git a/src/core/cuda_interface.cpp b/src/core/cuda_interface.cpp index 01ebcc3bd26..e02be9867b8 100644 --- a/src/core/cuda_interface.cpp +++ b/src/core/cuda_interface.cpp @@ -23,7 +23,7 @@ #include "EspressoSystemInterface.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "grid.hpp" #include "nonbonded_interactions/nonbonded_interaction_data.hpp" #include "serialization/CUDA_particle_data.hpp" diff --git a/src/core/cuda_interface.hpp b/src/core/cuda_interface.hpp index d9320ae1e9a..f79cf46af9e 100644 --- a/src/core/cuda_interface.hpp +++ b/src/core/cuda_interface.hpp @@ -19,7 +19,7 @@ #ifndef CORE_CUDA_INTERFACE_HPP #define CORE_CUDA_INTERFACE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA diff --git a/src/core/cuda_utils.hpp b/src/core/cuda_utils.hpp index 88ce020b887..f65c92d1164 100644 --- a/src/core/cuda_utils.hpp +++ b/src/core/cuda_utils.hpp @@ -19,7 +19,7 @@ #ifndef CORE_CUDA_UTILS_HPP #define CORE_CUDA_UTILS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA diff --git a/src/core/dpd.cpp b/src/core/dpd.cpp index d59b6007c12..8a22f988d8c 100644 --- a/src/core/dpd.cpp +++ b/src/core/dpd.cpp @@ -21,7 +21,7 @@ /** \file * Implementation of dpd.hpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DPD diff --git a/src/core/dpd.hpp b/src/core/dpd.hpp index 091ca91cde7..ea9e7a7e42c 100644 --- a/src/core/dpd.hpp +++ b/src/core/dpd.hpp @@ -26,7 +26,7 @@ * Implementation in @ref dpd.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DPD diff --git a/src/core/electrostatics/actor.hpp b/src/core/electrostatics/actor.hpp index 138be4ed5c5..674c288ff0f 100644 --- a/src/core/electrostatics/actor.hpp +++ b/src/core/electrostatics/actor.hpp @@ -19,7 +19,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_ACTOR_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_ACTOR_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/coulomb.cpp b/src/core/electrostatics/coulomb.cpp index 3cb15150262..378666ffab4 100644 --- a/src/core/electrostatics/coulomb.cpp +++ b/src/core/electrostatics/coulomb.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/coulomb.hpp b/src/core/electrostatics/coulomb.hpp index 03b1944debd..1d0b831251e 100644 --- a/src/core/electrostatics/coulomb.hpp +++ b/src/core/electrostatics/coulomb.hpp @@ -19,7 +19,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_COULOMB_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_COULOMB_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/coulomb_inline.hpp b/src/core/electrostatics/coulomb_inline.hpp index 996e8c3e74e..b13c1e45b43 100644 --- a/src/core/electrostatics/coulomb_inline.hpp +++ b/src/core/electrostatics/coulomb_inline.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_COULOMB_INLINE_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_COULOMB_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "electrostatics/coulomb.hpp" diff --git a/src/core/electrostatics/debye_hueckel.hpp b/src/core/electrostatics/debye_hueckel.hpp index eecbc940c5d..c0c72710ef0 100644 --- a/src/core/electrostatics/debye_hueckel.hpp +++ b/src/core/electrostatics/debye_hueckel.hpp @@ -27,7 +27,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_DEBYE_HUECKEL_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_DEBYE_HUECKEL_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/elc.cpp b/src/core/electrostatics/elc.cpp index 445460f2c53..9d811608573 100644 --- a/src/core/electrostatics/elc.cpp +++ b/src/core/electrostatics/elc.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M diff --git a/src/core/electrostatics/elc.hpp b/src/core/electrostatics/elc.hpp index e17c0da1d78..4b1326790e6 100644 --- a/src/core/electrostatics/elc.hpp +++ b/src/core/electrostatics/elc.hpp @@ -31,7 +31,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_ELC_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_ELC_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M diff --git a/src/core/electrostatics/icc.cpp b/src/core/electrostatics/icc.cpp index a36e9e15943..ca23e179a04 100644 --- a/src/core/electrostatics/icc.cpp +++ b/src/core/electrostatics/icc.cpp @@ -26,7 +26,7 @@ * \ref icc.hpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/icc.hpp b/src/core/electrostatics/icc.hpp index de1862d6046..7d79be0656f 100644 --- a/src/core/electrostatics/icc.hpp +++ b/src/core/electrostatics/icc.hpp @@ -46,7 +46,7 @@ * data organisation schemes, this is performed differently. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/mmm-modpsi.cpp b/src/core/electrostatics/mmm-modpsi.cpp index 59767e364bb..4fb556e686b 100644 --- a/src/core/electrostatics/mmm-modpsi.cpp +++ b/src/core/electrostatics/mmm-modpsi.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "mmm-modpsi.hpp" #include "specfunc.hpp" diff --git a/src/core/electrostatics/mmm1d.cpp b/src/core/electrostatics/mmm1d.cpp index c32647c3f7a..53f2b84a021 100644 --- a/src/core/electrostatics/mmm1d.cpp +++ b/src/core/electrostatics/mmm1d.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/mmm1d.hpp b/src/core/electrostatics/mmm1d.hpp index 95b47f8afc2..7792ea2431c 100644 --- a/src/core/electrostatics/mmm1d.hpp +++ b/src/core/electrostatics/mmm1d.hpp @@ -31,7 +31,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_MMM1D_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_MMM1D_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/mmm1d_gpu.cpp b/src/core/electrostatics/mmm1d_gpu.cpp index 452741f9028..d1359544be5 100644 --- a/src/core/electrostatics/mmm1d_gpu.cpp +++ b/src/core/electrostatics/mmm1d_gpu.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef MMM1D_GPU diff --git a/src/core/electrostatics/mmm1d_gpu.hpp b/src/core/electrostatics/mmm1d_gpu.hpp index 4f05d218ed0..e524c7f1b99 100644 --- a/src/core/electrostatics/mmm1d_gpu.hpp +++ b/src/core/electrostatics/mmm1d_gpu.hpp @@ -29,7 +29,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_MMM1D_GPU_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_MMM1D_GPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef MMM1D_GPU diff --git a/src/core/electrostatics/mmm1d_gpu_cuda.cu b/src/core/electrostatics/mmm1d_gpu_cuda.cu index d95b597c409..78ae0fb30ed 100644 --- a/src/core/electrostatics/mmm1d_gpu_cuda.cu +++ b/src/core/electrostatics/mmm1d_gpu_cuda.cu @@ -22,7 +22,7 @@ * near formulas of MMM1D on GPU, as well as the force kernels. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef MMM1D_GPU diff --git a/src/core/electrostatics/p3m.hpp b/src/core/electrostatics/p3m.hpp index 1c7e3e92755..4f682bf7fa8 100644 --- a/src/core/electrostatics/p3m.hpp +++ b/src/core/electrostatics/p3m.hpp @@ -35,7 +35,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_P3M_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_P3M_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M diff --git a/src/core/electrostatics/p3m_gpu.cpp b/src/core/electrostatics/p3m_gpu.cpp index 085ad69f1e5..5922644fcdd 100644 --- a/src/core/electrostatics/p3m_gpu.cpp +++ b/src/core/electrostatics/p3m_gpu.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M #ifdef CUDA diff --git a/src/core/electrostatics/p3m_gpu.hpp b/src/core/electrostatics/p3m_gpu.hpp index cb91512f17b..8cfdcd24da8 100644 --- a/src/core/electrostatics/p3m_gpu.hpp +++ b/src/core/electrostatics/p3m_gpu.hpp @@ -25,7 +25,7 @@ * P3M electrostatics on GPU. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M #ifdef CUDA diff --git a/src/core/electrostatics/p3m_gpu_cuda.cu b/src/core/electrostatics/p3m_gpu_cuda.cu index 317a21a9520..3a7c005e047 100644 --- a/src/core/electrostatics/p3m_gpu_cuda.cu +++ b/src/core/electrostatics/p3m_gpu_cuda.cu @@ -25,7 +25,7 @@ * The corresponding header file is @ref p3m_gpu_cuda.cuh. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/p3m_gpu_error.hpp b/src/core/electrostatics/p3m_gpu_error.hpp index d8c8025744f..8ee70a8d3ee 100644 --- a/src/core/electrostatics/p3m_gpu_error.hpp +++ b/src/core/electrostatics/p3m_gpu_error.hpp @@ -26,7 +26,7 @@ * Implementation in p3m_gpu_error_cuda.cu. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA double p3m_k_space_error_gpu(double prefactor, const int *mesh, int cao, diff --git a/src/core/electrostatics/reaction_field.hpp b/src/core/electrostatics/reaction_field.hpp index 38cf95d4d84..c3a63c17fe4 100644 --- a/src/core/electrostatics/reaction_field.hpp +++ b/src/core/electrostatics/reaction_field.hpp @@ -28,7 +28,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_REACTION_FIELD_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_REACTION_FIELD_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/registration.hpp b/src/core/electrostatics/registration.hpp index cfa1303077d..7e14fab16a0 100644 --- a/src/core/electrostatics/registration.hpp +++ b/src/core/electrostatics/registration.hpp @@ -19,7 +19,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_COULOMB_REGISTRATION_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_COULOMB_REGISTRATION_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/core/electrostatics/scafacos.hpp b/src/core/electrostatics/scafacos.hpp index 47db47a19d4..a4a801debbc 100644 --- a/src/core/electrostatics/scafacos.hpp +++ b/src/core/electrostatics/scafacos.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_SCAFACOS_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_SCAFACOS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS diff --git a/src/core/electrostatics/scafacos_impl.cpp b/src/core/electrostatics/scafacos_impl.cpp index d4cec083c9a..3a7ce9b1021 100644 --- a/src/core/electrostatics/scafacos_impl.cpp +++ b/src/core/electrostatics/scafacos_impl.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS diff --git a/src/core/electrostatics/scafacos_impl.hpp b/src/core/electrostatics/scafacos_impl.hpp index cbe9a2798da..9a9015e92a4 100644 --- a/src/core/electrostatics/scafacos_impl.hpp +++ b/src/core/electrostatics/scafacos_impl.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_SCAFACOS_IMPL_HPP #define ESPRESSO_SRC_CORE_ELECTROSTATICS_SCAFACOS_IMPL_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS diff --git a/src/core/electrostatics/specfunc.cuh b/src/core/electrostatics/specfunc.cuh index 7b3a3ef3416..87aa18ed7f6 100644 --- a/src/core/electrostatics/specfunc.cuh +++ b/src/core/electrostatics/specfunc.cuh @@ -48,7 +48,7 @@ #ifndef ESPRESSO_SRC_CORE_ELECTROSTATICS_SPECFUNC_CUH #define ESPRESSO_SRC_CORE_ELECTROSTATICS_SPECFUNC_CUH -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/energy_inline.hpp b/src/core/energy_inline.hpp index 23921c6cd14..20123643186 100644 --- a/src/core/energy_inline.hpp +++ b/src/core/energy_inline.hpp @@ -24,7 +24,7 @@ * Energy calculation. */ -#include "config.hpp" +#include "config/config.hpp" #include "energy.hpp" diff --git a/src/core/errorhandling.hpp b/src/core/errorhandling.hpp index 1d79a1a94e6..7dc23c793c8 100644 --- a/src/core/errorhandling.hpp +++ b/src/core/errorhandling.hpp @@ -26,7 +26,7 @@ #ifndef ESPRESSO_SRC_CORE_ERROR_HANDLING_HPP #define ESPRESSO_SRC_CORE_ERROR_HANDLING_HPP -#include "config.hpp" +#include "config/config.hpp" #include "error_handling/RuntimeError.hpp" #include "error_handling/RuntimeErrorStream.hpp" diff --git a/src/core/event.cpp b/src/core/event.cpp index 3419a7cf206..1e1ea80524c 100644 --- a/src/core/event.cpp +++ b/src/core/event.cpp @@ -30,7 +30,7 @@ #include "cells.hpp" #include "collision.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "cuda_init.hpp" #include "cuda_interface.hpp" #include "cuda_utils.hpp" diff --git a/src/core/exclusions.cpp b/src/core/exclusions.cpp index adf63b0df3d..6ac72674183 100644 --- a/src/core/exclusions.cpp +++ b/src/core/exclusions.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef EXCLUSIONS diff --git a/src/core/exclusions.hpp b/src/core/exclusions.hpp index 87f47b7b567..d377c9bad59 100644 --- a/src/core/exclusions.hpp +++ b/src/core/exclusions.hpp @@ -21,7 +21,7 @@ #ifndef ESPRESSO_EXCLUSIONS_HPP #define ESPRESSO_EXCLUSIONS_HPP -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" diff --git a/src/core/forces_inline.hpp b/src/core/forces_inline.hpp index 874cc391c15..691bf5ec967 100644 --- a/src/core/forces_inline.hpp +++ b/src/core/forces_inline.hpp @@ -24,7 +24,7 @@ * Force calculation. */ -#include "config.hpp" +#include "config/config.hpp" #include "forces.hpp" diff --git a/src/core/galilei/Galilei.cpp b/src/core/galilei/Galilei.cpp index 0ead5f60e55..e1bb4c690c9 100644 --- a/src/core/galilei/Galilei.cpp +++ b/src/core/galilei/Galilei.cpp @@ -25,7 +25,7 @@ #include "ParticleRange.hpp" #include "cells.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "event.hpp" #include "grid.hpp" diff --git a/src/core/grid_based_algorithms/electrokinetics.hpp b/src/core/grid_based_algorithms/electrokinetics.hpp index e315a8a39ee..b9f611c2148 100644 --- a/src/core/grid_based_algorithms/electrokinetics.hpp +++ b/src/core/grid_based_algorithms/electrokinetics.hpp @@ -20,7 +20,7 @@ #ifndef CORE_GRID_BASED_ALGORITHMS_ELECTROKINETICS_HPP #define CORE_GRID_BASED_ALGORITHMS_ELECTROKINETICS_HPP -#include "config.hpp" +#include "config/config.hpp" #include "grid_based_algorithms/lb_boundaries.hpp" // note that we need to declare the ek_parameters struct and instantiate it for diff --git a/src/core/grid_based_algorithms/electrokinetics_cuda.cu b/src/core/grid_based_algorithms/electrokinetics_cuda.cu index 6cf9736a3f7..8a401bf9688 100644 --- a/src/core/grid_based_algorithms/electrokinetics_cuda.cu +++ b/src/core/grid_based_algorithms/electrokinetics_cuda.cu @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA /* Terminates at end of file */ #ifdef ELECTROKINETICS /* Terminates at end of file */ diff --git a/src/core/grid_based_algorithms/halo.cpp b/src/core/grid_based_algorithms/halo.cpp index 13329bff45d..e800d2af3be 100644 --- a/src/core/grid_based_algorithms/halo.cpp +++ b/src/core/grid_based_algorithms/halo.cpp @@ -25,7 +25,7 @@ * */ -#include "config.hpp" +#include "config/config.hpp" #include "communication.hpp" #include "grid.hpp" diff --git a/src/core/grid_based_algorithms/lb.hpp b/src/core/grid_based_algorithms/lb.hpp index 3b641af9b17..dac4508134f 100644 --- a/src/core/grid_based_algorithms/lb.hpp +++ b/src/core/grid_based_algorithms/lb.hpp @@ -36,7 +36,7 @@ * Implementation in lb.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #include "grid_based_algorithms/lattice.hpp" #include "grid_based_algorithms/lb-d3q19.hpp" #include "grid_based_algorithms/lb_constants.hpp" diff --git a/src/core/grid_based_algorithms/lb_boundaries.hpp b/src/core/grid_based_algorithms/lb_boundaries.hpp index 772405807dd..3dcf7e35f60 100644 --- a/src/core/grid_based_algorithms/lb_boundaries.hpp +++ b/src/core/grid_based_algorithms/lb_boundaries.hpp @@ -34,7 +34,7 @@ #include "lbboundaries/LBBoundary.hpp" -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/grid_based_algorithms/lb_collective_interface.cpp b/src/core/grid_based_algorithms/lb_collective_interface.cpp index bedc3088b73..f1a9765c5c1 100644 --- a/src/core/grid_based_algorithms/lb_collective_interface.cpp +++ b/src/core/grid_based_algorithms/lb_collective_interface.cpp @@ -19,7 +19,7 @@ #include "MpiCallbacks.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "grid.hpp" #include "lb.hpp" #include "lb_constants.hpp" diff --git a/src/core/grid_based_algorithms/lb_interface.cpp b/src/core/grid_based_algorithms/lb_interface.cpp index 9970949ee14..3630d31d47c 100644 --- a/src/core/grid_based_algorithms/lb_interface.cpp +++ b/src/core/grid_based_algorithms/lb_interface.cpp @@ -20,7 +20,7 @@ #include "BoxGeometry.hpp" #include "MpiCallbacks.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "electrokinetics.hpp" #include "errorhandling.hpp" #include "grid.hpp" diff --git a/src/core/grid_based_algorithms/lb_interface.hpp b/src/core/grid_based_algorithms/lb_interface.hpp index ba35f73edf3..3dc14ecc537 100644 --- a/src/core/grid_based_algorithms/lb_interface.hpp +++ b/src/core/grid_based_algorithms/lb_interface.hpp @@ -19,7 +19,7 @@ #ifndef CORE_LB_INTERFACE #define CORE_LB_INTERFACE -#include "config.hpp" +#include "config/config.hpp" #include "grid_based_algorithms/lattice.hpp" #include diff --git a/src/core/grid_based_algorithms/lb_interpolation.cpp b/src/core/grid_based_algorithms/lb_interpolation.cpp index a0c4b7a8846..baeaac1446d 100644 --- a/src/core/grid_based_algorithms/lb_interpolation.cpp +++ b/src/core/grid_based_algorithms/lb_interpolation.cpp @@ -20,7 +20,7 @@ #include "lb_interpolation.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "grid_based_algorithms/lattice.hpp" #include "lb.hpp" diff --git a/src/core/grid_based_algorithms/lb_particle_coupling.cpp b/src/core/grid_based_algorithms/lb_particle_coupling.cpp index a158d3c9252..63628ceb7ad 100644 --- a/src/core/grid_based_algorithms/lb_particle_coupling.cpp +++ b/src/core/grid_based_algorithms/lb_particle_coupling.cpp @@ -21,7 +21,7 @@ #include "Particle.hpp" #include "cells.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "errorhandling.hpp" #include "grid.hpp" #include "grid_based_algorithms/OptionalCounter.hpp" diff --git a/src/core/grid_based_algorithms/lbboundaries/LBBoundary.hpp b/src/core/grid_based_algorithms/lbboundaries/LBBoundary.hpp index 0b9d521d935..ead5c0d7497 100644 --- a/src/core/grid_based_algorithms/lbboundaries/LBBoundary.hpp +++ b/src/core/grid_based_algorithms/lbboundaries/LBBoundary.hpp @@ -19,7 +19,7 @@ #ifndef LBBOUNDARIES_LBBOUNDARY_HPP #define LBBOUNDARIES_LBBOUNDARY_HPP -#include "config.hpp" +#include "config/config.hpp" #include #include diff --git a/src/core/grid_based_algorithms/lbgpu.cpp b/src/core/grid_based_algorithms/lbgpu.cpp index bdc614f25a7..d0b075dad79 100644 --- a/src/core/grid_based_algorithms/lbgpu.cpp +++ b/src/core/grid_based_algorithms/lbgpu.cpp @@ -22,7 +22,7 @@ * The corresponding header file is lbgpu.hpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA diff --git a/src/core/grid_based_algorithms/lbgpu.cuh b/src/core/grid_based_algorithms/lbgpu.cuh index dbbfc966505..352bed60596 100644 --- a/src/core/grid_based_algorithms/lbgpu.cuh +++ b/src/core/grid_based_algorithms/lbgpu.cuh @@ -25,7 +25,7 @@ #ifndef LBGPU_CUH #define LBGPU_CUH -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA #include diff --git a/src/core/grid_based_algorithms/lbgpu.hpp b/src/core/grid_based_algorithms/lbgpu.hpp index 31ab7b404b8..7f3d27b7c4c 100644 --- a/src/core/grid_based_algorithms/lbgpu.hpp +++ b/src/core/grid_based_algorithms/lbgpu.hpp @@ -25,7 +25,7 @@ #ifndef LBGPU_HPP #define LBGPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA #include "OptionalCounter.hpp" diff --git a/src/core/grid_based_algorithms/lbgpu_cuda.cu b/src/core/grid_based_algorithms/lbgpu_cuda.cu index 8a99c3c8c00..bd291f646b7 100644 --- a/src/core/grid_based_algorithms/lbgpu_cuda.cu +++ b/src/core/grid_based_algorithms/lbgpu_cuda.cu @@ -22,7 +22,7 @@ * The corresponding header file is lbgpu.cuh. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef CUDA diff --git a/src/core/immersed_boundaries.hpp b/src/core/immersed_boundaries.hpp index 1b8e3c2aa14..441952b9d0a 100644 --- a/src/core/immersed_boundaries.hpp +++ b/src/core/immersed_boundaries.hpp @@ -18,7 +18,7 @@ */ #ifndef IMMERSED_BOUNDARIES_HPP #define IMMERSED_BOUNDARIES_HPP -#include "config.hpp" +#include "config/config.hpp" #include "immersed_boundary/ImmersedBoundaries.hpp" extern ImmersedBoundaries immersed_boundaries; diff --git a/src/core/immersed_boundary/ImmersedBoundaries.hpp b/src/core/immersed_boundary/ImmersedBoundaries.hpp index af4a3af284b..93d5d5923c5 100644 --- a/src/core/immersed_boundary/ImmersedBoundaries.hpp +++ b/src/core/immersed_boundary/ImmersedBoundaries.hpp @@ -19,7 +19,7 @@ #ifndef IMMERSED_BOUNDARY_IMMERSED_BOUNDARIES_HPP #define IMMERSED_BOUNDARY_IMMERSED_BOUNDARIES_HPP -#include "config.hpp" +#include "config/config.hpp" #include "cell_system/CellStructure.hpp" diff --git a/src/core/immersed_boundary/ibm_tribend.hpp b/src/core/immersed_boundary/ibm_tribend.hpp index 735da471ca6..1445f84702b 100644 --- a/src/core/immersed_boundary/ibm_tribend.hpp +++ b/src/core/immersed_boundary/ibm_tribend.hpp @@ -20,7 +20,7 @@ #ifndef IBM_TRIBEND_H #define IBM_TRIBEND_H -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" diff --git a/src/core/immersed_boundary/ibm_triel.hpp b/src/core/immersed_boundary/ibm_triel.hpp index eaf8a8241c8..9039f094890 100644 --- a/src/core/immersed_boundary/ibm_triel.hpp +++ b/src/core/immersed_boundary/ibm_triel.hpp @@ -21,7 +21,7 @@ #define IBM_TRIEL_H #include "Particle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/integrators/brownian_inline.hpp b/src/core/integrators/brownian_inline.hpp index c8bab4ea58b..3396d7cabe3 100644 --- a/src/core/integrators/brownian_inline.hpp +++ b/src/core/integrators/brownian_inline.hpp @@ -22,7 +22,7 @@ #ifndef INTEGRATORS_BROWNIAN_INLINE_HPP #define INTEGRATORS_BROWNIAN_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "ParticleRange.hpp" #include "integrate.hpp" diff --git a/src/core/integrators/steepest_descent.cpp b/src/core/integrators/steepest_descent.cpp index d696dacae3f..8b7f41cdd4c 100644 --- a/src/core/integrators/steepest_descent.cpp +++ b/src/core/integrators/steepest_descent.cpp @@ -25,7 +25,7 @@ #include "ParticleRange.hpp" #include "cells.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "rotation.hpp" #include diff --git a/src/core/integrators/stokesian_dynamics_inline.hpp b/src/core/integrators/stokesian_dynamics_inline.hpp index 6347cba6357..1127ff3e685 100644 --- a/src/core/integrators/stokesian_dynamics_inline.hpp +++ b/src/core/integrators/stokesian_dynamics_inline.hpp @@ -19,7 +19,7 @@ #ifndef STOKESIAN_DYNAMICS_INLINE_HPP #define STOKESIAN_DYNAMICS_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef STOKESIAN_DYNAMICS #include "ParticleRange.hpp" diff --git a/src/core/integrators/velocity_verlet_inline.hpp b/src/core/integrators/velocity_verlet_inline.hpp index 0e819946b5e..fce60cf017e 100644 --- a/src/core/integrators/velocity_verlet_inline.hpp +++ b/src/core/integrators/velocity_verlet_inline.hpp @@ -19,7 +19,7 @@ #ifndef INTEGRATORS_VELOCITY_VERLET_HPP #define INTEGRATORS_VELOCITY_VERLET_HPP -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" #include "ParticleRange.hpp" diff --git a/src/core/integrators/velocity_verlet_npt.cpp b/src/core/integrators/velocity_verlet_npt.cpp index cd2e71afce2..38264cafe1c 100644 --- a/src/core/integrators/velocity_verlet_npt.cpp +++ b/src/core/integrators/velocity_verlet_npt.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef NPT #include "velocity_verlet_npt.hpp" diff --git a/src/core/integrators/velocity_verlet_npt.hpp b/src/core/integrators/velocity_verlet_npt.hpp index 338f7f2cedd..9b707b8a421 100644 --- a/src/core/integrators/velocity_verlet_npt.hpp +++ b/src/core/integrators/velocity_verlet_npt.hpp @@ -19,7 +19,7 @@ #ifndef INTEGRATORS_VELOCITY_VERLET_NPT_HPP #define INTEGRATORS_VELOCITY_VERLET_NPT_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef NPT diff --git a/src/core/io/writer/h5md_core.cpp b/src/core/io/writer/h5md_core.cpp index bce29e03fa8..2e2c69cbce6 100644 --- a/src/core/io/writer/h5md_core.cpp +++ b/src/core/io/writer/h5md_core.cpp @@ -23,9 +23,9 @@ #include "BoxGeometry.hpp" #include "Particle.hpp" +#include "config/version.hpp" #include "h5md_specification.hpp" #include "lees_edwards/LeesEdwardsBC.hpp" -#include "version.hpp" #include diff --git a/src/core/magnetostatics/barnes_hut_gpu.cpp b/src/core/magnetostatics/barnes_hut_gpu.cpp index 997aca0c14b..733f1b953f5 100644 --- a/src/core/magnetostatics/barnes_hut_gpu.cpp +++ b/src/core/magnetostatics/barnes_hut_gpu.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_BARNES_HUT diff --git a/src/core/magnetostatics/barnes_hut_gpu.hpp b/src/core/magnetostatics/barnes_hut_gpu.hpp index 1b0230d9275..a4ff0a9c94f 100644 --- a/src/core/magnetostatics/barnes_hut_gpu.hpp +++ b/src/core/magnetostatics/barnes_hut_gpu.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_BARNES_HUT_GPU_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_BARNES_HUT_GPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_BARNES_HUT diff --git a/src/core/magnetostatics/barnes_hut_gpu_cuda.cu b/src/core/magnetostatics/barnes_hut_gpu_cuda.cu index f18a8fdd8dc..9c1d9e00692 100644 --- a/src/core/magnetostatics/barnes_hut_gpu_cuda.cu +++ b/src/core/magnetostatics/barnes_hut_gpu_cuda.cu @@ -22,7 +22,7 @@ * The method is based on @cite burtscher11a. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_BARNES_HUT diff --git a/src/core/magnetostatics/barnes_hut_gpu_cuda.cuh b/src/core/magnetostatics/barnes_hut_gpu_cuda.cuh index 8fa4d0c4f51..7177d67ba83 100644 --- a/src/core/magnetostatics/barnes_hut_gpu_cuda.cuh +++ b/src/core/magnetostatics/barnes_hut_gpu_cuda.cuh @@ -21,7 +21,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_BARNES_HUT_GPU_CUH #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_BARNES_HUT_GPU_CUH -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_BARNES_HUT diff --git a/src/core/magnetostatics/dds.cpp b/src/core/magnetostatics/dds.cpp index 961e0d3cf8a..8b330f1be4b 100644 --- a/src/core/magnetostatics/dds.cpp +++ b/src/core/magnetostatics/dds.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dds.hpp b/src/core/magnetostatics/dds.hpp index 129f2ab02de..007909dc7da 100644 --- a/src/core/magnetostatics/dds.hpp +++ b/src/core/magnetostatics/dds.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dds_gpu.cpp b/src/core/magnetostatics/dds_gpu.cpp index 1184186f88d..47145828289 100644 --- a/src/core/magnetostatics/dds_gpu.cpp +++ b/src/core/magnetostatics/dds_gpu.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_DIRECT_SUM diff --git a/src/core/magnetostatics/dds_gpu.hpp b/src/core/magnetostatics/dds_gpu.hpp index aa09a41e21a..484fb23cb95 100644 --- a/src/core/magnetostatics/dds_gpu.hpp +++ b/src/core/magnetostatics/dds_gpu.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_GPU_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_GPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_DIRECT_SUM diff --git a/src/core/magnetostatics/dds_gpu_cuda.cu b/src/core/magnetostatics/dds_gpu_cuda.cu index 5b76e38ca9e..2f3f063fe05 100644 --- a/src/core/magnetostatics/dds_gpu_cuda.cu +++ b/src/core/magnetostatics/dds_gpu_cuda.cu @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_DIRECT_SUM diff --git a/src/core/magnetostatics/dds_gpu_cuda.cuh b/src/core/magnetostatics/dds_gpu_cuda.cuh index 3d73bf386c5..547a3e9783e 100644 --- a/src/core/magnetostatics/dds_gpu_cuda.cuh +++ b/src/core/magnetostatics/dds_gpu_cuda.cuh @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_GPU_CUH #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_GPU_CUH -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_DIRECT_SUM diff --git a/src/core/magnetostatics/dds_replica.cpp b/src/core/magnetostatics/dds_replica.cpp index 227f0ac40b7..dbaca1099aa 100644 --- a/src/core/magnetostatics/dds_replica.cpp +++ b/src/core/magnetostatics/dds_replica.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dds_replica.hpp b/src/core/magnetostatics/dds_replica.hpp index f54e09de23c..917c7662fc2 100644 --- a/src/core/magnetostatics/dds_replica.hpp +++ b/src/core/magnetostatics/dds_replica.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_REPLICA_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_REPLICA_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dipoles.cpp b/src/core/magnetostatics/dipoles.cpp index 084143422e2..59694f79fb5 100644 --- a/src/core/magnetostatics/dipoles.cpp +++ b/src/core/magnetostatics/dipoles.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dipoles.hpp b/src/core/magnetostatics/dipoles.hpp index 73a8a84cd75..acbae513ffc 100644 --- a/src/core/magnetostatics/dipoles.hpp +++ b/src/core/magnetostatics/dipoles.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLES_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLES_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dipoles_inline.hpp b/src/core/magnetostatics/dipoles_inline.hpp index 130fcb8bf2c..d7261ecf7e5 100644 --- a/src/core/magnetostatics/dipoles_inline.hpp +++ b/src/core/magnetostatics/dipoles_inline.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLES_INLINE_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLES_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" diff --git a/src/core/magnetostatics/dlc.cpp b/src/core/magnetostatics/dlc.cpp index 79ba4542df5..b343f65aee8 100644 --- a/src/core/magnetostatics/dlc.cpp +++ b/src/core/magnetostatics/dlc.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dlc.hpp b/src/core/magnetostatics/dlc.hpp index a032479ee88..da4e901e30b 100644 --- a/src/core/magnetostatics/dlc.hpp +++ b/src/core/magnetostatics/dlc.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DLC_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DLC_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/dp3m.cpp b/src/core/magnetostatics/dp3m.cpp index e9e64276583..3e9c28cf689 100644 --- a/src/core/magnetostatics/dp3m.cpp +++ b/src/core/magnetostatics/dp3m.cpp @@ -25,7 +25,7 @@ * By default the magnetic epsilon is metallic = 0. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DP3M diff --git a/src/core/magnetostatics/dp3m.hpp b/src/core/magnetostatics/dp3m.hpp index edc957daf14..1098ec04af5 100644 --- a/src/core/magnetostatics/dp3m.hpp +++ b/src/core/magnetostatics/dp3m.hpp @@ -32,7 +32,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_P3M_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLAR_P3M_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DP3M diff --git a/src/core/magnetostatics/registration.hpp b/src/core/magnetostatics/registration.hpp index 8daa094eb5f..ce9513b6237 100644 --- a/src/core/magnetostatics/registration.hpp +++ b/src/core/magnetostatics/registration.hpp @@ -19,7 +19,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLE_REGISTRATION_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_DIPOLE_REGISTRATION_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/core/magnetostatics/scafacos.hpp b/src/core/magnetostatics/scafacos.hpp index c189ad65107..baeead68150 100644 --- a/src/core/magnetostatics/scafacos.hpp +++ b/src/core/magnetostatics/scafacos.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_SCAFACOS_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_SCAFACOS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS_DIPOLES diff --git a/src/core/magnetostatics/scafacos_impl.cpp b/src/core/magnetostatics/scafacos_impl.cpp index 803ed852528..c71f69af5f1 100644 --- a/src/core/magnetostatics/scafacos_impl.cpp +++ b/src/core/magnetostatics/scafacos_impl.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS_DIPOLES diff --git a/src/core/magnetostatics/scafacos_impl.hpp b/src/core/magnetostatics/scafacos_impl.hpp index d6a86a72879..13264fe295c 100644 --- a/src/core/magnetostatics/scafacos_impl.hpp +++ b/src/core/magnetostatics/scafacos_impl.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_MAGNETOSTATICS_SCAFACOS_IMPL_HPP #define ESPRESSO_SRC_CORE_MAGNETOSTATICS_SCAFACOS_IMPL_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS_DIPOLES diff --git a/src/core/nonbonded_interactions/VerletCriterion.hpp b/src/core/nonbonded_interactions/VerletCriterion.hpp index 050242c6c69..21eff25e41f 100644 --- a/src/core/nonbonded_interactions/VerletCriterion.hpp +++ b/src/core/nonbonded_interactions/VerletCriterion.hpp @@ -22,7 +22,7 @@ #define CORE_NB_IA_VERLETCRITERION_HPP #include "Particle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "nonbonded_interactions/nonbonded_interaction_data.hpp" #include diff --git a/src/core/nonbonded_interactions/bmhtf-nacl.hpp b/src/core/nonbonded_interactions/bmhtf-nacl.hpp index c2a5b87d110..b5274c751ee 100644 --- a/src/core/nonbonded_interactions/bmhtf-nacl.hpp +++ b/src/core/nonbonded_interactions/bmhtf-nacl.hpp @@ -27,7 +27,7 @@ * Implementation in \ref bmhtf-nacl.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef BMHTF_NACL diff --git a/src/core/nonbonded_interactions/buckingham.hpp b/src/core/nonbonded_interactions/buckingham.hpp index 33a78a8625c..4bafa45b974 100644 --- a/src/core/nonbonded_interactions/buckingham.hpp +++ b/src/core/nonbonded_interactions/buckingham.hpp @@ -26,7 +26,7 @@ * Implementation in \ref buckingham.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef BUCKINGHAM diff --git a/src/core/nonbonded_interactions/gaussian.hpp b/src/core/nonbonded_interactions/gaussian.hpp index fd004b13cc6..9b345ab217c 100644 --- a/src/core/nonbonded_interactions/gaussian.hpp +++ b/src/core/nonbonded_interactions/gaussian.hpp @@ -27,7 +27,7 @@ * Implementation in \ref gaussian.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #include "nonbonded_interaction_data.hpp" diff --git a/src/core/nonbonded_interactions/gay_berne.hpp b/src/core/nonbonded_interactions/gay_berne.hpp index 4696f267af4..2d606a14dbc 100644 --- a/src/core/nonbonded_interactions/gay_berne.hpp +++ b/src/core/nonbonded_interactions/gay_berne.hpp @@ -31,7 +31,7 @@ * Implementation in \ref gay_berne.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef GAY_BERNE diff --git a/src/core/nonbonded_interactions/hat.hpp b/src/core/nonbonded_interactions/hat.hpp index 60d6fdc40e9..bc9785006d2 100644 --- a/src/core/nonbonded_interactions/hat.hpp +++ b/src/core/nonbonded_interactions/hat.hpp @@ -27,7 +27,7 @@ * Implementation in \ref hat.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef HAT diff --git a/src/core/nonbonded_interactions/hertzian.hpp b/src/core/nonbonded_interactions/hertzian.hpp index 6f45ce363d7..767c401dc6d 100644 --- a/src/core/nonbonded_interactions/hertzian.hpp +++ b/src/core/nonbonded_interactions/hertzian.hpp @@ -27,7 +27,7 @@ * Implementation in \ref hertzian.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #include "nonbonded_interaction_data.hpp" diff --git a/src/core/nonbonded_interactions/lj.hpp b/src/core/nonbonded_interactions/lj.hpp index 0cbee73cee2..99b5d6f7df5 100644 --- a/src/core/nonbonded_interactions/lj.hpp +++ b/src/core/nonbonded_interactions/lj.hpp @@ -21,7 +21,7 @@ #ifndef CORE_NB_IA_LJ_HPP #define CORE_NB_IA_LJ_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef LENNARD_JONES diff --git a/src/core/nonbonded_interactions/ljcos.hpp b/src/core/nonbonded_interactions/ljcos.hpp index 342c08c99c6..50e9abd824e 100644 --- a/src/core/nonbonded_interactions/ljcos.hpp +++ b/src/core/nonbonded_interactions/ljcos.hpp @@ -27,7 +27,7 @@ * Implementation in \ref ljcos.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef LJCOS diff --git a/src/core/nonbonded_interactions/ljcos2.hpp b/src/core/nonbonded_interactions/ljcos2.hpp index 3df298586fd..3d39d94c242 100644 --- a/src/core/nonbonded_interactions/ljcos2.hpp +++ b/src/core/nonbonded_interactions/ljcos2.hpp @@ -30,7 +30,7 @@ * Implementation in \ref ljcos2.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef LJCOS2 diff --git a/src/core/nonbonded_interactions/ljgen.hpp b/src/core/nonbonded_interactions/ljgen.hpp index b0a734ff514..23afed47a95 100644 --- a/src/core/nonbonded_interactions/ljgen.hpp +++ b/src/core/nonbonded_interactions/ljgen.hpp @@ -36,7 +36,7 @@ * Implementation in \ref ljgen.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef LENNARD_JONES_GENERIC diff --git a/src/core/nonbonded_interactions/morse.hpp b/src/core/nonbonded_interactions/morse.hpp index fab45cfe3a5..4515e2b0837 100644 --- a/src/core/nonbonded_interactions/morse.hpp +++ b/src/core/nonbonded_interactions/morse.hpp @@ -27,7 +27,7 @@ * Implementation in \ref morse.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef MORSE diff --git a/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp b/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp index defb1d1f122..2926e7ceb75 100644 --- a/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp +++ b/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp @@ -25,7 +25,7 @@ */ #include "TabulatedPotential.hpp" -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/nonbonded_interactions/nonbonded_tab.hpp b/src/core/nonbonded_interactions/nonbonded_tab.hpp index 692d17ef604..85385b1ca05 100644 --- a/src/core/nonbonded_interactions/nonbonded_tab.hpp +++ b/src/core/nonbonded_interactions/nonbonded_tab.hpp @@ -29,7 +29,7 @@ * Needs feature TABULATED compiled in (see \ref config.hpp). */ -#include "config.hpp" +#include "config/config.hpp" #ifdef TABULATED diff --git a/src/core/nonbonded_interactions/smooth_step.hpp b/src/core/nonbonded_interactions/smooth_step.hpp index 50cf2152796..926be66665f 100644 --- a/src/core/nonbonded_interactions/smooth_step.hpp +++ b/src/core/nonbonded_interactions/smooth_step.hpp @@ -27,7 +27,7 @@ * Implementation in \ref smooth_step.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef SMOOTH_STEP diff --git a/src/core/nonbonded_interactions/soft_sphere.hpp b/src/core/nonbonded_interactions/soft_sphere.hpp index b7a0b0acc39..5a6d8a9291c 100644 --- a/src/core/nonbonded_interactions/soft_sphere.hpp +++ b/src/core/nonbonded_interactions/soft_sphere.hpp @@ -27,7 +27,7 @@ * Implementation in \ref soft_sphere.cpp */ -#include "config.hpp" +#include "config/config.hpp" #ifdef SOFT_SPHERE diff --git a/src/core/nonbonded_interactions/thole.hpp b/src/core/nonbonded_interactions/thole.hpp index 5c0eb75732b..4865850aeb4 100644 --- a/src/core/nonbonded_interactions/thole.hpp +++ b/src/core/nonbonded_interactions/thole.hpp @@ -27,7 +27,7 @@ * Implementation in \ref thole.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef THOLE #include "Particle.hpp" diff --git a/src/core/nonbonded_interactions/wca.hpp b/src/core/nonbonded_interactions/wca.hpp index 6c91b291afb..55ff743e0bd 100644 --- a/src/core/nonbonded_interactions/wca.hpp +++ b/src/core/nonbonded_interactions/wca.hpp @@ -25,7 +25,7 @@ * Implementation in \ref wca.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef WCA diff --git a/src/core/npt.cpp b/src/core/npt.cpp index 85c85f7cded..6b40edc3fc7 100644 --- a/src/core/npt.cpp +++ b/src/core/npt.cpp @@ -21,7 +21,7 @@ #ifdef NPT #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "electrostatics/coulomb.hpp" #include "errorhandling.hpp" #include "event.hpp" diff --git a/src/core/npt.hpp b/src/core/npt.hpp index 3c99c8119a4..658526c033a 100644 --- a/src/core/npt.hpp +++ b/src/core/npt.hpp @@ -25,7 +25,7 @@ #ifndef NPT_H #define NPT_H -#include "config.hpp" +#include "config/config.hpp" #ifdef NPT #include "BoxGeometry.hpp" diff --git a/src/core/object-in-fluid/oif_local_forces.hpp b/src/core/object-in-fluid/oif_local_forces.hpp index 11f9cb1d9c1..18653cf9477 100644 --- a/src/core/object-in-fluid/oif_local_forces.hpp +++ b/src/core/object-in-fluid/oif_local_forces.hpp @@ -25,7 +25,7 @@ * See @cite dupin07a. */ -#include "config.hpp" +#include "config/config.hpp" #include "BoxGeometry.hpp" #include "Particle.hpp" diff --git a/src/core/observables/ParticleTraits.hpp b/src/core/observables/ParticleTraits.hpp index 604d766125b..bff9d86a1b0 100644 --- a/src/core/observables/ParticleTraits.hpp +++ b/src/core/observables/ParticleTraits.hpp @@ -20,7 +20,7 @@ #define OBSERVABLES_PARTICLE_TRAITS #include "Particle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "rotation.hpp" namespace ParticleObservables { diff --git a/src/core/p3m/TuningAlgorithm.cpp b/src/core/p3m/TuningAlgorithm.cpp index 80845109b4f..9fa852e36ed 100644 --- a/src/core/p3m/TuningAlgorithm.cpp +++ b/src/core/p3m/TuningAlgorithm.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/TuningAlgorithm.hpp b/src/core/p3m/TuningAlgorithm.hpp index dae20fc22a4..5ea7bae5034 100644 --- a/src/core/p3m/TuningAlgorithm.hpp +++ b/src/core/p3m/TuningAlgorithm.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_P3M_TUNING_ALGORITHM_HPP #define ESPRESSO_SRC_CORE_P3M_TUNING_ALGORITHM_HPP -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/TuningLogger.hpp b/src/core/p3m/TuningLogger.hpp index b2b91da1d0b..dabd053a500 100644 --- a/src/core/p3m/TuningLogger.hpp +++ b/src/core/p3m/TuningLogger.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_CORE_P3M_TUNING_LOGGER_HPP #define ESPRESSO_SRC_CORE_P3M_TUNING_LOGGER_HPP -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/common.cpp b/src/core/p3m/common.cpp index 406ddad5d43..b68a8972599 100644 --- a/src/core/p3m/common.cpp +++ b/src/core/p3m/common.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/common.hpp b/src/core/p3m/common.hpp index b21f0ee8aeb..bea6f359fa8 100644 --- a/src/core/p3m/common.hpp +++ b/src/core/p3m/common.hpp @@ -35,7 +35,7 @@ #ifndef ESPRESSO_SRC_CORE_P3M_COMMON_HPP #define ESPRESSO_SRC_CORE_P3M_COMMON_HPP -#include "config.hpp" +#include "config/config.hpp" #include diff --git a/src/core/p3m/data_struct.hpp b/src/core/p3m/data_struct.hpp index cc10d9157bb..66657774c25 100644 --- a/src/core/p3m/data_struct.hpp +++ b/src/core/p3m/data_struct.hpp @@ -21,7 +21,7 @@ #ifndef CORE_P3M_DATA_STRUCT_HPP #define CORE_P3M_DATA_STRUCT_HPP -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/fft.cpp b/src/core/p3m/fft.cpp index b2aa88fc8b3..55ff03c66d3 100644 --- a/src/core/p3m/fft.cpp +++ b/src/core/p3m/fft.cpp @@ -25,7 +25,7 @@ * */ -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/fft.hpp b/src/core/p3m/fft.hpp index 18f57a0cc86..0744be24e6d 100644 --- a/src/core/p3m/fft.hpp +++ b/src/core/p3m/fft.hpp @@ -42,7 +42,7 @@ * For more information about FFT usage, see \ref fft.cpp "fft.cpp". */ -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/influence_function_dipolar.hpp b/src/core/p3m/influence_function_dipolar.hpp index cb4fa9ba602..0bd8f8ef149 100644 --- a/src/core/p3m/influence_function_dipolar.hpp +++ b/src/core/p3m/influence_function_dipolar.hpp @@ -21,7 +21,7 @@ #ifndef ESPRESSO_CORE_P3M_INFLUENCE_FUNCTION_DIPOLAR_HPP #define ESPRESSO_CORE_P3M_INFLUENCE_FUNCTION_DIPOLAR_HPP -#include "config.hpp" +#include "config/config.hpp" #if defined(DP3M) diff --git a/src/core/p3m/send_mesh.cpp b/src/core/p3m/send_mesh.cpp index 51b08a8c33c..f08262317d4 100644 --- a/src/core/p3m/send_mesh.cpp +++ b/src/core/p3m/send_mesh.cpp @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/p3m/send_mesh.hpp b/src/core/p3m/send_mesh.hpp index 8c6b5956c70..bcee38e72e5 100644 --- a/src/core/p3m/send_mesh.hpp +++ b/src/core/p3m/send_mesh.hpp @@ -21,7 +21,7 @@ #ifndef ESPRESSO_CORE_P3M_SEND_MESH_HPP #define ESPRESSO_CORE_P3M_SEND_MESH_HPP -#include "config.hpp" +#include "config/config.hpp" #if defined(P3M) || defined(DP3M) diff --git a/src/core/particle_data.cpp b/src/core/particle_data.cpp index 064980062d1..f2dcfbabf87 100644 --- a/src/core/particle_data.cpp +++ b/src/core/particle_data.cpp @@ -24,7 +24,7 @@ #include "Particle.hpp" #include "cells.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "event.hpp" #include "exclusions.hpp" #include "nonbonded_interactions/nonbonded_interaction_data.hpp" diff --git a/src/core/particle_data.hpp b/src/core/particle_data.hpp index 82c7f39268a..0418ce63340 100644 --- a/src/core/particle_data.hpp +++ b/src/core/particle_data.hpp @@ -26,7 +26,7 @@ * This file contains everything related to updating particle properties. */ -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" diff --git a/src/core/pressure.cpp b/src/core/pressure.cpp index f67defc2965..aa156f78858 100644 --- a/src/core/pressure.cpp +++ b/src/core/pressure.cpp @@ -29,7 +29,7 @@ #include "bonded_interactions/bonded_interaction_data.hpp" #include "cells.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "event.hpp" #include "grid.hpp" #include "interactions.hpp" diff --git a/src/core/pressure_inline.hpp b/src/core/pressure_inline.hpp index 66fa782621a..7e42ff2b455 100644 --- a/src/core/pressure_inline.hpp +++ b/src/core/pressure_inline.hpp @@ -21,7 +21,7 @@ #ifndef CORE_PRESSURE_INLINE_HPP #define CORE_PRESSURE_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "pressure.hpp" diff --git a/src/core/rattle.hpp b/src/core/rattle.hpp index 8253575ef74..41ceb8cb037 100644 --- a/src/core/rattle.hpp +++ b/src/core/rattle.hpp @@ -27,7 +27,7 @@ * For more information see \ref rattle.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef BOND_CONSTRAINT diff --git a/src/core/reaction_methods/ReactionAlgorithm.cpp b/src/core/reaction_methods/ReactionAlgorithm.cpp index 90eaa102778..f5feb49a82c 100644 --- a/src/core/reaction_methods/ReactionAlgorithm.cpp +++ b/src/core/reaction_methods/ReactionAlgorithm.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "reaction_methods/ReactionAlgorithm.hpp" diff --git a/src/core/reaction_methods/ReactionAlgorithm.hpp b/src/core/reaction_methods/ReactionAlgorithm.hpp index 18202713b2c..8b559b6d3d4 100644 --- a/src/core/reaction_methods/ReactionAlgorithm.hpp +++ b/src/core/reaction_methods/ReactionAlgorithm.hpp @@ -19,7 +19,7 @@ #ifndef REACTION_METHODS_REACTION_ALGORITHM_HPP #define REACTION_METHODS_REACTION_ALGORITHM_HPP -#include "config.hpp" +#include "config/config.hpp" #include "SingleReaction.hpp" diff --git a/src/core/rotate_system.cpp b/src/core/rotate_system.cpp index 67e5d1a017e..aa57cc579f6 100644 --- a/src/core/rotate_system.cpp +++ b/src/core/rotate_system.cpp @@ -23,7 +23,7 @@ #include "ParticleRange.hpp" #include "cells.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "event.hpp" #include "rotation.hpp" diff --git a/src/core/rotation.hpp b/src/core/rotation.hpp index a12efa40e23..84d984be355 100644 --- a/src/core/rotation.hpp +++ b/src/core/rotation.hpp @@ -24,7 +24,7 @@ * This file contains all subroutines required to process rotational motion. */ -#include "config.hpp" +#include "config/config.hpp" #ifdef ROTATION diff --git a/src/core/scafacos/ScafacosContext.cpp b/src/core/scafacos/ScafacosContext.cpp index c870c593df3..eb9d1ae9f9d 100644 --- a/src/core/scafacos/ScafacosContext.cpp +++ b/src/core/scafacos/ScafacosContext.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #if defined(SCAFACOS) or defined(SCAFACOS_DIPOLES) diff --git a/src/core/scafacos/ScafacosContext.hpp b/src/core/scafacos/ScafacosContext.hpp index fc612b14488..1adc2b44d90 100644 --- a/src/core/scafacos/ScafacosContext.hpp +++ b/src/core/scafacos/ScafacosContext.hpp @@ -28,7 +28,7 @@ * It is further derived for the coulombic and dipolar versions of ScaFaCoS. */ -#include "config.hpp" +#include "config/config.hpp" #if defined(SCAFACOS) or defined(SCAFACOS_DIPOLES) diff --git a/src/core/scafacos/ScafacosContextBase.cpp b/src/core/scafacos/ScafacosContextBase.cpp index 991adedf4e0..c0cbbdb74c6 100644 --- a/src/core/scafacos/ScafacosContextBase.cpp +++ b/src/core/scafacos/ScafacosContextBase.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #if defined(SCAFACOS) or defined(SCAFACOS_DIPOLAR) diff --git a/src/core/scafacos/ScafacosContextBase.hpp b/src/core/scafacos/ScafacosContextBase.hpp index e153a930b70..3f754ea6403 100644 --- a/src/core/scafacos/ScafacosContextBase.hpp +++ b/src/core/scafacos/ScafacosContextBase.hpp @@ -30,7 +30,7 @@ #ifndef ESPRESSO_SRC_CORE_SCAFACOS_SCAFACOS_CONTEXT_BASE_HPP #define ESPRESSO_SRC_CORE_SCAFACOS_SCAFACOS_CONTEXT_BASE_HPP -#include "config.hpp" +#include "config/config.hpp" #if defined(SCAFACOS) or defined(SCAFACOS_DIPOLAR) diff --git a/src/core/stokesian_dynamics/sd_interface.cpp b/src/core/stokesian_dynamics/sd_interface.cpp index 1b3ad925ba9..b5ae2e98ec3 100644 --- a/src/core/stokesian_dynamics/sd_interface.cpp +++ b/src/core/stokesian_dynamics/sd_interface.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef STOKESIAN_DYNAMICS #include "sd_interface.hpp" diff --git a/src/core/stokesian_dynamics/sd_interface.hpp b/src/core/stokesian_dynamics/sd_interface.hpp index 73df6f2d8a3..bdc95116e0a 100644 --- a/src/core/stokesian_dynamics/sd_interface.hpp +++ b/src/core/stokesian_dynamics/sd_interface.hpp @@ -25,7 +25,7 @@ #ifndef STOKESIAN_DYNAMICS_INTERFACE_H #define STOKESIAN_DYNAMICS_INTERFACE_H -#include "config.hpp" +#include "config/config.hpp" #ifdef STOKESIAN_DYNAMICS diff --git a/src/core/thermostat.cpp b/src/core/thermostat.cpp index 511302ba118..bc56e228838 100644 --- a/src/core/thermostat.cpp +++ b/src/core/thermostat.cpp @@ -22,7 +22,7 @@ * Implementation of \ref thermostat.hpp. */ -#include "config.hpp" +#include "config/config.hpp" #include "bonded_interactions/thermalized_bond.hpp" #include "bonded_interactions/thermalized_bond_utils.hpp" diff --git a/src/core/thermostat.hpp b/src/core/thermostat.hpp index f5552203a35..14e294146bc 100644 --- a/src/core/thermostat.hpp +++ b/src/core/thermostat.hpp @@ -24,7 +24,7 @@ * Implementation in \ref thermostat.cpp. */ -#include "config.hpp" +#include "config/config.hpp" #include #include diff --git a/src/core/thermostats/brownian_inline.hpp b/src/core/thermostats/brownian_inline.hpp index 70633dc2a5f..162f7c209b6 100644 --- a/src/core/thermostats/brownian_inline.hpp +++ b/src/core/thermostats/brownian_inline.hpp @@ -22,7 +22,7 @@ #ifndef THERMOSTATS_BROWNIAN_INLINE_HPP #define THERMOSTATS_BROWNIAN_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" #include "random.hpp" diff --git a/src/core/thermostats/langevin_inline.hpp b/src/core/thermostats/langevin_inline.hpp index 12359eb1299..561fafe46af 100644 --- a/src/core/thermostats/langevin_inline.hpp +++ b/src/core/thermostats/langevin_inline.hpp @@ -22,7 +22,7 @@ #ifndef THERMOSTATS_LANGEVIN_INLINE_HPP #define THERMOSTATS_LANGEVIN_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "Particle.hpp" #include "random.hpp" diff --git a/src/core/thermostats/npt_inline.hpp b/src/core/thermostats/npt_inline.hpp index 9ce5615da92..e5969ddd8f3 100644 --- a/src/core/thermostats/npt_inline.hpp +++ b/src/core/thermostats/npt_inline.hpp @@ -22,7 +22,7 @@ #ifndef THERMOSTATS_NPT_INLINE_HPP #define THERMOSTATS_NPT_INLINE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef NPT diff --git a/src/core/unit_tests/EspressoSystemInterface_test.cpp b/src/core/unit_tests/EspressoSystemInterface_test.cpp index ade8c8df16e..52c34ff0eeb 100644 --- a/src/core/unit_tests/EspressoSystemInterface_test.cpp +++ b/src/core/unit_tests/EspressoSystemInterface_test.cpp @@ -25,7 +25,7 @@ #include "EspressoSystemInterface.hpp" #include "communication.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "particle_data.hpp" #include "particle_node.hpp" #include "virtual_sites.hpp" diff --git a/src/core/unit_tests/Particle_serialization_test.cpp b/src/core/unit_tests/Particle_serialization_test.cpp index ac86edcfa1d..409e07f7f6b 100644 --- a/src/core/unit_tests/Particle_serialization_test.cpp +++ b/src/core/unit_tests/Particle_serialization_test.cpp @@ -22,7 +22,7 @@ #include #include "Particle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include #include diff --git a/src/core/unit_tests/Particle_test.cpp b/src/core/unit_tests/Particle_test.cpp index b80af98c300..76214e2f7f1 100644 --- a/src/core/unit_tests/Particle_test.cpp +++ b/src/core/unit_tests/Particle_test.cpp @@ -24,7 +24,7 @@ #include #include "Particle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include #include diff --git a/src/core/unit_tests/VerletCriterion_test.cpp b/src/core/unit_tests/VerletCriterion_test.cpp index 69fb4d193b0..e84e9b595a3 100644 --- a/src/core/unit_tests/VerletCriterion_test.cpp +++ b/src/core/unit_tests/VerletCriterion_test.cpp @@ -23,7 +23,7 @@ #include "Particle.hpp" #include "cell_system/CellStructure.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "nonbonded_interactions/VerletCriterion.hpp" #include "particle_data.hpp" diff --git a/src/core/unit_tests/Verlet_list_test.cpp b/src/core/unit_tests/Verlet_list_test.cpp index ec9f840f13d..74d8bab9d31 100644 --- a/src/core/unit_tests/Verlet_list_test.cpp +++ b/src/core/unit_tests/Verlet_list_test.cpp @@ -19,7 +19,7 @@ #define BOOST_TEST_MODULE Verlet list update test -#include "config.hpp" +#include "config/config.hpp" #ifdef LENNARD_JONES diff --git a/src/core/unit_tests/rotation_test.cpp b/src/core/unit_tests/rotation_test.cpp index 336f16cd75f..e1f417a29ad 100644 --- a/src/core/unit_tests/rotation_test.cpp +++ b/src/core/unit_tests/rotation_test.cpp @@ -20,7 +20,7 @@ #define BOOST_TEST_MODULE rotation test #define BOOST_TEST_DYN_LINK -#include "config.hpp" +#include "config/config.hpp" #ifdef ROTATION diff --git a/src/core/unit_tests/thermostats_test.cpp b/src/core/unit_tests/thermostats_test.cpp index c0cca417065..0edd7f47a44 100644 --- a/src/core/unit_tests/thermostats_test.cpp +++ b/src/core/unit_tests/thermostats_test.cpp @@ -24,7 +24,7 @@ #include #include "Particle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "random.hpp" #include "random_test.hpp" #include "thermostat.hpp" diff --git a/src/core/virtual_sites.cpp b/src/core/virtual_sites.cpp index 31e7882080e..d32627b6bb9 100644 --- a/src/core/virtual_sites.cpp +++ b/src/core/virtual_sites.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES diff --git a/src/core/virtual_sites.hpp b/src/core/virtual_sites.hpp index 496d39824cb..18a282a1723 100644 --- a/src/core/virtual_sites.hpp +++ b/src/core/virtual_sites.hpp @@ -19,7 +19,7 @@ #ifndef VIRTUAL_SITES_HPP #define VIRTUAL_SITES_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES #include "Particle.hpp" diff --git a/src/core/virtual_sites/VirtualSites.hpp b/src/core/virtual_sites/VirtualSites.hpp index 17c8f478281..933fd149260 100644 --- a/src/core/virtual_sites/VirtualSites.hpp +++ b/src/core/virtual_sites/VirtualSites.hpp @@ -32,7 +32,7 @@ * - update virtual sites */ -#include +#include "config/config.hpp" #ifdef VIRTUAL_SITES #include diff --git a/src/core/virtual_sites/VirtualSitesInertialessTracers.cpp b/src/core/virtual_sites/VirtualSitesInertialessTracers.cpp index c9f8f3c137c..5c6a6e1f56d 100644 --- a/src/core/virtual_sites/VirtualSitesInertialessTracers.cpp +++ b/src/core/virtual_sites/VirtualSitesInertialessTracers.cpp @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_INERTIALESS_TRACERS diff --git a/src/core/virtual_sites/VirtualSitesInertialessTracers.hpp b/src/core/virtual_sites/VirtualSitesInertialessTracers.hpp index c70b207430c..6011f536666 100644 --- a/src/core/virtual_sites/VirtualSitesInertialessTracers.hpp +++ b/src/core/virtual_sites/VirtualSitesInertialessTracers.hpp @@ -19,7 +19,7 @@ #ifndef VIRTUAL_SITES_VIRTUAL_SITES_INERTIALESS_TRACERS_HPP #define VIRTUAL_SITES_VIRTUAL_SITES_INERTIALESS_TRACERS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES #include "VirtualSites.hpp" diff --git a/src/core/virtual_sites/VirtualSitesOff.hpp b/src/core/virtual_sites/VirtualSitesOff.hpp index c90efabb22f..71bd1e9f71e 100644 --- a/src/core/virtual_sites/VirtualSitesOff.hpp +++ b/src/core/virtual_sites/VirtualSitesOff.hpp @@ -19,7 +19,7 @@ #ifndef VIRTUAL_SITES_VIRTUAL_SITES_OFF_HPP #define VIRTUAL_SITES_VIRTUAL_SITES_OFF_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES #include "VirtualSites.hpp" diff --git a/src/core/virtual_sites/VirtualSitesRelative.hpp b/src/core/virtual_sites/VirtualSitesRelative.hpp index 144a914de22..e7050f9c348 100644 --- a/src/core/virtual_sites/VirtualSitesRelative.hpp +++ b/src/core/virtual_sites/VirtualSitesRelative.hpp @@ -20,7 +20,7 @@ #ifndef VIRTUAL_SITES_VIRTUAL_SITES_RELATIVE_HPP #define VIRTUAL_SITES_VIRTUAL_SITES_RELATIVE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_RELATIVE #include "VirtualSites.hpp" diff --git a/src/core/virtual_sites/lb_inertialess_tracers.cpp b/src/core/virtual_sites/lb_inertialess_tracers.cpp index 113c21ca291..96b60daba01 100644 --- a/src/core/virtual_sites/lb_inertialess_tracers.cpp +++ b/src/core/virtual_sites/lb_inertialess_tracers.cpp @@ -19,7 +19,7 @@ /// \file /// \brief Main of the Bayreuth Immersed-Boundary implementation -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_INERTIALESS_TRACERS diff --git a/src/core/virtual_sites/lb_inertialess_tracers.hpp b/src/core/virtual_sites/lb_inertialess_tracers.hpp index de568c585b6..666cafa0432 100644 --- a/src/core/virtual_sites/lb_inertialess_tracers.hpp +++ b/src/core/virtual_sites/lb_inertialess_tracers.hpp @@ -22,7 +22,7 @@ #ifndef VIRTUAL_SITES_LB_INERTIALESS_TRACERS_HPP #define VIRTUAL_SITES_LB_INERTIALESS_TRACERS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_INERTIALESS_TRACERS diff --git a/src/core/virtual_sites/lb_inertialess_tracers_cuda.cu b/src/core/virtual_sites/lb_inertialess_tracers_cuda.cu index c547b6044f9..a1385036be2 100644 --- a/src/core/virtual_sites/lb_inertialess_tracers_cuda.cu +++ b/src/core/virtual_sites/lb_inertialess_tracers_cuda.cu @@ -21,7 +21,7 @@ // It should not be included by any main ESPResSo routines // Functions to be exported for ESPResSo are in ibm_main.hpp -#include "config.hpp" +#include "config/config.hpp" #if defined(VIRTUAL_SITES_INERTIALESS_TRACERS) && defined(CUDA) diff --git a/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.cpp b/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.cpp index c14c1a2fc7c..53ab47eb9eb 100644 --- a/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.cpp +++ b/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.cpp @@ -21,7 +21,7 @@ // It should not be included by any main ESPResSo routines // Functions to be exported for ESPResSo are in ibm_main.hpp -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_INERTIALESS_TRACERS diff --git a/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.hpp b/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.hpp index 01fc0eed50f..ddac4997d20 100644 --- a/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.hpp +++ b/src/core/virtual_sites/lb_inertialess_tracers_cuda_interface.hpp @@ -25,7 +25,7 @@ #ifndef IBM_CUDA_INTERFACE_HPP #define IBM_CUDA_INTERFACE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_INERTIALESS_TRACERS diff --git a/src/python/espressomd/gen_pxiconfig.py b/src/python/espressomd/gen_pxiconfig.py index 670b146acf0..ff2ee131a10 100644 --- a/src/python/espressomd/gen_pxiconfig.py +++ b/src/python/espressomd/gen_pxiconfig.py @@ -41,7 +41,7 @@ cfile = open(cfilename, 'w') cfile.write(""" -#include "config.hpp" +#include "config/config.hpp" #include using namespace std; int main() { diff --git a/src/python/espressomd/interactions.pxd b/src/python/espressomd/interactions.pxd index 88b3a4b5b07..009dc267158 100644 --- a/src/python/espressomd/interactions.pxd +++ b/src/python/espressomd/interactions.pxd @@ -28,7 +28,7 @@ from .thermostat cimport thermalized_bond include "myconfig.pxi" # force include of config.hpp -cdef extern from "config.hpp": +cdef extern from "config/config.hpp": pass cdef extern from "TabulatedPotential.hpp": diff --git a/src/script_interface/analysis/ObservableStat.cpp b/src/script_interface/analysis/ObservableStat.cpp index 1d0c59036a8..c5a0d61ae64 100644 --- a/src/script_interface/analysis/ObservableStat.cpp +++ b/src/script_interface/analysis/ObservableStat.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "ObservableStat.hpp" diff --git a/src/script_interface/code_info/CodeInfo.cpp b/src/script_interface/code_info/CodeInfo.cpp index 5b3796214a6..8cb57175d4b 100644 --- a/src/script_interface/code_info/CodeInfo.cpp +++ b/src/script_interface/code_info/CodeInfo.cpp @@ -19,9 +19,9 @@ #include "CodeInfo.hpp" -#include "config-features.hpp" +#include "config/config-features.hpp" +#include "config/version.hpp" #include "script_interface/scafacos/scafacos.hpp" -#include "version.hpp" #include #include diff --git a/src/script_interface/code_info/CodeVersion.cpp b/src/script_interface/code_info/CodeVersion.cpp index 1c6958339a7..a2641e3548b 100644 --- a/src/script_interface/code_info/CodeVersion.cpp +++ b/src/script_interface/code_info/CodeVersion.cpp @@ -19,7 +19,7 @@ #include "CodeVersion.hpp" -#include "version.hpp" +#include "config/version.hpp" #include diff --git a/src/script_interface/collision_detection/CollisionDetection.hpp b/src/script_interface/collision_detection/CollisionDetection.hpp index 0c31431025b..b320cd4a398 100644 --- a/src/script_interface/collision_detection/CollisionDetection.hpp +++ b/src/script_interface/collision_detection/CollisionDetection.hpp @@ -22,7 +22,7 @@ #ifndef SCRIPT_INTERFACE_COLLISION_DETECTION_COLLISION_DETECTION_HPP #define SCRIPT_INTERFACE_COLLISION_DETECTION_COLLISION_DETECTION_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef COLLISION_DETECTION diff --git a/src/script_interface/collision_detection/initialize.cpp b/src/script_interface/collision_detection/initialize.cpp index 45a23fee70b..daa06ed44a2 100644 --- a/src/script_interface/collision_detection/initialize.cpp +++ b/src/script_interface/collision_detection/initialize.cpp @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "initialize.hpp" diff --git a/src/script_interface/electrostatics/Actor.hpp b/src/script_interface/electrostatics/Actor.hpp index 090b6529794..4d9923249a6 100644 --- a/src/script_interface/electrostatics/Actor.hpp +++ b/src/script_interface/electrostatics/Actor.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_ACTOR_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_ACTOR_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/script_interface/electrostatics/Actor_impl.hpp b/src/script_interface/electrostatics/Actor_impl.hpp index b16c426afda..3310f633677 100644 --- a/src/script_interface/electrostatics/Actor_impl.hpp +++ b/src/script_interface/electrostatics/Actor_impl.hpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/script_interface/electrostatics/CoulombMMM1D.hpp b/src/script_interface/electrostatics/CoulombMMM1D.hpp index a872c33d42e..57f1aac6f37 100644 --- a/src/script_interface/electrostatics/CoulombMMM1D.hpp +++ b/src/script_interface/electrostatics/CoulombMMM1D.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_MMM1D_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_MMM1D_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/script_interface/electrostatics/CoulombMMM1DGpu.hpp b/src/script_interface/electrostatics/CoulombMMM1DGpu.hpp index ebd356fc974..f740121c327 100644 --- a/src/script_interface/electrostatics/CoulombMMM1DGpu.hpp +++ b/src/script_interface/electrostatics/CoulombMMM1DGpu.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_MMM1D_GPU_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_MMM1D_GPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef MMM1D_GPU diff --git a/src/script_interface/electrostatics/CoulombP3M.hpp b/src/script_interface/electrostatics/CoulombP3M.hpp index 14e0b3e7643..147ee7d0af7 100644 --- a/src/script_interface/electrostatics/CoulombP3M.hpp +++ b/src/script_interface/electrostatics/CoulombP3M.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_COULOMB_P3M_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_COULOMB_P3M_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M diff --git a/src/script_interface/electrostatics/CoulombP3MGPU.hpp b/src/script_interface/electrostatics/CoulombP3MGPU.hpp index fec2219523c..d212a5e671f 100644 --- a/src/script_interface/electrostatics/CoulombP3MGPU.hpp +++ b/src/script_interface/electrostatics/CoulombP3MGPU.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_COULOMB_P3M_GPU_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_COULOMB_P3M_GPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M #ifdef CUDA diff --git a/src/script_interface/electrostatics/CoulombScafacos.hpp b/src/script_interface/electrostatics/CoulombScafacos.hpp index 57c7ed059f3..e5f8ba05dc2 100644 --- a/src/script_interface/electrostatics/CoulombScafacos.hpp +++ b/src/script_interface/electrostatics/CoulombScafacos.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_COULOMB_SCAFACOS_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_COULOMB_SCAFACOS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS diff --git a/src/script_interface/electrostatics/DebyeHueckel.hpp b/src/script_interface/electrostatics/DebyeHueckel.hpp index f60b427f54f..89612b3691d 100644 --- a/src/script_interface/electrostatics/DebyeHueckel.hpp +++ b/src/script_interface/electrostatics/DebyeHueckel.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_DH_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_DH_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/script_interface/electrostatics/ElectrostaticLayerCorrection.hpp b/src/script_interface/electrostatics/ElectrostaticLayerCorrection.hpp index 44c4ef8f8ab..c867a61f926 100644 --- a/src/script_interface/electrostatics/ElectrostaticLayerCorrection.hpp +++ b/src/script_interface/electrostatics/ElectrostaticLayerCorrection.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_ELC_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_ELC_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef P3M diff --git a/src/script_interface/electrostatics/ICCStar.hpp b/src/script_interface/electrostatics/ICCStar.hpp index bf1734a1c16..0ddbbe85c88 100644 --- a/src/script_interface/electrostatics/ICCStar.hpp +++ b/src/script_interface/electrostatics/ICCStar.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_ICC_STAR_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_ICC_STAR_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/script_interface/electrostatics/ReactionField.hpp b/src/script_interface/electrostatics/ReactionField.hpp index f07dde735cd..9a1dd322777 100644 --- a/src/script_interface/electrostatics/ReactionField.hpp +++ b/src/script_interface/electrostatics/ReactionField.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_RF_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_ELECTROSTATICS_RF_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/script_interface/electrostatics/initialize.cpp b/src/script_interface/electrostatics/initialize.cpp index 743323670e5..be164f64034 100644 --- a/src/script_interface/electrostatics/initialize.cpp +++ b/src/script_interface/electrostatics/initialize.cpp @@ -19,7 +19,7 @@ #include "initialize.hpp" -#include "config.hpp" +#include "config/config.hpp" #ifdef ELECTROSTATICS diff --git a/src/script_interface/h5md/h5md.cpp b/src/script_interface/h5md/h5md.cpp index ca8399c8492..5efadfc7ae1 100644 --- a/src/script_interface/h5md/h5md.cpp +++ b/src/script_interface/h5md/h5md.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef H5MD diff --git a/src/script_interface/h5md/h5md.hpp b/src/script_interface/h5md/h5md.hpp index 7609d6b9361..8316bb8be7c 100644 --- a/src/script_interface/h5md/h5md.hpp +++ b/src/script_interface/h5md/h5md.hpp @@ -22,7 +22,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_H5MD_H5MD_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_H5MD_H5MD_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef H5MD diff --git a/src/script_interface/h5md/initialize.cpp b/src/script_interface/h5md/initialize.cpp index 059a9bb5212..df03041ded8 100644 --- a/src/script_interface/h5md/initialize.cpp +++ b/src/script_interface/h5md/initialize.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef H5MD #include "h5md.hpp" #include "initialize.hpp" diff --git a/src/script_interface/h5md/initialize.hpp b/src/script_interface/h5md/initialize.hpp index 644e411f9f0..7fcf05b3569 100644 --- a/src/script_interface/h5md/initialize.hpp +++ b/src/script_interface/h5md/initialize.hpp @@ -20,7 +20,7 @@ #ifndef SCRIPT_INTERFACE_H5MD_INITIALIZE_HPP #define SCRIPT_INTERFACE_H5MD_INITIALIZE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef H5MD #include diff --git a/src/script_interface/initialize.cpp b/src/script_interface/initialize.cpp index 4d3e70fbf9d..b9625598722 100644 --- a/src/script_interface/initialize.cpp +++ b/src/script_interface/initialize.cpp @@ -19,7 +19,7 @@ #include "initialize.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "accumulators/initialize.hpp" #include "analysis/initialize.hpp" diff --git a/src/script_interface/integrators/StokesianDynamics.cpp b/src/script_interface/integrators/StokesianDynamics.cpp index bbddbd6187b..27bd7962b6e 100644 --- a/src/script_interface/integrators/StokesianDynamics.cpp +++ b/src/script_interface/integrators/StokesianDynamics.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef STOKESIAN_DYNAMICS diff --git a/src/script_interface/integrators/StokesianDynamics.hpp b/src/script_interface/integrators/StokesianDynamics.hpp index 804040d6b10..27f20281ee1 100644 --- a/src/script_interface/integrators/StokesianDynamics.hpp +++ b/src/script_interface/integrators/StokesianDynamics.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_INTEGRATORS_STOKESIAN_DYNAMICS_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_INTEGRATORS_STOKESIAN_DYNAMICS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef STOKESIAN_DYNAMICS diff --git a/src/script_interface/integrators/VelocityVerletIsoNPT.cpp b/src/script_interface/integrators/VelocityVerletIsoNPT.cpp index 28ad7850b2b..dfa3cbee7dc 100644 --- a/src/script_interface/integrators/VelocityVerletIsoNPT.cpp +++ b/src/script_interface/integrators/VelocityVerletIsoNPT.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef NPT diff --git a/src/script_interface/integrators/VelocityVerletIsoNPT.hpp b/src/script_interface/integrators/VelocityVerletIsoNPT.hpp index a858113a8ca..414b16ddb9f 100644 --- a/src/script_interface/integrators/VelocityVerletIsoNPT.hpp +++ b/src/script_interface/integrators/VelocityVerletIsoNPT.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_INTEGRATORS_NPT_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_INTEGRATORS_NPT_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef NPT diff --git a/src/script_interface/integrators/initialize.cpp b/src/script_interface/integrators/initialize.cpp index bdeeb5e63d6..bf69ce65c58 100644 --- a/src/script_interface/integrators/initialize.cpp +++ b/src/script_interface/integrators/initialize.cpp @@ -25,7 +25,7 @@ #include "StokesianDynamics.hpp" #include "VelocityVerlet.hpp" #include "VelocityVerletIsoNPT.hpp" -#include "config.hpp" +#include "config/config.hpp" namespace ScriptInterface { namespace Integrators { diff --git a/src/script_interface/lbboundaries/LBBoundaries.hpp b/src/script_interface/lbboundaries/LBBoundaries.hpp index d151ce1636e..c08d4df304c 100644 --- a/src/script_interface/lbboundaries/LBBoundaries.hpp +++ b/src/script_interface/lbboundaries/LBBoundaries.hpp @@ -19,7 +19,7 @@ #ifndef SCRIPT_INTERFACE_LBBOUNDARIES_LBBOUNDARIES_HPP #define SCRIPT_INTERFACE_LBBOUNDARIES_LBBOUNDARIES_HPP -#include "config.hpp" +#include "config/config.hpp" #include "LBBoundary.hpp" diff --git a/src/script_interface/lbboundaries/LBBoundary.hpp b/src/script_interface/lbboundaries/LBBoundary.hpp index f64df36c156..7dd3e090df8 100644 --- a/src/script_interface/lbboundaries/LBBoundary.hpp +++ b/src/script_interface/lbboundaries/LBBoundary.hpp @@ -19,7 +19,7 @@ #ifndef SCRIPT_INTERFACE_LBBOUNDARIES_LBBOUNDARY_HPP #define SCRIPT_INTERFACE_LBBOUNDARIES_LBBOUNDARY_HPP -#include "config.hpp" +#include "config/config.hpp" #include "script_interface/ScriptInterface.hpp" #include "script_interface/auto_parameters/AutoParameters.hpp" diff --git a/src/script_interface/magnetostatics/Actor.hpp b/src/script_interface/magnetostatics/Actor.hpp index f307293ae15..c6c7c124ec0 100644 --- a/src/script_interface/magnetostatics/Actor.hpp +++ b/src/script_interface/magnetostatics/Actor.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_ACTOR_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_ACTOR_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/script_interface/magnetostatics/Actor_impl.hpp b/src/script_interface/magnetostatics/Actor_impl.hpp index 486cf4e78cd..61028a517ab 100644 --- a/src/script_interface/magnetostatics/Actor_impl.hpp +++ b/src/script_interface/magnetostatics/Actor_impl.hpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/script_interface/magnetostatics/DipolarBarnesHutGpu.hpp b/src/script_interface/magnetostatics/DipolarBarnesHutGpu.hpp index 18bbf46f614..222f097c434 100644 --- a/src/script_interface/magnetostatics/DipolarBarnesHutGpu.hpp +++ b/src/script_interface/magnetostatics/DipolarBarnesHutGpu.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_BH_GPU_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_BH_GPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_BARNES_HUT diff --git a/src/script_interface/magnetostatics/DipolarDirectSum.hpp b/src/script_interface/magnetostatics/DipolarDirectSum.hpp index ac69ba75f92..c3fdcff9e1d 100644 --- a/src/script_interface/magnetostatics/DipolarDirectSum.hpp +++ b/src/script_interface/magnetostatics/DipolarDirectSum.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/script_interface/magnetostatics/DipolarDirectSumGpu.hpp b/src/script_interface/magnetostatics/DipolarDirectSumGpu.hpp index 226711e7445..814ebc6e256 100644 --- a/src/script_interface/magnetostatics/DipolarDirectSumGpu.hpp +++ b/src/script_interface/magnetostatics/DipolarDirectSumGpu.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_GPU_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_DIRECT_SUM_GPU_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLAR_DIRECT_SUM diff --git a/src/script_interface/magnetostatics/DipolarDirectSumWithReplica.hpp b/src/script_interface/magnetostatics/DipolarDirectSumWithReplica.hpp index d7965def6e9..d0789491432 100644 --- a/src/script_interface/magnetostatics/DipolarDirectSumWithReplica.hpp +++ b/src/script_interface/magnetostatics/DipolarDirectSumWithReplica.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DDS_REPLICA_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DDS_REPLICA_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/script_interface/magnetostatics/DipolarLayerCorrection.hpp b/src/script_interface/magnetostatics/DipolarLayerCorrection.hpp index abed1215cce..34d172d3a6c 100644 --- a/src/script_interface/magnetostatics/DipolarLayerCorrection.hpp +++ b/src/script_interface/magnetostatics/DipolarLayerCorrection.hpp @@ -19,7 +19,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_DIPOLAR_LAYER_CORRECTION_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_DIPOLAR_LAYER_CORRECTION_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/script_interface/magnetostatics/DipolarP3M.hpp b/src/script_interface/magnetostatics/DipolarP3M.hpp index 6923ded75b6..54ff728496a 100644 --- a/src/script_interface/magnetostatics/DipolarP3M.hpp +++ b/src/script_interface/magnetostatics/DipolarP3M.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_P3M_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_P3M_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef DP3M diff --git a/src/script_interface/magnetostatics/DipolarScafacos.hpp b/src/script_interface/magnetostatics/DipolarScafacos.hpp index ef53205ef87..796522095e5 100644 --- a/src/script_interface/magnetostatics/DipolarScafacos.hpp +++ b/src/script_interface/magnetostatics/DipolarScafacos.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_SCAFACOS_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_MAGNETOSTATICS_DIPOLAR_SCAFACOS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef SCAFACOS_DIPOLES diff --git a/src/script_interface/magnetostatics/initialize.cpp b/src/script_interface/magnetostatics/initialize.cpp index 7fd32e36886..1c253beb512 100644 --- a/src/script_interface/magnetostatics/initialize.cpp +++ b/src/script_interface/magnetostatics/initialize.cpp @@ -18,7 +18,7 @@ */ #include "initialize.hpp" -#include "config.hpp" +#include "config/config.hpp" #ifdef DIPOLES diff --git a/src/script_interface/observables/ParamlessObservable.hpp b/src/script_interface/observables/ParamlessObservable.hpp index 4a515230a16..ba398757811 100644 --- a/src/script_interface/observables/ParamlessObservable.hpp +++ b/src/script_interface/observables/ParamlessObservable.hpp @@ -22,7 +22,7 @@ #ifndef SCRIPT_INTERFACE_OBSERVABLES_PARAMLESSOBSERVABLE_HPP #define SCRIPT_INTERFACE_OBSERVABLES_PARAMLESSOBSERVABLE_HPP -#include "config.hpp" +#include "config/config.hpp" #include "script_interface/ScriptInterface.hpp" diff --git a/src/script_interface/observables/initialize.cpp b/src/script_interface/observables/initialize.cpp index 13fd0ba8e3a..2814eed150a 100644 --- a/src/script_interface/observables/initialize.cpp +++ b/src/script_interface/observables/initialize.cpp @@ -26,7 +26,7 @@ #include "PidProfileObservable.hpp" #include "ProfileObservable.hpp" #include "RDF.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "core/observables/BondAngles.hpp" #include "core/observables/BondDihedrals.hpp" diff --git a/src/script_interface/particle_data/ParticleHandle.cpp b/src/script_interface/particle_data/ParticleHandle.cpp index f327b52e63e..e08ca7b884d 100644 --- a/src/script_interface/particle_data/ParticleHandle.cpp +++ b/src/script_interface/particle_data/ParticleHandle.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "ParticleHandle.hpp" diff --git a/src/script_interface/scafacos/scafacos.cpp b/src/script_interface/scafacos/scafacos.cpp index 130dcd29f72..b849d4c4a97 100644 --- a/src/script_interface/scafacos/scafacos.cpp +++ b/src/script_interface/scafacos/scafacos.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #if defined(SCAFACOS) or defined(SCAFACOS_DIPOLES) diff --git a/src/script_interface/scafacos/scafacos.hpp b/src/script_interface/scafacos/scafacos.hpp index 6f8f2d69282..c6d086af434 100644 --- a/src/script_interface/scafacos/scafacos.hpp +++ b/src/script_interface/scafacos/scafacos.hpp @@ -20,7 +20,7 @@ #ifndef ESPRESSO_SRC_SCRIPT_INTERFACE_SCAFACOS_SCAFACOS_HPP #define ESPRESSO_SRC_SCRIPT_INTERFACE_SCAFACOS_SCAFACOS_HPP -#include "config.hpp" +#include "config/config.hpp" #if defined(SCAFACOS) or defined(SCAFACOS_DIPOLAR) diff --git a/src/script_interface/system/CudaInitHandle.cpp b/src/script_interface/system/CudaInitHandle.cpp index b231f8c056f..2762e62b70c 100644 --- a/src/script_interface/system/CudaInitHandle.cpp +++ b/src/script_interface/system/CudaInitHandle.cpp @@ -19,7 +19,7 @@ #include "CudaInitHandle.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "core/cuda_init.hpp" #include "core/cuda_utils.hpp" diff --git a/src/script_interface/system/System.cpp b/src/script_interface/system/System.cpp index 203ea1b3662..aaa3ca554d0 100644 --- a/src/script_interface/system/System.cpp +++ b/src/script_interface/system/System.cpp @@ -19,7 +19,7 @@ #include "System.hpp" -#include "config.hpp" +#include "config/config.hpp" #include "core/grid.hpp" #include "core/object-in-fluid/oif_global_forces.hpp" diff --git a/src/script_interface/tests/Actors_test.cpp b/src/script_interface/tests/Actors_test.cpp index 9a4bd19e1c3..e24a33566b0 100644 --- a/src/script_interface/tests/Actors_test.cpp +++ b/src/script_interface/tests/Actors_test.cpp @@ -20,7 +20,7 @@ #define BOOST_TEST_MODULE "Long-range actors test" #define BOOST_TEST_DYN_LINK -#include "config.hpp" +#include "config/config.hpp" #if defined(ELECTROSTATICS) or defined(DIPOLES) or defined(SCAFACOS) or \ defined(SCAFACOS_DIPOLES) diff --git a/src/script_interface/virtual_sites/ActiveVirtualSitesHandle.hpp b/src/script_interface/virtual_sites/ActiveVirtualSitesHandle.hpp index 682f9453cd0..ce35e026b3b 100644 --- a/src/script_interface/virtual_sites/ActiveVirtualSitesHandle.hpp +++ b/src/script_interface/virtual_sites/ActiveVirtualSitesHandle.hpp @@ -22,7 +22,7 @@ #ifndef SCRIPT_INTERFACE_VIRTUAL_SITES_ACTIVE_VIRTUAL_SITES_HANDLE_HPP #define SCRIPT_INTERFACE_VIRTUAL_SITES_ACTIVE_VIRTUAL_SITES_HANDLE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES diff --git a/src/script_interface/virtual_sites/VirtualSites.hpp b/src/script_interface/virtual_sites/VirtualSites.hpp index 4bfb1ebf416..75d02c42d8b 100644 --- a/src/script_interface/virtual_sites/VirtualSites.hpp +++ b/src/script_interface/virtual_sites/VirtualSites.hpp @@ -22,7 +22,7 @@ #ifndef SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_HPP #define SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES diff --git a/src/script_interface/virtual_sites/VirtualSitesInertialessTracers.hpp b/src/script_interface/virtual_sites/VirtualSitesInertialessTracers.hpp index 0ec880219fd..1fbe703c9e8 100644 --- a/src/script_interface/virtual_sites/VirtualSitesInertialessTracers.hpp +++ b/src/script_interface/virtual_sites/VirtualSitesInertialessTracers.hpp @@ -22,7 +22,7 @@ #ifndef SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_INERTIALESS_TRACERS_HPP #define SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_INERTIALESS_TRACERS_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_INERTIALESS_TRACERS diff --git a/src/script_interface/virtual_sites/VirtualSitesOff.hpp b/src/script_interface/virtual_sites/VirtualSitesOff.hpp index 32bcdc460f8..0987558aa55 100644 --- a/src/script_interface/virtual_sites/VirtualSitesOff.hpp +++ b/src/script_interface/virtual_sites/VirtualSitesOff.hpp @@ -22,7 +22,7 @@ #ifndef SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_OFF_HPP #define SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_OFF_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES diff --git a/src/script_interface/virtual_sites/VirtualSitesRelative.hpp b/src/script_interface/virtual_sites/VirtualSitesRelative.hpp index e448247766e..0b70e3869e5 100644 --- a/src/script_interface/virtual_sites/VirtualSitesRelative.hpp +++ b/src/script_interface/virtual_sites/VirtualSitesRelative.hpp @@ -22,7 +22,7 @@ #ifndef SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_RELATIVE_HPP #define SCRIPT_INTERFACE_VIRTUAL_SITES_VIRTUAL_SITES_RELATIVE_HPP -#include "config.hpp" +#include "config/config.hpp" #ifdef VIRTUAL_SITES_RELATIVE diff --git a/src/script_interface/virtual_sites/initialize.cpp b/src/script_interface/virtual_sites/initialize.cpp index 07792ae1a15..7d43ec56d2b 100644 --- a/src/script_interface/virtual_sites/initialize.cpp +++ b/src/script_interface/virtual_sites/initialize.cpp @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "config.hpp" +#include "config/config.hpp" #include "initialize.hpp"