diff --git a/CMakeLists.txt b/CMakeLists.txt index c3dafb8..480dc0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,26 +286,26 @@ if(PARAM_OVERWRITES) endif(PARAM_OVERWRITES) ################################################################################ -# XRT +# PARATAXIS ################################################################################ -set(XRT_VERBOSE "1" CACHE STRING "Set verbosity level for XRT") -add_definitions(-DXRT_VERBOSE_LVL=${XRT_VERBOSE}) -option(XRT_CHECK_PHOTON_CT "Checks if the number of photons generated can fit into the memory" ON) -option(XRT_FORCE_SINGLE_SCATTERING "Make particles scatter only once" OFF) -set(XRT_NVPROF_START_TS 200 CACHE STRING "Start profiling at this timestep") -set(XRT_NVPROF_NUM_TS 0 CACHE STRING "Number of timesteps to profile. 0 = Disabled") -if(XRT_CHECK_PHOTON_CT) - add_definitions(-DXRT_CHECK_PHOTON_CT=1) +set(PARATAXIS_VERBOSE "1" CACHE STRING "Set verbosity level for PARATAXIS") +add_definitions(-DPARATAXIS_VERBOSE_LVL=${PARATAXIS_VERBOSE}) +option(PARATAXIS_CHECK_PHOTON_CT "Checks if the number of photons generated can fit into the memory" ON) +option(PARATAXIS_FORCE_SINGLE_SCATTERING "Make particles scatter only once" OFF) +set(PARATAXIS_NVPROF_START_TS 200 CACHE STRING "Start profiling at this timestep") +set(PARATAXIS_NVPROF_NUM_TS 0 CACHE STRING "Number of timesteps to profile. 0 = Disabled") +if(PARATAXIS_CHECK_PHOTON_CT) + add_definitions(-DPARATAXIS_CHECK_PHOTON_CT=1) else() - add_definitions(-DXRT_CHECK_PHOTON_CT=0) + add_definitions(-DPARATAXIS_CHECK_PHOTON_CT=0) endif() -if(XRT_FORCE_SINGLE_SCATTERING) - add_definitions(-DXRT_FORCE_SINGLE_SCATTERING=1) +if(PARATAXIS_FORCE_SINGLE_SCATTERING) + add_definitions(-DPARATAXIS_FORCE_SINGLE_SCATTERING=1) else() - add_definitions(-DXRT_FORCE_SINGLE_SCATTERING=0) + add_definitions(-DPARATAXIS_FORCE_SINGLE_SCATTERING=0) endif() -add_definitions(-DXRT_NVPROF_START_TS=${XRT_NVPROF_START_TS} -DXRT_NVPROF_NUM_TS=${XRT_NVPROF_NUM_TS}) +add_definitions(-DPARATAXIS_NVPROF_START_TS=${PARATAXIS_NVPROF_START_TS} -DPARATAXIS_NVPROF_NUM_TS=${PARATAXIS_NVPROF_NUM_TS}) ################################################################################ # Warnings @@ -341,12 +341,12 @@ find_package(Splash 1.4.0 COMPONENTS PARALLEL) if(Splash_FOUND) include_directories(SYSTEM ${Splash_INCLUDE_DIRS}) - list(APPEND Splash_DEFINITIONS "-DXRT_ENABLE_HDF5=1") + list(APPEND Splash_DEFINITIONS "-DPARATAXIS_ENABLE_HDF5=1") add_definitions(${Splash_DEFINITIONS}) list(APPEND LIBS ${Splash_LIBRARIES}) message(STATUS "HDF5 support activated") else() - add_definitions("-DXRT_ENABLE_HDF5=0") + add_definitions("-DPARATAXIS_ENABLE_HDF5=0") endif(Splash_FOUND) @@ -359,12 +359,12 @@ find_package(PNGwriter 0.5.5) if(PNGwriter_FOUND) include_directories(SYSTEM ${PNGwriter_INCLUDE_DIRS}) - list(APPEND PNGwriter_DEFINITIONS "-DXRT_ENABLE_PNG=1") + list(APPEND PNGwriter_DEFINITIONS "-DPARATAXIS_ENABLE_PNG=1") add_definitions(${PNGwriter_DEFINITIONS}) list(APPEND LIBS ${PNGwriter_LIBRARIES}) message(STATUS "PNG output support activated") else() - add_definitions("-DXRT_ENABLE_PNG=0") + add_definitions("-DPARATAXIS_ENABLE_PNG=0") endif() ################################################################################ @@ -375,12 +375,12 @@ find_package(TiffWriter 0.2.0) if(TiffWriter_FOUND) include_directories(${TiffWriter_INCLUDE_DIRS}) - list(APPEND TiffWriter_DEFINITIONS "-DXRT_ENABLE_TIFF=1") + list(APPEND TiffWriter_DEFINITIONS "-DPARATAXIS_ENABLE_TIFF=1") add_definitions(${TiffWriter_DEFINITIONS}) list(APPEND LIBS ${TiffWriter_LIBRARIES}) message(STATUS "TIFF output support activated") else() - add_definitions("-DXRT_ENABLE_TIFF=0") + add_definitions("-DPARATAXIS_ENABLE_TIFF=0") endif() ################################################################################ @@ -393,10 +393,10 @@ set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -std=c++11") ################################################################################ -# Check for XRT_EXTENSION_PATH +# Check for PARATAXIS_EXTENSION_PATH ################################################################################ -find_path(XRT_EXTENSION_PATH +find_path(PARATAXIS_EXTENSION_PATH NAMES include/simulation_defines/param/precision.param include/simulation_defines/param/speciesDefinition.param PATHS "${CMAKE_CURRENT_SOURCE_DIR}" DOC "search PATH to extension folder" @@ -406,9 +406,9 @@ find_path(XRT_EXTENSION_PATH ) include_directories(include) -if(XRT_EXTENSION_PATH) - include_directories(BEFORE ${XRT_EXTENSION_PATH}/include) - message(STATUS "Using extension path: ${XRT_EXTENSION_PATH}") +if(PARATAXIS_EXTENSION_PATH) + include_directories(BEFORE ${PARATAXIS_EXTENSION_PATH}/include) + message(STATUS "Using extension path: ${PARATAXIS_EXTENSION_PATH}") endif() ################################################################################ @@ -452,21 +452,21 @@ endif(SCOREP_ENABLE) # Configure ################################################################################ -set(XRT_BASE_CFG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/submit") -file(GLOB CFG_Files RELATIVE "${XRT_BASE_CFG_PATH}" "${XRT_BASE_CFG_PATH}/*.cfg.in") -if(XRT_EXTENSION_PATH) - set(XRT_EXTENSION_CFG_PATH "${XRT_EXTENSION_PATH}/submit") - file(GLOB CFG_Files_Ext RELATIVE "${XRT_EXTENSION_CFG_PATH}" "${XRT_EXTENSION_CFG_PATH}/*.cfg.in") +set(PARATAXIS_BASE_CFG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/submit") +file(GLOB CFG_Files RELATIVE "${PARATAXIS_BASE_CFG_PATH}" "${PARATAXIS_BASE_CFG_PATH}/*.cfg.in") +if(PARATAXIS_EXTENSION_PATH) + set(PARATAXIS_EXTENSION_CFG_PATH "${PARATAXIS_EXTENSION_PATH}/submit") + file(GLOB CFG_Files_Ext RELATIVE "${PARATAXIS_EXTENSION_CFG_PATH}" "${PARATAXIS_EXTENSION_CFG_PATH}/*.cfg.in") list(APPEND CFG_Files ${CFG_Files_Ext}) list(REMOVE_DUPLICATES CFG_Files) endif() foreach(fileName ${CFG_Files}) get_filename_component(fileNoExt ${fileName} NAME_WE) - if(XRT_EXTENSION_PATH AND EXISTS "${XRT_EXTENSION_CFG_PATH}/${fileName}") - set(file "${XRT_EXTENSION_CFG_PATH}/${fileName}") + if(PARATAXIS_EXTENSION_PATH AND EXISTS "${PARATAXIS_EXTENSION_CFG_PATH}/${fileName}") + set(file "${PARATAXIS_EXTENSION_CFG_PATH}/${fileName}") else() - set(file "${XRT_BASE_CFG_PATH}/${fileName}") + set(file "${PARATAXIS_BASE_CFG_PATH}/${fileName}") endif() configure_file(${file} "submit/${fileNoExt}.cfg" @ONLY) endforeach() @@ -506,11 +506,11 @@ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/submit" install(DIRECTORY "include/simulation_defines" DESTINATION ${CMAKE_INSTALL_PREFIX}) # Extension simulation config (overwrite base) -if(XRT_EXTENSION_PATH) +if(PARATAXIS_EXTENSION_PATH) # Overwrite with extension files - ForceCopyOnInstall("${XRT_EXTENSION_PATH}/include" "simulation_defines") - if(EXISTS "${XRT_EXTENSION_PATH}/testData") - install(DIRECTORY "${XRT_EXTENSION_PATH}/testData" + ForceCopyOnInstall("${PARATAXIS_EXTENSION_PATH}/include" "simulation_defines") + if(EXISTS "${PARATAXIS_EXTENSION_PATH}/testData") + install(DIRECTORY "${PARATAXIS_EXTENSION_PATH}/testData" DESTINATION ${CMAKE_INSTALL_PREFIX}) endif() endif() diff --git a/buildSystem/Compilation.py b/buildSystem/Compilation.py index f2b1b31..f684c02 100644 --- a/buildSystem/Compilation.py +++ b/buildSystem/Compilation.py @@ -102,7 +102,7 @@ def configure(self, pathToCMakeLists, dryRun, verbose, silent): cmd = 'mkdir -p "' + buildPath + '" && cd "' + buildPath + '"\n' cmd += "cmake" cmd += " " + self.example.getCMakeFlags()[self.cmakePreset].replace(";", "\\;") - cmd += ' -DXRT_EXTENSION_PATH="' + self.example.getFolder() + '"' + cmd += ' -DPARATAXIS_EXTENSION_PATH="' + self.example.getFolder() + '"' cmd += ' -DCMAKE_INSTALL_PREFIX="' + self.getInstallPath() + '"' cmd += ' "' + pathToCMakeLists + '"' if dryRun or verbose: diff --git a/configureExample.sh b/configureExample.sh index 55d1db6..41f8eb2 100755 --- a/configureExample.sh +++ b/configureExample.sh @@ -116,7 +116,7 @@ fi cd $destinationDir -cmake_command="cmake $cmakeFlags -DXRT_EXTENSION_PATH=$exampleDir $this_dir" +cmake_command="cmake $cmakeFlags -DPARATAXIS_EXTENSION_PATH=$exampleDir $this_dir" echo -e "\033[32mcmake command:\033[0m $cmake_command" $cmake_command result=$? diff --git a/examples/Diplomarbeit/cmakeFlags b/examples/Diplomarbeit/cmakeFlags index 85988b1..5bcf0ce 100755 --- a/examples/Diplomarbeit/cmakeFlags +++ b/examples/Diplomarbeit/cmakeFlags @@ -26,7 +26,7 @@ flags[0]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Const;-DPARAM_PRECISION=precision64Bit" flags[1]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit" flags[2]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision32Bit" -flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DXRT_USE_SLOW_RNG=1" +flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARATAXIS_USE_SLOW_RNG=1" flags[4]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARAM_NUM_PARTS=1" flags[5]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARAM_NUM_PARTS=2" flags[6]="-DPARAM_OVERWRITES:LIST=-DPARAM_SLIT_OFFSET=70;-DPARAM_SLIT_SPACING=8;-DPARAM_SLIT_WIDTH=3;-DPARAM_START_POSITIONS=Random;-DPARAM_PRECISION=precision64Bit;-DPARAM_NUM_PARTS=5" diff --git a/examples/Diplomarbeit/include/simulation_defines/param/detectorConfig.param b/examples/Diplomarbeit/include/simulation_defines/param/detectorConfig.param index 6cf705d..dee8806 100644 --- a/examples/Diplomarbeit/include/simulation_defines/param/detectorConfig.param +++ b/examples/Diplomarbeit/include/simulation_defines/param/detectorConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace detector { namespace particleHandlers { @@ -74,4 +74,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/examples/Diplomarbeit/include/simulation_defines/param/initialDensity.param b/examples/Diplomarbeit/include/simulation_defines/param/initialDensity.param index 30e5918..14a0c05 100644 --- a/examples/Diplomarbeit/include/simulation_defines/param/initialDensity.param +++ b/examples/Diplomarbeit/include/simulation_defines/param/initialDensity.param @@ -35,7 +35,7 @@ # define PARAM_SLIT_SPACING2 PARAM_SLIT_SPACING #endif -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators{ @@ -80,4 +80,4 @@ namespace initialDensity { AvailableGenerators::PARAM_GENERATOR; } // namespace initialDensity -} // namespace xrt +} // namespace parataxis diff --git a/examples/Diplomarbeit/include/simulation_defines/param/laserConfig.param b/examples/Diplomarbeit/include/simulation_defines/param/laserConfig.param index 134b769..134a8e9 100644 --- a/examples/Diplomarbeit/include/simulation_defines/param/laserConfig.param +++ b/examples/Diplomarbeit/include/simulation_defines/param/laserConfig.param @@ -25,7 +25,7 @@ # define PARAM_NUM_PARTS 10 #endif -namespace xrt { +namespace parataxis { namespace laserConfig { /* Initialization for the 'laser' */ @@ -100,5 +100,5 @@ namespace laserConfig { constexpr int32_t DIRECTION = 0; } // namespace laserConfig -} // namespace xrt +} // namespace parataxis diff --git a/examples/Diplomarbeit/include/simulation_defines/param/memory.param b/examples/Diplomarbeit/include/simulation_defines/param/memory.param index e1c1c30..88c919f 100644 --- a/examples/Diplomarbeit/include/simulation_defines/param/memory.param +++ b/examples/Diplomarbeit/include/simulation_defines/param/memory.param @@ -22,7 +22,7 @@ #include #include -namespace xrt { +namespace parataxis { constexpr uint32_t KiB = 1024; constexpr uint32_t MiB = 1024 * KiB; @@ -52,5 +52,5 @@ namespace xrt { } // namespace exchangeSize -} // namespace xrt +} // namespace parataxis diff --git a/examples/Diplomarbeit/include/simulation_defines/param/precision.param b/examples/Diplomarbeit/include/simulation_defines/param/precision.param index 3f21bcc..7bd10d5 100644 --- a/examples/Diplomarbeit/include/simulation_defines/param/precision.param +++ b/examples/Diplomarbeit/include/simulation_defines/param/precision.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt +namespace parataxis { namespace precision32Bit{} namespace precision64Bit{} @@ -30,18 +30,18 @@ namespace xrt * - precision64Bit : use 64Bit floating point numbers (need CUDA_ARCH>=sm_20) * [significant digits 15 to 16] */ - namespace precisionXRT = PARAM_PRECISION; + namespace precisionPARATAXIS = PARAM_PRECISION; /*! Select a precision special operations (can be different from simulation precision) - * - precisionXRT : use precision which is selected on top + * - precisionPARATAXIS : use precision which is selected on top * - precision32Bit : use 32Bit floating point numbers * - precision64Bit : use 64Bit floating point numbers */ - namespace precisionSqrt = precisionXRT; - namespace precisionExp = precisionXRT; - namespace precisionTrigonometric = precisionXRT; + namespace precisionSqrt = precisionPARATAXIS; + namespace precisionExp = precisionPARATAXIS; + namespace precisionTrigonometric = precisionPARATAXIS; -}//namespace xrt +}//namespace parataxis #include "simulation_defines/unitless/precision.unitless" diff --git a/examples/Diplomarbeit/startProfiling.sh b/examples/Diplomarbeit/startProfiling.sh index 05831c3..4a73eae 100755 --- a/examples/Diplomarbeit/startProfiling.sh +++ b/examples/Diplomarbeit/startProfiling.sh @@ -17,13 +17,13 @@ # You should have received a copy of the GNU General Public License # along with ParaTAXIS. If not, see . -rm -rf ~/xrtTestsProfiling +outputFolder="$HOME/parataxisTestsProfiling" export TBG_TPLFILE=submit/hypnos-hzdr/k20_nvprof_profile.tpl export TBG_CFGFILE=submit/8gpuProfiling.cfg export TBG_SUBMIT=qsub -outputFolder="$HOME/xrtTestsProfiling" +rm -rf "${outputFolder}" -buildSystem/runTests.py -e examples/Diplomarbeit/ -o "$outputFolder" -t "DoubleSlitRandPos" -t "DoubleSlitRandPosSingle" -j -DCUDA_ARCH=sm_35 -DXRT_NVPROF_NUM_TS=5 -DXRT_NVPROF_START_TS=2998 -r --compile-only && \ +buildSystem/runTests.py -e examples/Diplomarbeit/ -o "$outputFolder" -t "DoubleSlitRandPos" -t "DoubleSlitRandPosSingle" -j -DCUDA_ARCH=sm_35 -DPARATAXIS_NVPROF_NUM_TS=5 -DPARATAXIS_NVPROF_START_TS=2998 -r --compile-only && \ cd "$outputFolder"/installed/DiplomarbeitSim_cmake1 && \ tbg -t -s -c "$outputFolder"/output/profilingDouble && \ cd "$outputFolder"/installed/DiplomarbeitSim_cmake2 && \ diff --git a/examples/DiplomarbeitMulti/cmakeFlags b/examples/DiplomarbeitMulti/cmakeFlags index 4967e5c..6774a45 100755 --- a/examples/DiplomarbeitMulti/cmakeFlags +++ b/examples/DiplomarbeitMulti/cmakeFlags @@ -23,21 +23,21 @@ # - start with zero index # - increase by 1, no gaps -flags[0]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[1]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[2]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=0" -flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[4]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[5]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=0" +flags[0]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[1]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[2]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0" +flags[3]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[4]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[5]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0" #Single -flags[6]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[7]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=0" -flags[8]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[9]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[10]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DXRT_FORCE_SINGLE_SCATTERING=0" +flags[6]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[7]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=DoubleSlit;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0" +flags[8]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=1;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[9]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[10]="-DPARAM_OVERWRITES:LIST=-DPARAM_ROOM_WIDTH=999999;-DPARAM_GENERATOR=Edge;-DPARAM_PRECISION=precision32Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0" # Grid -flags[11]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=1" -flags[12]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DXRT_FORCE_SINGLE_SCATTERING=0" +flags[11]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=1" +flags[12]="-DPARAM_OVERWRITES:LIST=-DPARAM_INITIAL_DENSITY=0.01;-DPARAM_ROOM_WIDTH=512;-DPARAM_GENERATOR=CombinedGenerator;-DPARAM_PRECISION=precision64Bit -DPARATAXIS_FORCE_SINGLE_SCATTERING=0" ################################################################################ # execution diff --git a/examples/DiplomarbeitMulti/include/simulation_defines/param/detectorConfig.param b/examples/DiplomarbeitMulti/include/simulation_defines/param/detectorConfig.param index 57ca89c..2125078 100644 --- a/examples/DiplomarbeitMulti/include/simulation_defines/param/detectorConfig.param +++ b/examples/DiplomarbeitMulti/include/simulation_defines/param/detectorConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace detector { namespace particleHandlers { @@ -74,4 +74,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/examples/DiplomarbeitMulti/include/simulation_defines/param/initialDensity.param b/examples/DiplomarbeitMulti/include/simulation_defines/param/initialDensity.param index a19681c..5bf0706 100644 --- a/examples/DiplomarbeitMulti/include/simulation_defines/param/initialDensity.param +++ b/examples/DiplomarbeitMulti/include/simulation_defines/param/initialDensity.param @@ -25,7 +25,7 @@ # define PARAM_INITIAL_DENSITY 0.001 #endif -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators{ @@ -108,4 +108,4 @@ namespace initialDensity { AvailableGenerators::PARAM_GENERATOR; } // namespace initialDensity -} // namespace xrt +} // namespace parataxis diff --git a/examples/DiplomarbeitMulti/include/simulation_defines/param/laserConfig.param b/examples/DiplomarbeitMulti/include/simulation_defines/param/laserConfig.param index e8eea19..e93308b 100644 --- a/examples/DiplomarbeitMulti/include/simulation_defines/param/laserConfig.param +++ b/examples/DiplomarbeitMulti/include/simulation_defines/param/laserConfig.param @@ -21,7 +21,7 @@ #include -namespace xrt { +namespace parataxis { namespace laserConfig { /* Initialization for the 'laser' */ @@ -84,5 +84,5 @@ namespace laserConfig { constexpr int32_t DIRECTION = 0; } // namespace laserConfig -} // namespace xrt +} // namespace parataxis diff --git a/examples/DiplomarbeitMulti/include/simulation_defines/param/precision.param b/examples/DiplomarbeitMulti/include/simulation_defines/param/precision.param index 3f21bcc..7bd10d5 100644 --- a/examples/DiplomarbeitMulti/include/simulation_defines/param/precision.param +++ b/examples/DiplomarbeitMulti/include/simulation_defines/param/precision.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt +namespace parataxis { namespace precision32Bit{} namespace precision64Bit{} @@ -30,18 +30,18 @@ namespace xrt * - precision64Bit : use 64Bit floating point numbers (need CUDA_ARCH>=sm_20) * [significant digits 15 to 16] */ - namespace precisionXRT = PARAM_PRECISION; + namespace precisionPARATAXIS = PARAM_PRECISION; /*! Select a precision special operations (can be different from simulation precision) - * - precisionXRT : use precision which is selected on top + * - precisionPARATAXIS : use precision which is selected on top * - precision32Bit : use 32Bit floating point numbers * - precision64Bit : use 64Bit floating point numbers */ - namespace precisionSqrt = precisionXRT; - namespace precisionExp = precisionXRT; - namespace precisionTrigonometric = precisionXRT; + namespace precisionSqrt = precisionPARATAXIS; + namespace precisionExp = precisionPARATAXIS; + namespace precisionTrigonometric = precisionPARATAXIS; -}//namespace xrt +}//namespace parataxis #include "simulation_defines/unitless/precision.unitless" diff --git a/examples/DoubleSlit/include/simulation_defines/param/detectorConfig.param b/examples/DoubleSlit/include/simulation_defines/param/detectorConfig.param index 6cf705d..dee8806 100644 --- a/examples/DoubleSlit/include/simulation_defines/param/detectorConfig.param +++ b/examples/DoubleSlit/include/simulation_defines/param/detectorConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace detector { namespace particleHandlers { @@ -74,4 +74,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/examples/DoubleSlit/include/simulation_defines/param/initialDensity.param b/examples/DoubleSlit/include/simulation_defines/param/initialDensity.param index 7c89a81..0766870 100644 --- a/examples/DoubleSlit/include/simulation_defines/param/initialDensity.param +++ b/examples/DoubleSlit/include/simulation_defines/param/initialDensity.param @@ -21,7 +21,7 @@ #include "math/vector/compile-time/UInt32.hpp" -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators{ @@ -52,4 +52,4 @@ namespace initialDensity { AvailableGenerators::DoubleSlit; } // namespace initialDensity -} // namespace xrt +} // namespace parataxis diff --git a/examples/DoubleSlit/include/simulation_defines/param/laserConfig.param b/examples/DoubleSlit/include/simulation_defines/param/laserConfig.param index a8770db..ba7e314 100644 --- a/examples/DoubleSlit/include/simulation_defines/param/laserConfig.param +++ b/examples/DoubleSlit/include/simulation_defines/param/laserConfig.param @@ -21,7 +21,7 @@ #include -namespace xrt { +namespace parataxis { namespace laserConfig { /* Initialization for the 'laser' */ @@ -96,4 +96,4 @@ namespace laserConfig { constexpr int32_t DIRECTION = 0; } // namespace laserConfig -} // namespace xrt +} // namespace parataxis diff --git a/examples/DoubleSlit/include/simulation_defines/param/precision.param b/examples/DoubleSlit/include/simulation_defines/param/precision.param index 3f21bcc..7bd10d5 100644 --- a/examples/DoubleSlit/include/simulation_defines/param/precision.param +++ b/examples/DoubleSlit/include/simulation_defines/param/precision.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt +namespace parataxis { namespace precision32Bit{} namespace precision64Bit{} @@ -30,18 +30,18 @@ namespace xrt * - precision64Bit : use 64Bit floating point numbers (need CUDA_ARCH>=sm_20) * [significant digits 15 to 16] */ - namespace precisionXRT = PARAM_PRECISION; + namespace precisionPARATAXIS = PARAM_PRECISION; /*! Select a precision special operations (can be different from simulation precision) - * - precisionXRT : use precision which is selected on top + * - precisionPARATAXIS : use precision which is selected on top * - precision32Bit : use 32Bit floating point numbers * - precision64Bit : use 64Bit floating point numbers */ - namespace precisionSqrt = precisionXRT; - namespace precisionExp = precisionXRT; - namespace precisionTrigonometric = precisionXRT; + namespace precisionSqrt = precisionPARATAXIS; + namespace precisionExp = precisionPARATAXIS; + namespace precisionTrigonometric = precisionPARATAXIS; -}//namespace xrt +}//namespace parataxis #include "simulation_defines/unitless/precision.unitless" diff --git a/examples/DoubleSlitScaling/include/simulation_defines/param/initialDensity.param b/examples/DoubleSlitScaling/include/simulation_defines/param/initialDensity.param index 452952f..4e6b2bf 100644 --- a/examples/DoubleSlitScaling/include/simulation_defines/param/initialDensity.param +++ b/examples/DoubleSlitScaling/include/simulation_defines/param/initialDensity.param @@ -21,7 +21,7 @@ #include "math/vector/compile-time/UInt32.hpp" -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators{ @@ -52,4 +52,4 @@ namespace initialDensity { AvailableGenerators::DoubleSlit; } // namespace initialDensity -} // namespace xrt +} // namespace parataxis diff --git a/examples/DoubleSlitScaling/include/simulation_defines/param/laserConfig.param b/examples/DoubleSlitScaling/include/simulation_defines/param/laserConfig.param index d29b091..aaa8eb3 100644 --- a/examples/DoubleSlitScaling/include/simulation_defines/param/laserConfig.param +++ b/examples/DoubleSlitScaling/include/simulation_defines/param/laserConfig.param @@ -21,7 +21,7 @@ #include -namespace xrt { +namespace parataxis { namespace laserConfig { /* Initialization for the 'laser' */ @@ -96,4 +96,4 @@ namespace laserConfig { constexpr int32_t DIRECTION = 0; } // namespace laserConfig -} // namespace xrt +} // namespace parataxis diff --git a/examples/DoubleSlitScaling/include/simulation_defines/param/precision.param b/examples/DoubleSlitScaling/include/simulation_defines/param/precision.param index 3f21bcc..7bd10d5 100644 --- a/examples/DoubleSlitScaling/include/simulation_defines/param/precision.param +++ b/examples/DoubleSlitScaling/include/simulation_defines/param/precision.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt +namespace parataxis { namespace precision32Bit{} namespace precision64Bit{} @@ -30,18 +30,18 @@ namespace xrt * - precision64Bit : use 64Bit floating point numbers (need CUDA_ARCH>=sm_20) * [significant digits 15 to 16] */ - namespace precisionXRT = PARAM_PRECISION; + namespace precisionPARATAXIS = PARAM_PRECISION; /*! Select a precision special operations (can be different from simulation precision) - * - precisionXRT : use precision which is selected on top + * - precisionPARATAXIS : use precision which is selected on top * - precision32Bit : use 32Bit floating point numbers * - precision64Bit : use 64Bit floating point numbers */ - namespace precisionSqrt = precisionXRT; - namespace precisionExp = precisionXRT; - namespace precisionTrigonometric = precisionXRT; + namespace precisionSqrt = precisionPARATAXIS; + namespace precisionExp = precisionPARATAXIS; + namespace precisionTrigonometric = precisionPARATAXIS; -}//namespace xrt +}//namespace parataxis #include "simulation_defines/unitless/precision.unitless" diff --git a/examples/ModuleTest/cmakeFlags b/examples/ModuleTest/cmakeFlags index 7f8beab..55e5d6f 100755 --- a/examples/ModuleTest/cmakeFlags +++ b/examples/ModuleTest/cmakeFlags @@ -23,19 +23,19 @@ # - start with zero index # - increase by 1, no gaps -flags[0]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_OFFSET_X=666" -flags[1]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_OFFSET_X=666" -flags[2]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles" -flags[3]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles" -flags[4]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles" -flags[5]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles" -flags[6]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_GENERATOR=RaisingLine;-DPARAM_SCATTERER=LinearDensity;-DPARAM_FACTORZ=0.00007 -DCUDA_FAST_MATH=OFF" -flags[7]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_GENERATOR=RaisingLine;-DPARAM_SCATTERER=LinearDensity;-DPARAM_FACTORZ=0.00007" -flags[8]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=DoubleRandDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" -flags[9]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=DoubleRandDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" -flags[10]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=RandomDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" -flags[11]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=RandomDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" -flags[12]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_GENERATOR=DoublePoint" +flags[0]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_OFFSET_X=666" +flags[1]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_OFFSET_X=666" +flags[2]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles" +flags[3]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles" +flags[4]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles" +flags[5]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles" +flags[6]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_GENERATOR=RaisingLine;-DPARAM_SCATTERER=LinearDensity;-DPARAM_FACTORZ=0.00007 -DCUDA_FAST_MATH=OFF" +flags[7]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_GENERATOR=RaisingLine;-DPARAM_SCATTERER=LinearDensity;-DPARAM_FACTORZ=0.00007" +flags[8]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=DoubleRandDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" +flags[9]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=DoubleRandDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" +flags[10]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=RandomDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" +flags[11]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_SCATTERER=RandomDirection;-DPARAM_LASER_STEP_LEN=100000;-DPARAM_LASER_DISTRIBUTION=PtOnly" +flags[12]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision32Bit;-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_GENERATOR=DoublePoint" ################################################################################ diff --git a/examples/ModuleTest/include/simulation_defines/param/detectorConfig.param b/examples/ModuleTest/include/simulation_defines/param/detectorConfig.param index 768d47c..2bc5486 100644 --- a/examples/ModuleTest/include/simulation_defines/param/detectorConfig.param +++ b/examples/ModuleTest/include/simulation_defines/param/detectorConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace detector { namespace particleHandlers { @@ -74,4 +74,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/examples/ModuleTest/include/simulation_defines/param/initialDensity.param b/examples/ModuleTest/include/simulation_defines/param/initialDensity.param index 4a5e899..7934011 100644 --- a/examples/ModuleTest/include/simulation_defines/param/initialDensity.param +++ b/examples/ModuleTest/include/simulation_defines/param/initialDensity.param @@ -34,7 +34,7 @@ # define PARAM_GENERATOR Cuboid #endif -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators{ @@ -92,4 +92,4 @@ namespace initialDensity { AvailableGenerators::PARAM_GENERATOR; } // namespace initialDensity -} // namespace xrt +} // namespace parataxis diff --git a/examples/ModuleTest/include/simulation_defines/param/laserConfig.param b/examples/ModuleTest/include/simulation_defines/param/laserConfig.param index abe3059..337b179 100644 --- a/examples/ModuleTest/include/simulation_defines/param/laserConfig.param +++ b/examples/ModuleTest/include/simulation_defines/param/laserConfig.param @@ -29,7 +29,7 @@ # define PARAM_LASER_DISTRIBUTION Const #endif -namespace xrt { +namespace parataxis { namespace laserConfig { /* Initialization for the 'laser' */ @@ -128,4 +128,4 @@ namespace laserConfig { constexpr int32_t DIRECTION = 0; } // namespace laserConfig -} // namespace xrt +} // namespace parataxis diff --git a/examples/ModuleTest/include/simulation_defines/param/precision.param b/examples/ModuleTest/include/simulation_defines/param/precision.param index 7f007a5..e11376d 100644 --- a/examples/ModuleTest/include/simulation_defines/param/precision.param +++ b/examples/ModuleTest/include/simulation_defines/param/precision.param @@ -23,7 +23,7 @@ # define PARAM_PRECISION_TRIGO PARAM_PRECISION #endif -namespace xrt +namespace parataxis { namespace precision32Bit{} namespace precision64Bit{} @@ -34,18 +34,18 @@ namespace xrt * - precision64Bit : use 64Bit floating point numbers (need CUDA_ARCH>=sm_20) * [significant digits 15 to 16] */ - namespace precisionXRT = PARAM_PRECISION; + namespace precisionPARATAXIS = PARAM_PRECISION; /*! Select a precision special operations (can be different from simulation precision) - * - precisionXRT : use precision which is selected on top + * - precisionPARATAXIS : use precision which is selected on top * - precision32Bit : use 32Bit floating point numbers * - precision64Bit : use 64Bit floating point numbers */ - namespace precisionSqrt = precisionXRT; - namespace precisionExp = precisionXRT; - namespace precisionTrigonometric = precisionXRT; + namespace precisionSqrt = precisionPARATAXIS; + namespace precisionExp = precisionPARATAXIS; + namespace precisionTrigonometric = precisionPARATAXIS; -}//namespace xrt +}//namespace parataxis #include "simulation_defines/unitless/precision.unitless" diff --git a/examples/ModuleTest/include/simulation_defines/param/scattererConfig.param b/examples/ModuleTest/include/simulation_defines/param/scattererConfig.param index 9fca26a..b248c58 100644 --- a/examples/ModuleTest/include/simulation_defines/param/scattererConfig.param +++ b/examples/ModuleTest/include/simulation_defines/param/scattererConfig.param @@ -28,7 +28,7 @@ # define PARAM_FACTORZ 0 #endif -namespace xrt { +namespace parataxis { namespace particles { namespace scatterer { @@ -102,4 +102,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/examples/ModuleTest/include/simulation_defines/param/speciesDefinition.param b/examples/ModuleTest/include/simulation_defines/param/speciesDefinition.param index 5d06fc6..57765a2 100644 --- a/examples/ModuleTest/include/simulation_defines/param/speciesDefinition.param +++ b/examples/ModuleTest/include/simulation_defines/param/speciesDefinition.param @@ -21,7 +21,7 @@ #include "simulation_defines.hpp" #include "particles/Particles.hpp" -#include "particles/XrtParticleDescription.hpp" +#include "particles/ParataxisParticleDescription.hpp" #include #include #include @@ -30,7 +30,7 @@ # define PARAM_SCATTERER Fixed #endif -namespace xrt { +namespace parataxis { /*########################### define particle attributes #####################*/ @@ -73,7 +73,7 @@ namespace xrt { /*define species photons*/ typedef Particles< - xrt::particles::ParticleDescription< + parataxis::particles::ParticleDescription< bmpl::string<'p'>, SuperCellSize, DefaultAttributesSeq, @@ -81,4 +81,4 @@ namespace xrt { > > PIC_Photons; -} // namespace xrt +} // namespace parataxis diff --git a/examples/ModuleTest/testData/validateInterference.py b/examples/ModuleTest/testData/validateInterference.py index 7f9f56b..d247196 100755 --- a/examples/ModuleTest/testData/validateInterference.py +++ b/examples/ModuleTest/testData/validateInterference.py @@ -49,20 +49,20 @@ def testInterference(self): params.AddDefine(param[0], param[1]) params.ParseFolder(os.environ["TEST_OUTPUT_PATH"] + "/simulation_defines/param") - params.SetCurNamespace("xrt::detector::PhotonDetector") + params.SetCurNamespace("parataxis::detector::PhotonDetector") detector = scatter.DetectorData([], [params.GetNumber("cellWidth"), params.GetNumber("cellHeight")], params.GetNumber("distance")) self.assertEqual(params.GetValue("IncomingParticleHandler"), "particleHandlers::AddWaveParticles") - params.SetCurNamespace("xrt::particles::scatterer::direction::Fixed") + params.SetCurNamespace("parataxis::particles::scatterer::direction::Fixed") scatterAngles = [params.GetNumber("angleY"), params.GetNumber("angleZ")] - params.SetCurNamespace("xrt::initialDensity") + params.SetCurNamespace("parataxis::initialDensity") self.assertEqual(params.GetValue("Generator"), "AvailableGenerators::DoublePoint") - params.SetCurNamespace("xrt::initialDensity::AvailableGenerators::DoublePoint") + params.SetCurNamespace("parataxis::initialDensity::AvailableGenerators::DoublePoint") scatterParticle1 = scatter.ParticleData([params.GetNumber("offsetX"), params.GetNumber("offsetY"), params.GetNumber("offsetZ1")], scatterAngles) scatterParticle2 = scatter.ParticleData([params.GetNumber("offsetX"), params.GetNumber("offsetY"), params.GetNumber("offsetZ2")], scatterAngles) - params.SetCurNamespace("xrt") + params.SetCurNamespace("parataxis") simulation = scatter.SimulationData(list(map(int, os.environ["TEST_GRID_SIZE"].split(" "))), [params.GetNumber("SI::CELL_WIDTH"), params.GetNumber("SI::CELL_HEIGHT"), params.GetNumber("SI::CELL_DEPTH")]) diff --git a/examples/ModuleTest/testData/validateRandom.py b/examples/ModuleTest/testData/validateRandom.py index 75ce9b4..3864507 100755 --- a/examples/ModuleTest/testData/validateRandom.py +++ b/examples/ModuleTest/testData/validateRandom.py @@ -39,17 +39,17 @@ def testDetector(self): params.AddDefine(param[0], param[1]) params.ParseFolder(os.environ["TEST_OUTPUT_PATH"] + "/simulation_defines/param") - params.SetCurNamespace("xrt::detector::PhotonDetector") + params.SetCurNamespace("parataxis::detector::PhotonDetector") DetDist = params.GetNumber("distance") DetCellSize = [params.GetNumber("cellWidth"), params.GetNumber("cellHeight")] DetType = params.GetValue("IncomingParticleHandler") - params.SetCurNamespace("xrt::initialDensity") + params.SetCurNamespace("parataxis::initialDensity") assert(params.GetValue("Generator") == "AvailableGenerators::Cuboid"), "Must use cuboid generator" DensityPos = params.GetVector("AvailableGenerators::Cuboid::Offset") DensityPos2D = array(DensityPos[1:]) - params.SetCurNamespace("xrt") + params.SetCurNamespace("parataxis") ScatterAngle = params.GetNumber("particles::scatterer::direction::RandomDirection::maxPolar") SimCellSize = array([params.GetNumber("SI::CELL_WIDTH"), params.GetNumber("SI::CELL_HEIGHT"), params.GetNumber("SI::CELL_DEPTH")]) diff --git a/examples/ModuleTest/testData/validateRandomRect.py b/examples/ModuleTest/testData/validateRandomRect.py index 511009d..f545885 100755 --- a/examples/ModuleTest/testData/validateRandomRect.py +++ b/examples/ModuleTest/testData/validateRandomRect.py @@ -39,17 +39,17 @@ def testDetector(self): params.AddDefine(param[0], param[1]) params.ParseFolder(os.environ["TEST_OUTPUT_PATH"] + "/simulation_defines/param") - params.SetCurNamespace("xrt::detector::PhotonDetector") + params.SetCurNamespace("parataxis::detector::PhotonDetector") DetDist = params.GetNumber("distance") DetCellSize = [params.GetNumber("cellWidth"), params.GetNumber("cellHeight")] DetType = params.GetValue("IncomingParticleHandler") - params.SetCurNamespace("xrt::initialDensity") + params.SetCurNamespace("parataxis::initialDensity") assert(params.GetValue("Generator") == "AvailableGenerators::Cuboid"), "Must use cuboid generator" DensityPos = params.GetVector("AvailableGenerators::Cuboid::Offset") DensityPos2D = array(DensityPos[1:]) - params.SetCurNamespace("xrt") + params.SetCurNamespace("parataxis") ScatterAngle = params.GetNumber("particles::scatterer::direction::DoubleRandDirection::angle") ScatterAngle = [ScatterAngle, ScatterAngle] SimCellSize = [params.GetNumber("SI::CELL_WIDTH"), params.GetNumber("SI::CELL_HEIGHT"), params.GetNumber("SI::CELL_DEPTH")] diff --git a/examples/ModuleTest/testData/validateScatterOnLineDensity.py b/examples/ModuleTest/testData/validateScatterOnLineDensity.py index 8c824ce..e94cd37 100755 --- a/examples/ModuleTest/testData/validateScatterOnLineDensity.py +++ b/examples/ModuleTest/testData/validateScatterOnLineDensity.py @@ -60,16 +60,16 @@ def testDetector(self): params.AddDefine(param[0], param[1]) params.ParseFolder(os.environ["TEST_OUTPUT_PATH"] + "/simulation_defines/param") - params.SetCurNamespace("xrt::detector::PhotonDetector") + params.SetCurNamespace("parataxis::detector::PhotonDetector") DetDist = params.GetNumber("distance") DetCellSize = [params.GetNumber("cellWidth"), params.GetNumber("cellHeight")] DetType = params.GetValue("IncomingParticleHandler") - params.SetCurNamespace("xrt::initialDensity") + params.SetCurNamespace("parataxis::initialDensity") self.assertEqual(params.GetValue("Generator"), "AvailableGenerators::RaisingLine") DensityPos = params.GetNumber("AvailableGenerators::RaisingLine::offsetOther") - params.SetCurNamespace("xrt") + params.SetCurNamespace("parataxis") ScatterAngleFactors = [params.GetNumber("particles::scatterer::direction::LinearDensity::factorY"), params.GetNumber("particles::scatterer::direction::LinearDensity::factorZ")] SimCellSize = [params.GetNumber("SI::CELL_WIDTH"), params.GetNumber("SI::CELL_HEIGHT"), params.GetNumber("SI::CELL_DEPTH")] diff --git a/examples/ModuleTest/testData/validateSingleCell.py b/examples/ModuleTest/testData/validateSingleCell.py index 387e8be..37881af 100755 --- a/examples/ModuleTest/testData/validateSingleCell.py +++ b/examples/ModuleTest/testData/validateSingleCell.py @@ -48,17 +48,17 @@ def testDetector(self): params.AddDefine(param[0], param[1]) params.ParseFolder(os.environ["TEST_OUTPUT_PATH"] + "/simulation_defines/param") - params.SetCurNamespace("xrt::detector::PhotonDetector") + params.SetCurNamespace("parataxis::detector::PhotonDetector") DetDist = params.GetNumber("distance") DetCellSize = [params.GetNumber("cellWidth"), params.GetNumber("cellHeight")] DetType = params.GetValue("IncomingParticleHandler") - params.SetCurNamespace("xrt::initialDensity") + params.SetCurNamespace("parataxis::initialDensity") self.assertEqual(params.GetValue("Generator"), "AvailableGenerators::Cuboid") DensityPos = params.GetVector("AvailableGenerators::Cuboid::Offset") DensityPos2D = np.array(DensityPos[1:]) - params.SetCurNamespace("xrt") + params.SetCurNamespace("parataxis") ScatterAngle = [params.GetNumber("particles::scatterer::direction::Fixed::angleY"), params.GetNumber("particles::scatterer::direction::Fixed::angleZ")] scatterParticle = scatter.ParticleData(DensityPos, ScatterAngle) diff --git a/examples/hdf5Test/cmakeFlags b/examples/hdf5Test/cmakeFlags index 4559f8c..de72f6e 100755 --- a/examples/hdf5Test/cmakeFlags +++ b/examples/hdf5Test/cmakeFlags @@ -23,9 +23,9 @@ # - start with zero index # - increase by 1, no gaps -flags[0]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_FIELD_MANIPULATOR=Random" -flags[1]="-DXRT_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_FIELD_MANIPULATOR=Random" -flags[2]="-DXRT_VERBOSE=255 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_FIELD_MANIPULATOR=HDF5Interpolator" +flags[0]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEHANDLER=AddWaveParticles;-DPARAM_FIELD_MANIPULATOR=Random" +flags[1]="-DPARATAXIS_VERBOSE=13 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_FIELD_MANIPULATOR=Random" +flags[2]="-DPARATAXIS_VERBOSE=255 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEHANDLER=CountParticles;-DPARAM_FIELD_MANIPULATOR=HDF5Interpolator" ################################################################################ diff --git a/examples/hdf5Test/include/simulation_defines/param/FieldManipulator.param b/examples/hdf5Test/include/simulation_defines/param/FieldManipulator.param index b79c914..56ebd72 100644 --- a/examples/hdf5Test/include/simulation_defines/param/FieldManipulator.param +++ b/examples/hdf5Test/include/simulation_defines/param/FieldManipulator.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace fieldManipulators { /** Static field */ @@ -32,5 +32,5 @@ namespace xrt { } // namespace fieldManipulators using FieldManipulator = fieldManipulators::PARAM_FIELD_MANIPULATOR; -} // namespace xrt +} // namespace parataxis diff --git a/examples/hdf5Test/include/simulation_defines/param/detectorConfig.param b/examples/hdf5Test/include/simulation_defines/param/detectorConfig.param index 768d47c..2bc5486 100644 --- a/examples/hdf5Test/include/simulation_defines/param/detectorConfig.param +++ b/examples/hdf5Test/include/simulation_defines/param/detectorConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace detector { namespace particleHandlers { @@ -74,4 +74,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/examples/hdf5Test/include/simulation_defines/param/initialDensity.param b/examples/hdf5Test/include/simulation_defines/param/initialDensity.param index 0948fae..a6e02ea 100644 --- a/examples/hdf5Test/include/simulation_defines/param/initialDensity.param +++ b/examples/hdf5Test/include/simulation_defines/param/initialDensity.param @@ -21,7 +21,7 @@ #include "math/vector/compile-time/UInt32.hpp" -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators{ @@ -55,4 +55,4 @@ namespace initialDensity { AvailableGenerators::Cuboid; } // namespace initialDensity -} // namespace xrt +} // namespace parataxis diff --git a/examples/hdf5Test/include/simulation_defines/param/speciesDefinition.param b/examples/hdf5Test/include/simulation_defines/param/speciesDefinition.param index ceb8600..dc357bc 100644 --- a/examples/hdf5Test/include/simulation_defines/param/speciesDefinition.param +++ b/examples/hdf5Test/include/simulation_defines/param/speciesDefinition.param @@ -21,12 +21,12 @@ #include "simulation_defines.hpp" #include "particles/Particles.hpp" -#include "particles/XrtParticleDescription.hpp" +#include "particles/ParataxisParticleDescription.hpp" #include #include #include -namespace xrt { +namespace parataxis { /*########################### define particle attributes #####################*/ @@ -69,7 +69,7 @@ namespace xrt { /*define species photons*/ typedef Particles< - xrt::particles::ParticleDescription< + parataxis::particles::ParticleDescription< bmpl::string<'p'>, SuperCellSize, DefaultAttributesSeq, @@ -77,4 +77,4 @@ namespace xrt { > > PIC_Photons; -} // namespace xrt +} // namespace parataxis diff --git a/include/ComplexTraits.hpp b/include/ComplexTraits.hpp index c1ce386..1e42cd1 100644 --- a/include/ComplexTraits.hpp +++ b/include/ComplexTraits.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" namespace PMacc{namespace mpi{namespace def{ diff --git a/include/GatherSlice.hpp b/include/GatherSlice.hpp index d1a154e..a58dd9b 100644 --- a/include/GatherSlice.hpp +++ b/include/GatherSlice.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include @@ -28,7 +28,7 @@ #include -namespace xrt +namespace parataxis { template struct GatherSlice; @@ -108,7 +108,7 @@ namespace xrt /* GPU idx (in the axis dimension) that has the slice */ int localPlane = slicePlane / localSize[nAxis]; - PMacc::log< XRTLogLvl::IN_OUT >("Init gather slice at point %1% of axis %2% with size %3%/%4%") + PMacc::log< PARATAXISLogLvl::IN_OUT >("Init gather slice at point %1% of axis %2% with size %3%/%4%") % slicePlane % nAxis % localSize % globalSize; PMacc::zone::SphericZone<3> gpuGatheringZone(env.GridController().getGpuNodes()); @@ -127,7 +127,7 @@ namespace xrt Space2D tmpSize(localSize[twistedAxes_[0]], localSize[twistedAxes_[1]]); Space2D masterSize(globalSize[twistedAxes_[0]], globalSize[twistedAxes_[1]]); - PMacc::log< XRTLogLvl::IN_OUT >("Participation in gather operation. Local offset: %1%. Rank: %2%. Is root: %3%") + PMacc::log< PARATAXISLogLvl::IN_OUT >("Participation in gather operation. Local offset: %1%. Rank: %2%. Is root: %3%") % localOffset_ % gather_->rank() % gather_->root(); tmpBuffer_.reset(new TmpBuffer(tmpSize)); @@ -177,6 +177,6 @@ namespace xrt std::unique_ptr tmpBuffer_; }; -} //namespace xrt +} //namespace parataxis diff --git a/include/GetFlagOrDefault.hpp b/include/GetFlagOrDefault.hpp index 40c7890..f045d40 100644 --- a/include/GetFlagOrDefault.hpp +++ b/include/GetFlagOrDefault.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { /** * When a flag with the given key exists in the object the resolved @@ -59,4 +59,4 @@ namespace xrt { > using GetFlagOrDefault_t = typename GetFlagOrDefault::type; -} // namespace xrt +} // namespace parataxis diff --git a/include/LaserSource.hpp b/include/LaserSource.hpp index 3f8b124..78e8adb 100644 --- a/include/LaserSource.hpp +++ b/include/LaserSource.hpp @@ -19,14 +19,14 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "debug/LogLevels.hpp" #include "math/Max.hpp" #include "math/round.hpp" #include #include -namespace xrt { +namespace parataxis { namespace kernel { @@ -76,10 +76,10 @@ namespace xrt { void init() { - PMacc::log< XRTLogLvl::DOMAINS >("Laser pulse is %1% timesteps long") % numTimeStepsLaserPulse; + PMacc::log< PARATAXISLogLvl::DOMAINS >("Laser pulse is %1% timesteps long") % numTimeStepsLaserPulse; uint32_t slotsAv = mallocMC::getAvailableSlots(sizeof(FrameType)); uint64_t numParts = slotsAv * SuperCellSize::toRT().productOfComponents(); - PMacc::log< XRTLogLvl::MEMORY > ("There are %1% slots available that can fit up to %2% particles") % slotsAv % numParts; + PMacc::log< PARATAXISLogLvl::MEMORY > ("There are %1% slots available that can fit up to %2% particles") % slotsAv % numParts; } void update(uint32_t currentStep) @@ -140,7 +140,7 @@ namespace xrt { msg = "There will be up to %1% particles spawned per timestep which most likely fit into the memory. " "The maximum number of particles that could be spawned per timestep is %2%%3% for straight through propagation and %4%%5% for diagonal propagation"; } - PMacc::log< XRTLogLvl::MEMORY >(msg.c_str()) + PMacc::log< PARATAXISLogLvl::MEMORY >(msg.c_str()) % maxPartPerTs % maxPartsPerTsStraight % (maxPartsPerTsStraight < maxPartPerTs ? "(!)":"") % maxPartsPerTsDiagonal % (maxPartsPerTsDiagonal < maxPartPerTs ? "(!)":""); @@ -168,4 +168,4 @@ namespace xrt { } }; -} // namespace xrt +} // namespace parataxis diff --git a/include/ShrinkToDim.hpp b/include/ShrinkToDim.hpp index 226ceee..89e76a6 100644 --- a/include/ShrinkToDim.hpp +++ b/include/ShrinkToDim.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { /// Shrinks a DataSpace to the new dimensionality by removing the first dimension(s) /// Acts like the shrink-member-function but leaves nD->nD untouched @@ -53,4 +53,4 @@ namespace xrt { return ShrinkToDim()(old); } -} // namespace xrt +} // namespace parataxis diff --git a/include/Simulation.hpp b/include/Simulation.hpp index 225f0b4..3dd2020 100644 --- a/include/Simulation.hpp +++ b/include/Simulation.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "convertToSpace.hpp" #include "particles/Particles.tpp" @@ -51,7 +51,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace po = boost::program_options; @@ -74,7 +74,7 @@ namespace xrt { std::unique_ptr densityField; std::unique_ptr detector_; -#if !XRT_USE_SLOW_RNG +#if !PARATAXIS_USE_SLOW_RNG std::unique_ptr rngProvider_; #endif // Created with the Simulation class @@ -119,44 +119,44 @@ namespace xrt { CUDA_CHECK(cudaDeviceSetLimit(cudaLimitPrintfFifoSize, 3 * MiB)); #endif TimeIntervallExt timer; - PMacc::log("Creating buffers"); + PMacc::log("Creating buffers"); densityField.reset(new fields::DensityField(cellDescription)); detector_.reset(new Detector(Space2D(detectorSize[0], detectorSize[1]))); -#if !XRT_USE_SLOW_RNG +#if !PARATAXIS_USE_SLOW_RNG rngProvider_.reset(new RNGProvider(Environment::get().SubGrid().getLocalDomain().size)); #endif - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); - PMacc::log("Creating particle buffers");; + PMacc::log("Creating particle buffers");; /* create particle storage (does NOT use mallocMC) */ particleStorage = new PIC_Photons(cellDescription, PIC_Photons::FrameType::getName()); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); - PMacc::log("Initializing MallocMC"); + PMacc::log("Initializing MallocMC"); /* After all memory consuming stuff is initialized we can setup mallocMC with the remaining memory */ initMallocMC(); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); particleStorage->createParticleBuffer(); size_t freeGpuMem(0); Environment::get().MemoryInfo().getMemoryInfo(&freeGpuMem); - PMacc::log< XRTLogLvl::MEMORY > ("free mem after all mem is allocated %1% MiB") % (freeGpuMem / MiB); + PMacc::log< PARATAXISLogLvl::MEMORY > ("free mem after all mem is allocated %1% MiB") % (freeGpuMem / MiB); - PMacc::log("Initializing density field"); + PMacc::log("Initializing density field"); densityField->init(); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); - PMacc::log("Initializing detector"); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log("Initializing detector"); detector_->init(); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); - PMacc::log("Initializing particles"); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log("Initializing particles"); particleStorage->init(densityField.get()); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); - PMacc::log("Initializing laser source"); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log("Initializing laser source"); laserSource.init(); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); - PMacc::log< XRTLogLvl::SIM_STATE > ("Simulation initialized."); + PMacc::log< PARATAXISLogLvl::SIM_STATE > ("Simulation initialized."); } uint32_t fillSimulation() override @@ -174,7 +174,7 @@ namespace xrt { // restart simulation by loading from persistent data // the simulation will start after restartStep - PMacc::log("Restarting simulation from timestep %1% in directory '%2%'") % + PMacc::log("Restarting simulation from timestep %1% in directory '%2%'") % restartStep % restartDirectory; Environment::get().PluginConnector().restartPlugins(restartStep, restartDirectory); @@ -186,34 +186,34 @@ namespace xrt { auto&gc = Environment::get().GridController(); MPI_CHECK(MPI_Barrier(gc.getCommunicator().getMPIComm())); - PMacc::log("Loading from persistent data finished"); + PMacc::log("Loading from persistent data finished"); step = this->restartStep + 1; } else { - PMacc::log("Starting simulation from timestep 0"); + PMacc::log("Starting simulation from timestep 0"); PMacc::IdProvider::init(); TimeIntervallExt timer; -#if !XRT_USE_SLOW_RNG - PMacc::log("Initializing random number generators"); +#if !PARATAXIS_USE_SLOW_RNG + PMacc::log("Initializing random number generators"); PMacc::mpi::SeedPerRank seedPerRank; uint32_t seed = seeds::xorRNG ^ seeds::Global()(); seed = seedPerRank(seed); rngProvider_->init(seed); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); #endif - PMacc::log("Creating density distribution"); + PMacc::log("Creating density distribution"); Resolve_t generator; densityField->createDensityDistribution(generator); - PMacc::log(XRTLogLvl::SIM_STATE() + XRTLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); + PMacc::log(PARATAXISLogLvl::SIM_STATE() + PARATAXISLogLvl::TIMING(), "Done in %1%") % timer.printCurIntervallRestart(); } - PMacc::log< XRTLogLvl::SIM_STATE > ("Simulation filled."); + PMacc::log< PARATAXISLogLvl::SIM_STATE > ("Simulation filled."); -#if XRT_CHECK_PHOTON_CT +#if PARATAXIS_CHECK_PHOTON_CT laserSource.checkPhotonCt(runSteps, this->cellDescription); #endif return step; @@ -239,12 +239,12 @@ namespace xrt { */ void runOneStep(uint32_t currentStep) override { -#if (XRT_NVPROF_NUM_TS>0) - if(currentStep == XRT_NVPROF_START_TS) +#if (PARATAXIS_NVPROF_NUM_TS>0) + if(currentStep == PARATAXIS_NVPROF_START_TS) { CUDA_CHECK(cudaDeviceSynchronize()); CUDA_CHECK(cudaProfilerStart()); - }else if(currentStep == XRT_NVPROF_START_TS + XRT_NVPROF_NUM_TS) + }else if(currentStep == PARATAXIS_NVPROF_START_TS + PARATAXIS_NVPROF_NUM_TS) { CUDA_CHECK(cudaDeviceSynchronize()); CUDA_CHECK(cudaProfilerStop()); @@ -271,7 +271,7 @@ namespace xrt { if(seeds::Global::value != globalSeed) { seeds::Global::value = globalSeed; - PMacc::log("Using custom seed %1%") % globalSeed; + PMacc::log("Using custom seed %1%") % globalSeed; } Space periodic = Space::create(0); // Non periodic boundaries! @@ -289,7 +289,7 @@ namespace xrt { Space localGridOffset(gc.getPosition() * localGridSize); /* Set up environment (subGrid and singletons) with this size */ Environment::get().initGrids( gridSize, localGridSize, localGridOffset); - PMacc::log< XRTLogLvl::DOMAINS > ("rank %1%; local size %2%; local offset %3%;") % + PMacc::log< PARATAXISLogLvl::DOMAINS > ("rank %1%; local size %2%; local offset %3%;") % gc.getPosition().toString() % localGridSize.toString() % localGridOffset.toString(); Parent::pluginLoad(); @@ -315,7 +315,7 @@ namespace xrt { Environment::get().MemoryInfo().getMemoryInfo(&freeGpuMem); if(freeGpuMem < reservedGPUMemorySize) { - PMacc::log< XRTLogLvl::MEMORY > ("%1% MiB free memory < %2% MiB required reserved memory") + PMacc::log< PARATAXISLogLvl::MEMORY > ("%1% MiB free memory < %2% MiB required reserved memory") % (freeGpuMem / MiB) % (reservedGPUMemorySize / MiB) ; throw std::runtime_error("Cannot reserve enough memory"); } @@ -325,12 +325,12 @@ namespace xrt { if( Environment::get().MemoryInfo().isSharedMemoryPool() ) { heapSize /= 2; - PMacc::log< XRTLogLvl::MEMORY > ("Shared RAM between GPU and host detected - using only half of the 'device' memory."); + PMacc::log< PARATAXISLogLvl::MEMORY > ("Shared RAM between GPU and host detected - using only half of the 'device' memory."); } else - PMacc::log< XRTLogLvl::MEMORY > ("RAM is NOT shared between GPU and host."); + PMacc::log< PARATAXISLogLvl::MEMORY > ("RAM is NOT shared between GPU and host."); - PMacc::log< XRTLogLvl::MEMORY > ("%1% of %2% MiB free memory is reserved. Using %3% MiB as the heap for MallocMC") + PMacc::log< PARATAXISLogLvl::MEMORY > ("%1% of %2% MiB free memory is reserved. Using %3% MiB as the heap for MallocMC") % (reservedGPUMemorySize / MiB) % (freeGpuMem / MiB) % (heapSize / MiB); // initializing the heap for particles mallocMC::initHeap(heapSize); @@ -357,4 +357,4 @@ namespace xrt { } }; -} // namespace xrt +} // namespace parataxis diff --git a/include/TimerIntervallExt.hpp b/include/TimerIntervallExt.hpp index 66cfda9..bdcc8de 100644 --- a/include/TimerIntervallExt.hpp +++ b/include/TimerIntervallExt.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { class TimeIntervallExt: public PMacc::TimeIntervall { @@ -41,4 +41,4 @@ namespace xrt { } }; -} // namespace xrt +} // namespace parataxis diff --git a/include/ToVector.hpp b/include/ToVector.hpp index e2ceb73..e752e6f 100644 --- a/include/ToVector.hpp +++ b/include/ToVector.hpp @@ -22,7 +22,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace detail { @@ -80,4 +80,4 @@ namespace xrt { template::type> using ToVector = detail::ToVector; -} // namespace xrt +} // namespace parataxis diff --git a/include/TransformBox.hpp b/include/TransformBox.hpp index c7d11d3..f91d375 100644 --- a/include/TransformBox.hpp +++ b/include/TransformBox.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/stdRenamings.hpp" -namespace xrt { +namespace parataxis { /** * A simple wrapper around a DataBox that transforms elements on access @@ -85,4 +85,4 @@ namespace xrt { using BaseBox = traits::remove_cv_t>; return TransformBox>(box, transformation); } -} // namespace xrt +} // namespace parataxis diff --git a/include/compileTimeValidation.hpp b/include/compileTimeValidation.hpp index 75a35cd..cbd8784 100644 --- a/include/compileTimeValidation.hpp +++ b/include/compileTimeValidation.hpp @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { // The PMacc algorithm assumes that we can only get to the neighbor cell in one timestep static_assert(DELTA_T * SPEED_OF_LIGHT <= CELL_WIDTH, "Cells are to big"); @@ -32,4 +32,4 @@ namespace xrt { DELTA_T * SPEED_OF_LIGHT > CELL_HEIGHT * 0.5 || DELTA_T * SPEED_OF_LIGHT > CELL_DEPTH * 0.5, "Cells are to small"); -} // namespace xrt +} // namespace parataxis diff --git a/include/convertToSpace.hpp b/include/convertToSpace.hpp index 4302055..5c01809 100644 --- a/include/convertToSpace.hpp +++ b/include/convertToSpace.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { /** * Copies values from a vector-like container (size(), push_back(..), []) to a Space instance @@ -64,4 +64,4 @@ namespace xrt { } -} // namespace xrt +} // namespace parataxis diff --git a/include/debug/LogLevels.hpp b/include/debug/LogLevels.hpp index dc32349..9696da7 100644 --- a/include/debug/LogLevels.hpp +++ b/include/debug/LogLevels.hpp @@ -22,14 +22,14 @@ #include #include -namespace xrt{ +namespace parataxis{ - #ifndef XRT_VERBOSE_LVL - # define XRT_VERBOSE_LVL 0 + #ifndef PARATAXIS_VERBOSE_LVL + # define PARATAXIS_VERBOSE_LVL 0 #endif /*create verbose class*/ - DEFINE_VERBOSE_CLASS(XRTLogLvl) + DEFINE_VERBOSE_CLASS(PARATAXISLogLvl) ( /* define log lvl for later use * e.g. log("TEXT");*/ @@ -43,7 +43,7 @@ namespace xrt{ DEFINE_LOGLVL(64, DEBUG); ) /*set default verbose lvl (integer number)*/ - (NOTHING::lvl|XRT_VERBOSE_LVL); + (NOTHING::lvl|PARATAXIS_VERBOSE_LVL); -} // namespace xrt +} // namespace parataxis diff --git a/include/detector/AddWaveParticles.hpp b/include/detector/AddWaveParticles.hpp index 740abcb..0bb2147 100644 --- a/include/detector/AddWaveParticles.hpp +++ b/include/detector/AddWaveParticles.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "particles/functors/GetPhaseByTimestep.hpp" #include "particles/functors/GetWavelength.hpp" #include "particles/functors/GetAngFrequency.hpp" @@ -28,7 +28,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace detector { /** @@ -136,4 +136,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/include/detector/CountParticles.hpp b/include/detector/CountParticles.hpp index 88be908..6b82d89 100644 --- a/include/detector/CountParticles.hpp +++ b/include/detector/CountParticles.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace detector { struct DetectorConfig; @@ -58,4 +58,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/include/detector/DetectorConfig.hpp b/include/detector/DetectorConfig.hpp index d14684c..f24ff46 100644 --- a/include/detector/DetectorConfig.hpp +++ b/include/detector/DetectorConfig.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { namespace detector { struct DetectorConfig @@ -36,4 +36,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/include/detector/NoDetectorImpl.hpp b/include/detector/NoDetectorImpl.hpp index f0e8828..a2b62aa 100644 --- a/include/detector/NoDetectorImpl.hpp +++ b/include/detector/NoDetectorImpl.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace detector { class NoDetectorImpl: PMacc::ISimulationData @@ -79,4 +79,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/include/detector/PhotonDetectorImpl.hpp b/include/detector/PhotonDetectorImpl.hpp index 1fff71e..d3034f0 100644 --- a/include/detector/PhotonDetectorImpl.hpp +++ b/include/detector/PhotonDetectorImpl.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "particles/functors/GetWavelength.hpp" #include "debug/LogLevels.hpp" #include "math/angleHelpers.hpp" @@ -30,7 +30,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace detector { namespace detail { @@ -248,7 +248,7 @@ namespace detector { { using math::rad2deg; PMacc::math::Vector angleRange = anglePerCell_ * precisionCast(size) / 2; - PMacc::log< XRTLogLvl::DOMAINS >("Detector detects angles in +- %g/%g(%g°/%g°) with resolution %g/%g(%g°/%g°)") + PMacc::log< PARATAXISLogLvl::DOMAINS >("Detector detects angles in +- %g/%g(%g°/%g°) with resolution %g/%g(%g°/%g°)") % angleRange.x() % angleRange.y() % rad2deg(angleRange.x()) % rad2deg(angleRange.y()) % anglePerCell_.x() % anglePerCell_.y() @@ -280,7 +280,7 @@ namespace detector { if(doReport) { - PMacc::log< XRTLogLvl::DOMAINS >("[INFO] Constraints for the detector (Resolution: %1%x%2% px) and light of wavelength %3%nm:\n" + PMacc::log< PARATAXISLogLvl::DOMAINS >("[INFO] Constraints for the detector (Resolution: %1%x%2% px) and light of wavelength %3%nm:\n" "Size: %4%m - %5%m (%6% - %7% px)\n" "CellSize: %8%µm - %9%µm\n" "Distance: %10%m - %11%m") @@ -296,7 +296,7 @@ namespace detector { { if(doReport) { - PMacc::log< XRTLogLvl::DOMAINS >("[WARNING] Detector is probably to small or to far away.\n" + PMacc::log< PARATAXISLogLvl::DOMAINS >("[WARNING] Detector is probably to small or to far away.\n" "Required size: %1%m\n" "Current size: (%2%m x %3%m)\n" "Or maximum distance: %4%m. Current: %5%m") @@ -311,7 +311,7 @@ namespace detector { { if(doReport) { - PMacc::log< XRTLogLvl::DOMAINS >("[WARNING] Detector resolution might be to low or it is to close.\n" + PMacc::log< PARATAXISLogLvl::DOMAINS >("[WARNING] Detector resolution might be to low or it is to close.\n" "Maximum cell size: %1%µm\n" "Current cell size: %2%µm\n" "Or minimum distance: %3%m. Current: %4%m") @@ -327,4 +327,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/include/fields/DensityField.hpp b/include/fields/DensityField.hpp index 394b3ba..e814ae7 100644 --- a/include/fields/DensityField.hpp +++ b/include/fields/DensityField.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include @@ -28,7 +28,7 @@ #include -namespace xrt { +namespace parataxis { namespace fields { namespace kernel @@ -142,4 +142,4 @@ namespace fields { } // namespace fields -} // namespace xrt +} // namespace parataxis diff --git a/include/fields/FieldManipulator.hpp b/include/fields/FieldManipulator.hpp index 8e30fb6..b64f946 100644 --- a/include/fields/FieldManipulator.hpp +++ b/include/fields/FieldManipulator.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "fields/IFieldManipulator.hpp" #include "plugins/ISimulationPlugin.hpp" -namespace xrt { +namespace parataxis { namespace fields { template @@ -53,4 +53,4 @@ class FieldManipulator: public IFieldManipulator, public ISimulationPlugin }; } // namespace fields -} // namespace xrt +} // namespace parataxis diff --git a/include/fields/HDF5FieldInterpolator.hpp b/include/fields/HDF5FieldInterpolator.hpp index ffc25a9..58d7f8d 100644 --- a/include/fields/HDF5FieldInterpolator.hpp +++ b/include/fields/HDF5FieldInterpolator.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "fields/IFieldManipulator.hpp" #include "plugins/ISimulationPlugin.hpp" #include "plugins/hdf5/BasePlugin.hpp" @@ -28,7 +28,7 @@ #include "plugins/openPMD/helpers.hpp" #include -namespace xrt { +namespace parataxis { namespace fields { template @@ -153,7 +153,7 @@ void HDF5FieldInterpolator::reinitFields(Type curTime, bool force) nextTime = lastTime; *nextField = *lastField; } - PMacc::log("(Re-)Initialized fields from HDF5. Record %1%/%2%, time %3% - %4%") + PMacc::log("(Re-)Initialized fields from HDF5. Record %1%/%2%, time %3% - %4%") % curHDF5Timestep % maxHDF5Timestep % lastTime % nextTime; } @@ -211,4 +211,4 @@ void HDF5FieldInterpolator::loadField(Type curTime) } } // namespace fields -} // namespace xrt +} // namespace parataxis diff --git a/include/fields/IFieldManipulator.hpp b/include/fields/IFieldManipulator.hpp index 140c628..87e2b28 100644 --- a/include/fields/IFieldManipulator.hpp +++ b/include/fields/IFieldManipulator.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace fields { /** Update a field in each timestep before photons are moved */ @@ -33,4 +33,4 @@ class IFieldManipulator }; } // namespace fields -} // namespace xrt +} // namespace parataxis diff --git a/include/fields/RandomManipulator.hpp b/include/fields/RandomManipulator.hpp index 2fa76fa..e2de0ef 100644 --- a/include/fields/RandomManipulator.hpp +++ b/include/fields/RandomManipulator.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "fields/IFieldManipulator.hpp" #include "plugins/ISimulationPlugin.hpp" -namespace xrt { +namespace parataxis { namespace fields { namespace kernel @@ -95,4 +95,4 @@ class RandomManipulator: public IFieldManipulator, public ISimulationPlugin }; } // namespace fields -} // namespace xrt +} // namespace parataxis diff --git a/include/fields/StaticManipulator.hpp b/include/fields/StaticManipulator.hpp index 9aa469b..8300051 100644 --- a/include/fields/StaticManipulator.hpp +++ b/include/fields/StaticManipulator.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "fields/IFieldManipulator.hpp" -namespace xrt { +namespace parataxis { namespace fields { /** Manipulator that does nothing, which results in a static field */ @@ -39,4 +39,4 @@ class StaticManipulator: public IFieldManipulator }; } // namespace fields -} // namespace xrt +} // namespace parataxis diff --git a/include/generators.hpp b/include/generators.hpp index e3113e9..c428067 100644 --- a/include/generators.hpp +++ b/include/generators.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace generators { /** @@ -271,4 +271,4 @@ namespace generators { }; } // namespace generators -} // namespace xrt +} // namespace parataxis diff --git a/include/math/Max.hpp b/include/math/Max.hpp index 7ed04dc..b9c3211 100644 --- a/include/math/Max.hpp +++ b/include/math/Max.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace math { struct Max @@ -34,4 +34,4 @@ namespace math { }; } // namespace math -} // namespace xrt +} // namespace parataxis diff --git a/include/math/abs.hpp b/include/math/abs.hpp index 91e4a4f..db44d61 100644 --- a/include/math/abs.hpp +++ b/include/math/abs.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" namespace PMacc{namespace algorithms{namespace math{ diff --git a/include/math/angleHelpers.hpp b/include/math/angleHelpers.hpp index 353079d..53e9c5b 100644 --- a/include/math/angleHelpers.hpp +++ b/include/math/angleHelpers.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace math { template @@ -32,4 +32,4 @@ namespace math { } } // namespace math -} // namespace xrt +} // namespace parataxis diff --git a/include/math/round.hpp b/include/math/round.hpp index f992147..f1da1e9 100644 --- a/include/math/round.hpp +++ b/include/math/round.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace math { /** Rounds the given float value to the nearest integer. @@ -43,4 +43,4 @@ namespace math { } } // namespace math -} // namespace xrt +} // namespace parataxis diff --git a/include/xrtTypes.hpp b/include/parataxisTypes.hpp similarity index 100% rename from include/xrtTypes.hpp rename to include/parataxisTypes.hpp diff --git a/include/particles/XrtParticleDescription.hpp b/include/particles/ParataxisParticleDescription.hpp similarity index 96% rename from include/particles/XrtParticleDescription.hpp rename to include/particles/ParataxisParticleDescription.hpp index 8e118de..03cdd0a 100644 --- a/include/particles/XrtParticleDescription.hpp +++ b/include/particles/ParataxisParticleDescription.hpp @@ -22,7 +22,7 @@ #include "particles/ProcessLeavingParticles.hpp" #include -namespace xrt { +namespace parataxis { namespace particles { template< @@ -47,4 +47,4 @@ namespace particles { >; } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/ParticleFillInfo.hpp b/include/particles/ParticleFillInfo.hpp index 3556999..781f864 100644 --- a/include/particles/ParticleFillInfo.hpp +++ b/include/particles/ParticleFillInfo.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { /** @@ -98,4 +98,4 @@ namespace particles { } } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/Particles.hpp b/include/particles/Particles.hpp index 3d908c3..1b5bc5d 100644 --- a/include/particles/Particles.hpp +++ b/include/particles/Particles.hpp @@ -19,13 +19,13 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include #include -namespace xrt{ +namespace parataxis{ namespace fields { class DensityField; @@ -85,4 +85,4 @@ namespace fields { uint32_t lastProcessedStep_; }; -} //namespace xrt +} //namespace parataxis diff --git a/include/particles/Particles.kernel b/include/particles/Particles.kernel index 53d7594..32c0062 100644 --- a/include/particles/Particles.kernel +++ b/include/particles/Particles.kernel @@ -20,7 +20,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include @@ -29,7 +29,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace kernel { /** @@ -330,4 +330,4 @@ namespace kernel { } } // namespace kernel -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/Particles.tpp b/include/particles/Particles.tpp index 9816016..2c0e7de 100644 --- a/include/particles/Particles.tpp +++ b/include/particles/Particles.tpp @@ -41,7 +41,7 @@ #include #include -namespace xrt{ +namespace parataxis{ namespace detail { @@ -106,7 +106,7 @@ namespace xrt{ this->particlesBuffer = new BufferType( gridLayout.getDataSpace(), gridLayout.getGuard() ); const uint32_t commTag = PMacc::traits::GetUniqueTypeId::uid() + static_cast(CommTag::SPECIES_FIRSTTAG); - PMacc::log< XRTLogLvl::MEMORY > ( "communication tag for species %1%: %2%" ) % FrameType::getName() % commTag; + PMacc::log< PARATAXISLogLvl::MEMORY > ( "communication tag for species %1%: %2%" ) % FrameType::getName() % commTag; detail::AddExchanges::add(this->particlesBuffer, commTag); } @@ -234,4 +234,4 @@ namespace xrt{ dc.releaseData(Detector::getName()); } -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/ParticlesInit.kernel b/include/particles/ParticlesInit.kernel index 709d796..27a376d 100644 --- a/include/particles/ParticlesInit.kernel +++ b/include/particles/ParticlesInit.kernel @@ -20,7 +20,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include #include @@ -28,7 +28,7 @@ #include #include -namespace xrt{ +namespace parataxis{ namespace kernel{ #define isMaster (linearThreadIdx == 0) @@ -230,4 +230,4 @@ namespace kernel{ #undef isMaster } // namespace kernel -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/ProcessLeavingParticles.hpp b/include/particles/ProcessLeavingParticles.hpp index 73e8372..f973d48 100644 --- a/include/particles/ProcessLeavingParticles.hpp +++ b/include/particles/ProcessLeavingParticles.hpp @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace particles { /** @@ -41,4 +41,4 @@ namespace particles { }; } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/filters/IndexFilter.hpp b/include/particles/filters/IndexFilter.hpp index 2ebf053..b8668c6 100644 --- a/include/particles/filters/IndexFilter.hpp +++ b/include/particles/filters/IndexFilter.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace filters { @@ -51,4 +51,4 @@ namespace filters { } // namespace filters } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/filters/TrueFilter.hpp b/include/particles/filters/TrueFilter.hpp index 618aef5..3afab4b 100644 --- a/include/particles/filters/TrueFilter.hpp +++ b/include/particles/filters/TrueFilter.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace filters { @@ -40,4 +40,4 @@ namespace filters { } // namespace filters } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/functors/CopySpeciesToHost.hpp b/include/particles/functors/CopySpeciesToHost.hpp index d1ef559..62d7b2f 100644 --- a/include/particles/functors/CopySpeciesToHost.hpp +++ b/include/particles/functors/CopySpeciesToHost.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { namespace particles { namespace functors { @@ -46,4 +46,4 @@ namespace functors { } // namespace functors } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/functors/GetAngFrequency.hpp b/include/particles/functors/GetAngFrequency.hpp index 078bded..26636a4 100644 --- a/include/particles/functors/GetAngFrequency.hpp +++ b/include/particles/functors/GetAngFrequency.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "particles/functors/GetWavelength.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace functors { @@ -48,4 +48,4 @@ namespace functors { } // namespace functors } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/functors/GetPhaseByTimestep.hpp b/include/particles/functors/GetPhaseByTimestep.hpp index 88326ae..38eb3b0 100644 --- a/include/particles/functors/GetPhaseByTimestep.hpp +++ b/include/particles/functors/GetPhaseByTimestep.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "particles/functors/GetAngFrequency.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace functors { @@ -57,4 +57,4 @@ namespace functors { } // namespace functors } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/functors/GetWavelength.hpp b/include/particles/functors/GetWavelength.hpp index 3c9bbb3..e35b3be 100644 --- a/include/particles/functors/GetWavelength.hpp +++ b/include/particles/functors/GetWavelength.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace functors { @@ -66,4 +66,4 @@ namespace functors { } // namespace functors } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/functors/IterateSpecies.hpp b/include/particles/functors/IterateSpecies.hpp index 481aa22..58a5aaf 100644 --- a/include/particles/functors/IterateSpecies.hpp +++ b/include/particles/functors/IterateSpecies.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt{ +namespace parataxis{ namespace particles{ namespace functors{ @@ -91,4 +91,4 @@ namespace functors{ } // namespace functors } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/functors/NoAlgo.hpp b/include/particles/functors/NoAlgo.hpp index a96a9a4..9caa68d 100644 --- a/include/particles/functors/NoAlgo.hpp +++ b/include/particles/functors/NoAlgo.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt{ +namespace parataxis{ namespace particles { namespace functors { @@ -38,4 +38,4 @@ namespace functors { } // namespace functors } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/initPolicies/ConstDirection.hpp b/include/particles/initPolicies/ConstDirection.hpp index 11ebc67..6614889 100644 --- a/include/particles/initPolicies/ConstDirection.hpp +++ b/include/particles/initPolicies/ConstDirection.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "ToVector.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace initPolicies { @@ -53,4 +53,4 @@ namespace initPolicies { } // namespace initPolicies } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/initPolicies/ConstDistribution.hpp b/include/particles/initPolicies/ConstDistribution.hpp index e51e669..75ada2f 100644 --- a/include/particles/initPolicies/ConstDistribution.hpp +++ b/include/particles/initPolicies/ConstDistribution.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace initPolicies { @@ -48,4 +48,4 @@ namespace initPolicies { } // namespace initPolicies } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/initPolicies/ConstPosition.hpp b/include/particles/initPolicies/ConstPosition.hpp index e328ec6..da37546 100644 --- a/include/particles/initPolicies/ConstPosition.hpp +++ b/include/particles/initPolicies/ConstPosition.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "ToVector.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace initPolicies { @@ -51,4 +51,4 @@ namespace initPolicies { } // namespace initPolicies } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/initPolicies/EvenDistPosition.hpp b/include/particles/initPolicies/EvenDistPosition.hpp index baf0e2a..b757d18 100644 --- a/include/particles/initPolicies/EvenDistPosition.hpp +++ b/include/particles/initPolicies/EvenDistPosition.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include -namespace xrt { +namespace parataxis { namespace particles { namespace initPolicies { @@ -120,4 +120,4 @@ namespace initPolicies { } // namespace initPolicies } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/initPolicies/PlaneWavePhase.hpp b/include/particles/initPolicies/PlaneWavePhase.hpp index c1077b2..5be2e68 100644 --- a/include/particles/initPolicies/PlaneWavePhase.hpp +++ b/include/particles/initPolicies/PlaneWavePhase.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "particles/functors/GetPhaseByTimestep.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace initPolicies { @@ -54,4 +54,4 @@ namespace initPolicies { } // namespace initPolicies } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/initPolicies/RandomPosition.hpp b/include/particles/initPolicies/RandomPosition.hpp index 3203557..c1eb8e2 100644 --- a/include/particles/initPolicies/RandomPosition.hpp +++ b/include/particles/initPolicies/RandomPosition.hpp @@ -19,17 +19,17 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { namespace particles { namespace initPolicies { template struct RandomPosition { -#if XRT_USE_SLOW_RNG +#if PARATAXIS_USE_SLOW_RNG using Random = SlowRNGFunctor; #else using Distribution = PMacc::random::distributions::Uniform; @@ -37,7 +37,7 @@ namespace initPolicies { #endif HINLINE RandomPosition() -#if !XRT_USE_SLOW_RNG +#if !PARATAXIS_USE_SLOW_RNG :rand(RNGProvider::createRandom()) #endif {} @@ -67,4 +67,4 @@ namespace initPolicies { } // namespace initPolicies } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/pusher/Photon.hpp b/include/particles/pusher/Photon.hpp index ebe6e51..d75177c 100644 --- a/include/particles/pusher/Photon.hpp +++ b/include/particles/pusher/Photon.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt{ +namespace parataxis{ namespace particles { namespace pusher { @@ -45,4 +45,4 @@ namespace pusher { } // namespace pusher } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/Fixed.hpp b/include/particles/scatterer/Fixed.hpp index 3f0b672..666773d 100644 --- a/include/particles/scatterer/Fixed.hpp +++ b/include/particles/scatterer/Fixed.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "ToVector.hpp" #include #include -namespace xrt{ +namespace parataxis{ namespace particles { namespace scatterer { @@ -61,4 +61,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/LinearDensity.hpp b/include/particles/scatterer/LinearDensity.hpp index 5b2395d..5d95677 100644 --- a/include/particles/scatterer/LinearDensity.hpp +++ b/include/particles/scatterer/LinearDensity.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "ToVector.hpp" #include #include -namespace xrt{ +namespace parataxis{ namespace particles { namespace scatterer { @@ -55,4 +55,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/Never.hpp b/include/particles/scatterer/Never.hpp index 5977e77..09216d2 100644 --- a/include/particles/scatterer/Never.hpp +++ b/include/particles/scatterer/Never.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace scatterer { @@ -52,4 +52,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/OnRandom.hpp b/include/particles/scatterer/OnRandom.hpp index 32dffc4..df25ae5 100644 --- a/include/particles/scatterer/OnRandom.hpp +++ b/include/particles/scatterer/OnRandom.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { namespace particles { namespace scatterer { @@ -36,7 +36,7 @@ namespace scatterer { struct OnRandom { using Config = T_Config; -#if XRT_USE_SLOW_RNG +#if PARATAXIS_USE_SLOW_RNG using Random = SlowRNGFunctor; #else using Distribution = PMacc::random::distributions::Uniform; @@ -45,7 +45,7 @@ namespace scatterer { HINLINE explicit OnRandom(uint32_t currentStep) -#if !XRT_USE_SLOW_RNG +#if !PARATAXIS_USE_SLOW_RNG :rand(RNGProvider::createRandom()) #endif {} @@ -70,4 +70,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/OnThreshold.hpp b/include/particles/scatterer/OnThreshold.hpp index 2a4be41..960be6d 100644 --- a/include/particles/scatterer/OnThreshold.hpp +++ b/include/particles/scatterer/OnThreshold.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace scatterer { @@ -56,4 +56,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/RandomDirection.hpp b/include/particles/scatterer/RandomDirection.hpp index 1cf47a6..2dd1844 100644 --- a/include/particles/scatterer/RandomDirection.hpp +++ b/include/particles/scatterer/RandomDirection.hpp @@ -19,14 +19,14 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "debug/LogLevels.hpp" #include #include #include #include -namespace xrt { +namespace parataxis { namespace particles { namespace scatterer { @@ -37,7 +37,7 @@ namespace scatterer { struct RandomDirection { using Config = T_Config; -#if XRT_USE_SLOW_RNG +#if PARATAXIS_USE_SLOW_RNG using Random = SlowRNGFunctor; #else using Distribution = PMacc::random::distributions::Uniform; @@ -46,7 +46,7 @@ namespace scatterer { HINLINE explicit RandomDirection(uint32_t currentStep) -#if !XRT_USE_SLOW_RNG +#if !PARATAXIS_USE_SLOW_RNG :rand(RNGProvider::createRandom()) #endif { @@ -55,9 +55,9 @@ namespace scatterer { { angleChecked = true; if(PMaccMath::abs(Config::minAzimuth) > PI || PMaccMath::abs(Config::maxAzimuth) > PI) - PMacc::log("Azimuth angle not in range [-PI,PI]. Possibly reduced precision!"); + PMacc::log("Azimuth angle not in range [-PI,PI]. Possibly reduced precision!"); if(PMaccMath::abs(Config::minPolar) > PI || PMaccMath::abs(Config::maxPolar) > PI) - PMacc::log("Polar angle not in range [-PI,PI]. Possibly reduced precision!"); + PMacc::log("Polar angle not in range [-PI,PI]. Possibly reduced precision!"); } } @@ -131,4 +131,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/Reflect.hpp b/include/particles/scatterer/Reflect.hpp index 400b2ca..c8e7a98 100644 --- a/include/particles/scatterer/Reflect.hpp +++ b/include/particles/scatterer/Reflect.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt{ +namespace parataxis{ namespace particles { namespace scatterer { @@ -49,4 +49,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/particles/scatterer/ScatterFunctor.hpp b/include/particles/scatterer/ScatterFunctor.hpp index 3538376..5aa202d 100644 --- a/include/particles/scatterer/ScatterFunctor.hpp +++ b/include/particles/scatterer/ScatterFunctor.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace particles { namespace scatterer { @@ -81,4 +81,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/DebugHelper.hpp b/include/plugins/DebugHelper.hpp index bb3dee5..b77ff25 100644 --- a/include/plugins/DebugHelper.hpp +++ b/include/plugins/DebugHelper.hpp @@ -19,14 +19,14 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/ISimulationPlugin.hpp" #include "debug/LogLevels.hpp" #include #include -namespace xrt { +namespace parataxis { namespace plugins { template @@ -83,9 +83,9 @@ namespace plugins { return; Environment::get().PluginConnector().setNotificationPeriod(this, notifyFrequency); - PMacc::log< XRTLogLvl::PLUGINS >("Printing particle info for %1% every %2% timesteps") % T_Particles::FrameType::getName() % notifyFrequency; + PMacc::log< PARATAXISLogLvl::PLUGINS >("Printing particle info for %1% every %2% timesteps") % T_Particles::FrameType::getName() % notifyFrequency; } }; } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/ISimulationPlugin.hpp b/include/plugins/ISimulationPlugin.hpp index 177732a..158658b 100644 --- a/include/plugins/ISimulationPlugin.hpp +++ b/include/plugins/ISimulationPlugin.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { class ISimulationPlugin: public PMacc::IPlugin { @@ -39,4 +39,4 @@ namespace xrt { const MappingDesc* cellDescription_; }; -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/PrintDetector.hpp b/include/plugins/PrintDetector.hpp index 9344346..c321882 100644 --- a/include/plugins/PrintDetector.hpp +++ b/include/plugins/PrintDetector.hpp @@ -19,15 +19,15 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/ISimulationPlugin.hpp" #include "debug/LogLevels.hpp" #include "ComplexTraits.hpp" #include "math/abs.hpp" -#if (XRT_ENABLE_TIFF == 1) +#if (PARATAXIS_ENABLE_TIFF == 1) # include "plugins/imaging/TiffCreator.hpp" #endif -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) # include "plugins/openPMD/WriteHeader.hpp" # include "plugins/hdf5/DataBoxWriter.hpp" # include "plugins/hdf5/DataBoxReader.hpp" @@ -48,7 +48,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { template @@ -98,7 +98,7 @@ namespace plugins { void notify(uint32_t currentStep) override { - PMacc::log< XRTLogLvl::IN_OUT >("Outputting detector at timestep %1%") % currentStep; + PMacc::log< PARATAXISLogLvl::IN_OUT >("Outputting detector at timestep %1%") % currentStep; PMacc::DataConnector& dc = Environment::get().DataConnector(); Detector& detector = dc.getData(Detector::getName()); @@ -119,7 +119,7 @@ namespace plugins { if(!noBeamstop) doBeamstop(masterBuffer_->getDataBox(), size); auto transformedBox = makeTransformBox(masterBuffer_->getDataBox(), typename Detector::OutputTransformer()); -#if (XRT_ENABLE_TIFF==1) +#if (PARATAXIS_ENABLE_TIFF==1) if(!noTiff) { std::stringstream fileName; @@ -130,7 +130,7 @@ namespace plugins { tiff(fileName.str(), transformedBox, size); } #endif -#if (XRT_ENABLE_HDF5==1) +#if (PARATAXIS_ENABLE_HDF5==1) if(!noHDF5) writeHDF5(transformedBox, size, currentStep); #endif @@ -167,7 +167,7 @@ namespace plugins { float_X numBeamCellsY = CELL_HEIGHT * simSize.y() / Detector::cellHeight; const Space2D start((size.x() - numBeamCellsX) / 2, (size.y() - numBeamCellsY) / 2); const Space2D end((size.x() + numBeamCellsX) / 2, (size.y() + numBeamCellsY) / 2); - PMacc::log< XRTLogLvl::IN_OUT >("Applying beamstop in range %1%-%2%/%3%-%4%") % start.x() % end.x() % start.y() % end.y(); + PMacc::log< PARATAXISLogLvl::IN_OUT >("Applying beamstop in range %1%-%2%/%3%-%4%") % start.x() % end.x() % start.y() % end.y(); for(unsigned y = start.y(); y <= end.y(); y++) { for(unsigned x = start.x(); x <= end.x(); x++) @@ -178,7 +178,7 @@ namespace plugins { void writeHDF5(T_DataBox&& data, const Space2D& size, uint32_t currentStep) const; }; -#if (XRT_ENABLE_HDF5==1) +#if (PARATAXIS_ENABLE_HDF5==1) template template @@ -251,7 +251,7 @@ namespace plugins { auto writer = hdf5::makeSplashWriter(*dataCollector, currentStep); openPMD::writeHeader(writer, this->fileName); - PMacc::log("HDF5: write detector: %1%") % Detector::getName(); + PMacc::log("HDF5: write detector: %1%") % Detector::getName(); /* Change dataset */ writer.setCurrentDataset(std::string("meshes/") + Detector::getName()); @@ -322,7 +322,7 @@ namespace plugins { openH5File(fname, true); auto writer = hdf5::makeSplashWriter(*dataCollector, currentStep); - PMacc::log("HDF5: read detector: %1%") % Detector::getName(); + PMacc::log("HDF5: read detector: %1%") % Detector::getName(); /* Change dataset */ writer.setCurrentDataset(std::string("meshes/") + Detector::getName()); @@ -360,7 +360,7 @@ namespace plugins { template void PrintDetector::restart(uint32_t currentStep, const std::string restartDirectory){} -#endif // XRT_ENABLE_HDF5 +#endif // PARATAXIS_ENABLE_HDF5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/PrintField.hpp b/include/plugins/PrintField.hpp index 2ba54a3..63f2417 100644 --- a/include/plugins/PrintField.hpp +++ b/include/plugins/PrintField.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "GatherSlice.hpp" -#if XRT_ENABLE_PNG +#if PARATAXIS_ENABLE_PNG # include "plugins/imaging/PngCreator.hpp" #endif -#if XRT_ENABLE_TIFF +#if PARATAXIS_ENABLE_TIFF # include "plugins/imaging/TiffCreator.hpp" #endif #include "plugins/ISimulationPlugin.hpp" @@ -36,7 +36,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { template @@ -90,7 +90,7 @@ namespace plugins { void notify(uint32_t currentStep) override { - PMacc::log< XRTLogLvl::IN_OUT >("Outputting field at timestep %1%") % currentStep; + PMacc::log< PARATAXISLogLvl::IN_OUT >("Outputting field at timestep %1%") % currentStep; auto &dc = Environment::get().DataConnector(); @@ -114,13 +114,13 @@ namespace plugins { )); if(format == "png") { -#if XRT_ENABLE_PNG +#if PARATAXIS_ENABLE_PNG imaging::PngCreator img; img(fileName.str(), data, gather->getData().size()); #endif }else { -#if XRT_ENABLE_TIFF +#if PARATAXIS_ENABLE_TIFF imaging::TiffCreator img; img(fileName.str(), data, gather->getData().size()); #endif @@ -157,18 +157,18 @@ namespace plugins { std::transform(format.begin(), format.end(), format.begin(), ::tolower); if(format != "tiff" && format != "tif") format = "png"; -#if !XRT_ENABLE_PNG +#if !PARATAXIS_ENABLE_PNG format = "tif"; -#elif !XRT_ENABLE_TIFF +#elif !PARATAXIS_ENABLE_TIFF format = "png"; #endif -#if XRT_ENABLE_PNG || XRT_ENABLE_TIFF +#if PARATAXIS_ENABLE_PNG || PARATAXIS_ENABLE_TIFF Environment::get().PluginConnector().setNotificationPeriod(this, notifyFrequency); // TODO: Ineffective. Improve! for(uint32_t slicePoint: slicePoints) gather_.push_back(new UsedGatherSlice(slicePoint, nAxis_)); #else - PMacc::log("Did not found tiff or png library. %1% is disabled") % getName(); + PMacc::log("Did not found tiff or png library. %1% is disabled") % getName(); #endif } @@ -182,4 +182,4 @@ namespace plugins { }; } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/PrintParticles.hpp b/include/plugins/PrintParticles.hpp index 00b9d4f..3903e93 100644 --- a/include/plugins/PrintParticles.hpp +++ b/include/plugins/PrintParticles.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "particles/functors/IterateSpecies.hpp" #include "particles/functors/CopySpeciesToHost.hpp" #include "particles/filters/IndexFilter.hpp" @@ -33,7 +33,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace detail { @@ -120,7 +120,7 @@ namespace plugins { void notify(uint32_t currentStep) override { - PMacc::log< XRTLogLvl::IN_OUT >("Printing particles at timestep %1% (%2%ns)") % currentStep % (currentStep * DELTA_T * UNIT_TIME * 1e9); + PMacc::log< PARATAXISLogLvl::IN_OUT >("Printing particles at timestep %1% (%2%ns)") % currentStep % (currentStep * DELTA_T * UNIT_TIME * 1e9); PMacc::DataConnector &dc = Environment::get().DataConnector(); /* synchronizes the MallocMCBuffer to the host side */ @@ -141,7 +141,7 @@ namespace plugins { dc.releaseData(PIC_Photons::FrameType::getName()); dc.releaseData(PMacc::MallocMCBuffer::getName()); - PMacc::log< XRTLogLvl::IN_OUT >("%1% particles printed") % particlesCount; + PMacc::log< PARATAXISLogLvl::IN_OUT >("%1% particles printed") % particlesCount; } void checkpoint(uint32_t currentStep, const std::string checkpointDirectory) override @@ -177,9 +177,9 @@ namespace plugins { idxOff[i] = (idxOffset[i] < totalSize[i]) ? idxOffset[i] : 0; idxSz[i] = (idxSize[i] > 0) ? idxSize[i] : totalSize[i]; } - PMacc::log< XRTLogLvl::PLUGINS >("Printing particles in range %1% [%2%] every %3% timesteps") % idxOff % idxSz % notifyFrequency; + PMacc::log< PARATAXISLogLvl::PLUGINS >("Printing particles in range %1% [%2%] every %3% timesteps") % idxOff % idxSz % notifyFrequency; } }; } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/TiffToDensity.hpp b/include/plugins/TiffToDensity.hpp index 9e39cd2..18989ff 100644 --- a/include/plugins/TiffToDensity.hpp +++ b/include/plugins/TiffToDensity.hpp @@ -19,14 +19,14 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/ISimulationPlugin.hpp" #include "ShrinkToDim.hpp" #include "convertToSpace.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace detail { @@ -275,7 +275,7 @@ namespace plugins { void notify(uint32_t currentStep) override { - PMacc::log< XRTLogLvl::IN_OUT >("Loading density field"); + PMacc::log< PARATAXISLogLvl::IN_OUT >("Loading density field"); if(cfg.firstIdx == cfg.lastIdx || cfg.filePath.find("%i") == std::string::npos) detail::FillDensityFromTiff::load2D(*cellDescription_, cfg); @@ -299,4 +299,4 @@ namespace plugins { }; } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/common/helpers.hpp b/include/plugins/common/helpers.hpp index 4e958f3..c0650de 100644 --- a/include/plugins/common/helpers.hpp +++ b/include/plugins/common/helpers.hpp @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace plugins { struct OperatorCreateVectorBox @@ -123,4 +123,4 @@ namespace plugins { }; } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/common/stringHelpers.cpp b/include/plugins/common/stringHelpers.cpp index b8ed3f3..4ea0b30 100644 --- a/include/plugins/common/stringHelpers.cpp +++ b/include/plugins/common/stringHelpers.cpp @@ -20,7 +20,7 @@ #include "plugins/common/stringHelpers.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace common { @@ -46,4 +46,4 @@ namespace common { } // namespace common } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/common/stringHelpers.hpp b/include/plugins/common/stringHelpers.hpp index b7ee576..51b9e48 100644 --- a/include/plugins/common/stringHelpers.hpp +++ b/include/plugins/common/stringHelpers.hpp @@ -21,7 +21,7 @@ #include -namespace xrt { +namespace parataxis { namespace plugins { namespace common { @@ -34,4 +34,4 @@ namespace common { } // namespace common } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/BasePlugin.hpp b/include/plugins/hdf5/BasePlugin.hpp index a526a27..c30a3d3 100644 --- a/include/plugins/hdf5/BasePlugin.hpp +++ b/include/plugins/hdf5/BasePlugin.hpp @@ -19,14 +19,14 @@ #pragma once -#include "xrtTypes.hpp" -#if (XRT_ENABLE_HDF5 == 1) +#include "parataxisTypes.hpp" +#if (PARATAXIS_ENABLE_HDF5 == 1) # include #endif namespace po = boost::program_options; -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -34,7 +34,7 @@ class BasePlugin { protected: BasePlugin() -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) : dataCollector(nullptr) #endif {} @@ -45,7 +45,7 @@ class BasePlugin void pluginRegisterHelp(po::options_description& desc) { -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) restartFilename.clear(); desc.add_options() ((getPrefix() + ".file").c_str(), po::value(&filename)->default_value(getPrefix() + "_data"), "HDF5 output filename (prefix)") @@ -60,7 +60,7 @@ class BasePlugin void pluginLoad(); void pluginUnload(); -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) std::string filename; std::string checkpointFilename; std::string restartFilename; @@ -72,10 +72,10 @@ class BasePlugin void BasePlugin::closeH5File() { -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) if (dataCollector) { - PMacc::log("HDF5: close DataCollector"); + PMacc::log("HDF5: close DataCollector"); dataCollector->close(); } #endif @@ -83,7 +83,7 @@ void BasePlugin::closeH5File() void BasePlugin::openH5File(const std::string& filename, bool openRead) { -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) const uint32_t maxOpenFilesPerNode = 4; if (!dataCollector) { @@ -104,7 +104,7 @@ void BasePlugin::openH5File(const std::string& filename, bool openRead) // open datacollector try { - PMacc::log("HDF5: open DataCollector with file: %1%") % filename; + PMacc::log("HDF5: open DataCollector with file: %1%") % filename; dataCollector->open(filename.c_str(), attr); } catch (const splash::DCException& e) @@ -117,7 +117,7 @@ void BasePlugin::openH5File(const std::string& filename, bool openRead) void BasePlugin::pluginLoad() { -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) auto& gc = Environment::get().GridController(); /* It is important that we never change the mpi_pos after this point * because we get problems with the restart. @@ -141,7 +141,7 @@ void BasePlugin::pluginLoad() void BasePlugin::pluginUnload() { -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) if (dataCollector) dataCollector->finalize(); @@ -151,4 +151,4 @@ void BasePlugin::pluginUnload() } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/ComplexBoxReader.hpp b/include/plugins/hdf5/ComplexBoxReader.hpp index 60ce1b1..1ab5f53 100644 --- a/include/plugins/hdf5/ComplexBoxReader.hpp +++ b/include/plugins/hdf5/ComplexBoxReader.hpp @@ -23,7 +23,7 @@ #include "TransformBox.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -53,4 +53,4 @@ struct DataBoxReader> } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/ComplexBoxWriter.hpp b/include/plugins/hdf5/ComplexBoxWriter.hpp index 1df9db9..bef20c8 100644 --- a/include/plugins/hdf5/ComplexBoxWriter.hpp +++ b/include/plugins/hdf5/ComplexBoxWriter.hpp @@ -23,7 +23,7 @@ #include "TransformBox.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -53,4 +53,4 @@ struct DataBoxWriter> } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/DataBoxReader.hpp b/include/plugins/hdf5/DataBoxReader.hpp index dd6e387..b6f9847 100644 --- a/include/plugins/hdf5/DataBoxReader.hpp +++ b/include/plugins/hdf5/DataBoxReader.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -86,6 +86,6 @@ void readDataBox(T_SplashReader&& reader, const T_DataBox& dataBox, } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis #include "plugins/hdf5/ComplexBoxReader.hpp" diff --git a/include/plugins/hdf5/DataBoxWriter.hpp b/include/plugins/hdf5/DataBoxWriter.hpp index 61a4407..7b72446 100644 --- a/include/plugins/hdf5/DataBoxWriter.hpp +++ b/include/plugins/hdf5/DataBoxWriter.hpp @@ -21,7 +21,7 @@ #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -93,6 +93,6 @@ void writeDataBox(T_SplashWriter&& writer, const T_DataBox& dataBox, } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis #include "plugins/hdf5/ComplexBoxWriter.hpp" diff --git a/include/plugins/hdf5/HDF5Output.hpp b/include/plugins/hdf5/HDF5Output.hpp index 02f5b90..eb1d10b 100644 --- a/include/plugins/hdf5/HDF5Output.hpp +++ b/include/plugins/hdf5/HDF5Output.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/ISimulationPlugin.hpp" #include "plugins/hdf5/SplashWriter.hpp" #include "plugins/hdf5/DataBoxWriter.hpp" @@ -41,7 +41,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -117,7 +117,7 @@ void HDF5Output::writeHDF5(uint32_t currentStep, bool isCheckpoint) // Write IdProvider const auto idProviderState = PMacc::IdProvider::getState(); - PMacc::log("HDF5: Writing IdProvider state (StartId: %1%, NextId: %2%, maxNumProc: %3%)") + PMacc::log("HDF5: Writing IdProvider state (StartId: %1%, NextId: %2%, maxNumProc: %3%)") % idProviderState.startId % idProviderState.nextId % idProviderState.maxNumProc; writer.setCurrentDataset("picongpu/idProvider/startId"); splash::Domain globalDomain = @@ -190,7 +190,7 @@ void HDF5Output::restart(uint32_t restartStep, const std::string restartDirector writer.setCurrentDataset("picongpu/idProvider/nextId"); writer.getDomainReader()(&idProviderState.nextId, simDim, globalDomain, localDomain); - PMacc::log("HDF5: Setting IdProvider state (StartId: %1%, NextId: %2%, maxNumProc: %3%)") + PMacc::log("HDF5: Setting IdProvider state (StartId: %1%, NextId: %2%, maxNumProc: %3%)") % idProviderState.startId % idProviderState.nextId % idProviderState.maxNumProc; PMacc::IdProvider::setState(idProviderState); @@ -230,4 +230,4 @@ void HDF5Output::pluginUnload() } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/LoadParticleAttribute.hpp b/include/plugins/hdf5/LoadParticleAttribute.hpp index 1fddb09..c005782 100644 --- a/include/plugins/hdf5/LoadParticleAttribute.hpp +++ b/include/plugins/hdf5/LoadParticleAttribute.hpp @@ -19,9 +19,9 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -51,7 +51,7 @@ struct LoadParticleAttribute typedef typename Resolve_t::type ValueType; constexpr uint32_t numComponents = PMacc::traits::GetNComponents::value; - PMacc::log("HDF5: (begin) load species attribute: %1%") % T_Identifier::getName(); + PMacc::log("HDF5: (begin) load species attribute: %1%") % T_Identifier::getName(); T_SplashReader reader = inReader[traits::OpenPMDName::get()]; typedef typename PMacc::traits::GetComponentsType::type ComponentValueType; @@ -77,11 +77,11 @@ struct LoadParticleAttribute } __deleteArray(tmpArray); - PMacc::log("HDF5: ( end ) load species attribute: %1%") % T_Identifier::getName(); + PMacc::log("HDF5: ( end ) load species attribute: %1%") % T_Identifier::getName(); } }; } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/RngStateBoxReader.hpp b/include/plugins/hdf5/RngStateBoxReader.hpp index aee11ab..3ec2284 100644 --- a/include/plugins/hdf5/RngStateBoxReader.hpp +++ b/include/plugins/hdf5/RngStateBoxReader.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/DataBoxReader.hpp" #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -79,4 +79,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/RngStateBoxWriter.hpp b/include/plugins/hdf5/RngStateBoxWriter.hpp index e42b8eb..f7c3b6f 100644 --- a/include/plugins/hdf5/RngStateBoxWriter.hpp +++ b/include/plugins/hdf5/RngStateBoxWriter.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/DataBoxReader.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -78,4 +78,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashAttributeReader.hpp b/include/plugins/hdf5/SplashAttributeReader.hpp index fa27d98..3d98f3c 100644 --- a/include/plugins/hdf5/SplashAttributeReader.hpp +++ b/include/plugins/hdf5/SplashAttributeReader.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/SplashBaseAttributeReader.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -70,4 +70,4 @@ splash::DCAttributeInfo* SplashGlobalAttributeReader::readImpl(const std::string } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashAttributeWriter.hpp b/include/plugins/hdf5/SplashAttributeWriter.hpp index bbc7778..4410854 100644 --- a/include/plugins/hdf5/SplashAttributeWriter.hpp +++ b/include/plugins/hdf5/SplashAttributeWriter.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/SplashBaseAttributeWriter.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -96,4 +96,4 @@ void SplashGlobalAttributeWriter::write(const splash::CollectionType& colType, c } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashBaseAttributeReader.hpp b/include/plugins/hdf5/SplashBaseAttributeReader.hpp index ce8d202..10ca586 100644 --- a/include/plugins/hdf5/SplashBaseAttributeReader.hpp +++ b/include/plugins/hdf5/SplashBaseAttributeReader.hpp @@ -19,14 +19,14 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToSplash.hpp" #include #include #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { namespace detail { @@ -137,4 +137,4 @@ namespace detail { } // namespace detail } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashBaseAttributeWriter.hpp b/include/plugins/hdf5/SplashBaseAttributeWriter.hpp index a092a44..7bfe64c 100644 --- a/include/plugins/hdf5/SplashBaseAttributeWriter.hpp +++ b/include/plugins/hdf5/SplashBaseAttributeWriter.hpp @@ -19,14 +19,14 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToSplash.hpp" #include #include #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { namespace detail { @@ -93,4 +93,4 @@ namespace detail { } // namespace detail } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashDomainReader.hpp b/include/plugins/hdf5/SplashDomainReader.hpp index c56888a..a4a9ffb 100644 --- a/include/plugins/hdf5/SplashDomainReader.hpp +++ b/include/plugins/hdf5/SplashDomainReader.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToSplash.hpp" #include "plugins/hdf5/splashUtils.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -65,7 +65,7 @@ namespace hdf5 { template void SplashDomainReader::operator()(const T data, unsigned numDims, const splash::Domain& globalDomain, const splash::Domain& localDomain) { - PMacc::log("HDF5: reading %4%D record %1% (globalDomain: %2%, localDomain: %3%") + PMacc::log("HDF5: reading %4%D record %1% (globalDomain: %2%, localDomain: %3%") % datasetName_ % globalDomain.toString() % localDomain.toString() % numDims; typename traits::PICToSplash::type splashType; @@ -110,4 +110,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashDomainWriter.hpp b/include/plugins/hdf5/SplashDomainWriter.hpp index 864830e..7fd1564 100644 --- a/include/plugins/hdf5/SplashDomainWriter.hpp +++ b/include/plugins/hdf5/SplashDomainWriter.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToSplash.hpp" #include "plugins/hdf5/splashUtils.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -49,7 +49,7 @@ namespace hdf5 { template void SplashDomainWriter::operator()(const T* data, unsigned numDims, const splash::Domain& globalDomain, const splash::Domain& localDomain) { - PMacc::log("HDF5: writing %4%D record %1% (globalDomain: %2%, localDomain: %3%") + PMacc::log("HDF5: writing %4%D record %1% (globalDomain: %2%, localDomain: %3%") % datasetName_ % globalDomain.toString() % localDomain.toString() % numDims; typename traits::PICToSplash::type splashType; @@ -70,4 +70,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashFieldReader.hpp b/include/plugins/hdf5/SplashFieldReader.hpp index fd3d49e..a64c557 100644 --- a/include/plugins/hdf5/SplashFieldReader.hpp +++ b/include/plugins/hdf5/SplashFieldReader.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToSplash.hpp" #include "plugins/hdf5/splashUtils.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -66,7 +66,7 @@ namespace hdf5 { template void SplashFieldReader::operator()(T* data, unsigned numDims, const splash::Dimensions& globalSize, const splash::Domain& localDomain) { - PMacc::log("HDF5: reading %4%D record %1% (globalSize: %2%, localDomain: %3%") + PMacc::log("HDF5: reading %4%D record %1% (globalSize: %2%, localDomain: %3%") % datasetName_ % globalSize.toString() % localDomain.toString() % numDims; typename traits::PICToSplash::type splashType; @@ -135,4 +135,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashFieldWriter.hpp b/include/plugins/hdf5/SplashFieldWriter.hpp index fb0dfd9..aa3bc59 100644 --- a/include/plugins/hdf5/SplashFieldWriter.hpp +++ b/include/plugins/hdf5/SplashFieldWriter.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToSplash.hpp" #include "plugins/hdf5/splashUtils.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -56,7 +56,7 @@ namespace hdf5 { template void SplashFieldWriter::operator()(const T* data, unsigned numDims, const splash::Dimensions& globalSize, const splash::Domain& localDomain) { - PMacc::log("HDF5: writing %4%D record %1% (globalSize: %2%, localDomain: %3%") + PMacc::log("HDF5: writing %4%D record %1% (globalSize: %2%, localDomain: %3%") % datasetName_ % globalSize.toString() % localDomain.toString() % numDims; typename traits::PICToSplash::type splashType; @@ -81,4 +81,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashPolyDataWriter.hpp b/include/plugins/hdf5/SplashPolyDataWriter.hpp index 0d41dda..338e1db 100644 --- a/include/plugins/hdf5/SplashPolyDataWriter.hpp +++ b/include/plugins/hdf5/SplashPolyDataWriter.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToSplash.hpp" #include "plugins/hdf5/splashUtils.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -57,7 +57,7 @@ namespace hdf5 { const splash::Dimensions& globalSize, const splash::Domain& localDomain) { - PMacc::log("HDF5: writing %5%D record %1% (globalDomain: %2%, globalSize: %3%, localDomain: %4%") + PMacc::log("HDF5: writing %5%D record %1% (globalDomain: %2%, globalSize: %3%, localDomain: %4%") % datasetName_ % globalDomain.toString() % globalSize.toString() % localDomain.toString() % numDims; typename traits::PICToSplash::type splashType; @@ -78,4 +78,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/SplashWriter.hpp b/include/plugins/hdf5/SplashWriter.hpp index cc733b5..18f92cc 100644 --- a/include/plugins/hdf5/SplashWriter.hpp +++ b/include/plugins/hdf5/SplashWriter.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/SplashAttributeWriter.hpp" #include "plugins/hdf5/SplashFieldWriter.hpp" #include "plugins/hdf5/SplashDomainWriter.hpp" @@ -28,7 +28,7 @@ #include "plugins/hdf5/SplashFieldReader.hpp" #include "plugins/hdf5/SplashDomainReader.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -170,4 +170,4 @@ SplashDomainReader SplashWriter::getDomainReader() } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/WriteParticleAttribute.hpp b/include/plugins/hdf5/WriteParticleAttribute.hpp index 518f858..7390463 100644 --- a/include/plugins/hdf5/WriteParticleAttribute.hpp +++ b/include/plugins/hdf5/WriteParticleAttribute.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/PICToOpenPMD.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -51,7 +51,7 @@ struct WriteParticleAttribute typedef typename Resolve_t::type ValueType; constexpr uint32_t numComponents = PMacc::traits::GetNComponents::value; - PMacc::log("HDF5: (begin) write species attribute: %1%") % T_Identifier::getName(); + PMacc::log("HDF5: (begin) write species attribute: %1%") % T_Identifier::getName(); T_SplashWriter writer = inWriter[traits::OpenPMDName::get()]; @@ -96,11 +96,11 @@ struct WriteParticleAttribute writeAttribute("macroWeighted", uint32_t(0)); writeAttribute("weightingPower", float_64(1)); - PMacc::log("HDF5: ( end ) write species attribute: %1%") % T_Identifier::getName(); + PMacc::log("HDF5: ( end ) write species attribute: %1%") % T_Identifier::getName(); } }; } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/interpolationHelpers.hpp b/include/plugins/hdf5/interpolationHelpers.hpp index 64f1c74..882f898 100644 --- a/include/plugins/hdf5/interpolationHelpers.hpp +++ b/include/plugins/hdf5/interpolationHelpers.hpp @@ -22,7 +22,7 @@ #include "plugins/hdf5/SplashWriter.hpp" #include "plugins/openPMD/helpers.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -78,4 +78,4 @@ namespace hdf5 { } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/hdf5/splashUtils.hpp b/include/plugins/hdf5/splashUtils.hpp index fab8e29..85b7d6c 100644 --- a/include/plugins/hdf5/splashUtils.hpp +++ b/include/plugins/hdf5/splashUtils.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace hdf5 { @@ -93,4 +93,4 @@ bool isDomainValid(const splash::Domain& domain, unsigned numDims) } // namespace hdf5 } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/imaging/PngCreator.hpp b/include/plugins/imaging/PngCreator.hpp index 8654cd6..1360be4 100644 --- a/include/plugins/imaging/PngCreator.hpp +++ b/include/plugins/imaging/PngCreator.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace imaging { @@ -50,4 +50,4 @@ namespace imaging { } // namespace imaging } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/imaging/TiffCreator.hpp b/include/plugins/imaging/TiffCreator.hpp index a53c62b..4180a73 100644 --- a/include/plugins/imaging/TiffCreator.hpp +++ b/include/plugins/imaging/TiffCreator.hpp @@ -19,11 +19,11 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace imaging { @@ -48,4 +48,4 @@ namespace imaging { } // namespace imaging } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/LoadFields.hpp b/include/plugins/openPMD/LoadFields.hpp index 88e54db..fca165f 100644 --- a/include/plugins/openPMD/LoadFields.hpp +++ b/include/plugins/openPMD/LoadFields.hpp @@ -19,10 +19,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/DataBoxReader.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -36,7 +36,7 @@ struct LoadField template void operator()(const std::string& name, const GridLayout& fieldLayout, T_DataBox fieldBox) { - PMacc::log("Begin loading field '%1%'") % name; + PMacc::log("Begin loading field '%1%'") % name; const auto& subGrid = Environment::get().SubGrid(); @@ -52,7 +52,7 @@ struct LoadField ) ); - PMacc::log("Finished loading field '%1%'") % name; + PMacc::log("Finished loading field '%1%'") % name; } }; @@ -85,4 +85,4 @@ struct LoadFields } //namespace openPMD } //namespace plugins -} //namespace xrt +} //namespace parataxis diff --git a/include/plugins/openPMD/LoadSpecies.hpp b/include/plugins/openPMD/LoadSpecies.hpp index 5df74a0..c03820f 100644 --- a/include/plugins/openPMD/LoadSpecies.hpp +++ b/include/plugins/openPMD/LoadSpecies.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/LoadParticleAttribute.hpp" #include "plugins/hdf5/splashUtils.hpp" #include "plugins/openPMD/PatchReader.hpp" @@ -35,7 +35,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -71,11 +71,11 @@ struct LoadSpecies { using namespace PMacc::algorithms::forEach; - PMacc::log("HDF5: (begin) read species: %1%") % FrameType::getName(); + PMacc::log("HDF5: (begin) read species: %1%") % FrameType::getName(); reader.setCurrentDataset(std::string("particles/") + FrameType::getName()); ParticlePatches particlePatches = PatchReader()(reader, Environment::get().GridController().getGlobalSize()); - PMacc::log("HDF5: Loaded patches: %1%") % particlePatches.toString(); + PMacc::log("HDF5: Loaded patches: %1%") % particlePatches.toString(); const auto& subGrid = Environment::get().SubGrid(); @@ -103,17 +103,17 @@ struct LoadSpecies if(exactlyMyPatch) { - PMacc::log("HDF5: Found local patch: %1%") % i; + PMacc::log("HDF5: Found local patch: %1%") % i; patchNumParticles = particlePatches.numParticles[i]; patchParticleOffset = particlePatches.numParticlesOffset[i]; break; } } - PMacc::log("HDF5: Loading %1% particles from offset %2%") % patchNumParticles % patchParticleOffset; + PMacc::log("HDF5: Loading %1% particles from offset %2%") % patchNumParticles % patchParticleOffset; Hdf5FrameType hostFrame; - PMacc::log("HDF5: malloc mapped memory: %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: malloc mapped memory: %1%") % Hdf5FrameType::getName(); /*malloc mapped memory*/ ForEach > mallocMem; mallocMem(PMacc::forward(hostFrame), patchNumParticles); @@ -123,7 +123,7 @@ struct LoadSpecies if(patchNumParticles > 0) { - PMacc::log("HDF5: get mapped memory device pointer: %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: get mapped memory device pointer: %1%") % Hdf5FrameType::getName(); /*load device pointer of mapped memory*/ Hdf5FrameType deviceFrame; ForEach > getDevicePtr; @@ -137,7 +137,7 @@ struct LoadSpecies PMacc::particles::operations::splitIntoListOfFrames(speciesTmp, deviceFrame, patchNumParticles, restartChunkSize, cellsInSuperCell, - subGrid.getLocalDomain().offset, cellDescription, XRTLogLvl::IN_OUT()); + subGrid.getLocalDomain().offset, cellDescription, PARATAXISLogLvl::IN_OUT()); /*free host memory*/ ForEach > freeMem; @@ -145,10 +145,10 @@ struct LoadSpecies dc.releaseData(FrameType::getName()); } - PMacc::log("HDF5: ( end ) read species: %1%") % FrameType::getName(); + PMacc::log("HDF5: ( end ) read species: %1%") % FrameType::getName(); } }; } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/ParticlePatches.hpp b/include/plugins/openPMD/ParticlePatches.hpp index 6aa7dfa..7fe62e5 100644 --- a/include/plugins/openPMD/ParticlePatches.hpp +++ b/include/plugins/openPMD/ParticlePatches.hpp @@ -22,7 +22,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -80,4 +80,4 @@ namespace openPMD { } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/PatchReader.hpp b/include/plugins/openPMD/PatchReader.hpp index 5a239c8..6273d5d 100644 --- a/include/plugins/openPMD/PatchReader.hpp +++ b/include/plugins/openPMD/PatchReader.hpp @@ -21,7 +21,7 @@ #include "plugins/openPMD/ParticlePatches.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -66,4 +66,4 @@ void PatchReader::read(T_SplashReader&& reader, std::vector& values, u } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/WriteField.hpp b/include/plugins/openPMD/WriteField.hpp index 354bf95..5e87178 100644 --- a/include/plugins/openPMD/WriteField.hpp +++ b/include/plugins/openPMD/WriteField.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/DataBoxWriter.hpp" #include "debug/LogLevels.hpp" #include -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -47,7 +47,7 @@ struct WriteField { using ValueType = typename T_DataBox::ValueType; - PMacc::log("HDF5: write field: %1%") % name; + PMacc::log("HDF5: write field: %1%") % name; const SubGrid& subGrid = Environment::get().SubGrid(); /* parameter checking */ @@ -106,4 +106,4 @@ struct WriteField } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/WriteFields.hpp b/include/plugins/openPMD/WriteFields.hpp index f0f37e6..cbb9477 100644 --- a/include/plugins/openPMD/WriteFields.hpp +++ b/include/plugins/openPMD/WriteFields.hpp @@ -17,10 +17,10 @@ * along with ParaTAXIS. If not, see . */ -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/openPMD/WriteField.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -63,4 +63,4 @@ class WriteFields }; } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/WriteHeader.hpp b/include/plugins/openPMD/WriteHeader.hpp index e6e5c41..d1f36c2 100644 --- a/include/plugins/openPMD/WriteHeader.hpp +++ b/include/plugins/openPMD/WriteHeader.hpp @@ -19,12 +19,12 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "version.hpp" #include "plugins/common/stringHelpers.hpp" #include "plugins/hdf5/SplashWriter.hpp" -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -50,11 +50,11 @@ struct WriteHeader std::string author = Environment::get().SimulationDescription().getAuthor(); if(!author.empty()) writeGlobalAttribute("author", author); - writeGlobalAttribute("software", "XRT"); + writeGlobalAttribute("software", "PARATAXIS"); std::stringstream softwareVersion; - softwareVersion << XRT_VERSION_MAJOR << "." - << XRT_VERSION_MINOR << "." - << XRT_VERSION_PATCH; + softwareVersion << PARATAXIS_VERSION_MAJOR << "." + << PARATAXIS_VERSION_MINOR << "." + << PARATAXIS_VERSION_PATCH; writeGlobalAttribute("softwareVersion", softwareVersion.str()); writeGlobalAttribute("date", common::getDateString("%F %T %z")); @@ -88,4 +88,4 @@ void writeHeader(hdf5::SplashWriter& writer, const std::string& } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/WriteSpecies.hpp b/include/plugins/openPMD/WriteSpecies.hpp index a15e11c..f826212 100644 --- a/include/plugins/openPMD/WriteSpecies.hpp +++ b/include/plugins/openPMD/WriteSpecies.hpp @@ -20,7 +20,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/hdf5/WriteParticleAttribute.hpp" #include "plugins/hdf5/splashUtils.hpp" #include "plugins/common/helpers.hpp" @@ -36,7 +36,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -72,32 +72,32 @@ struct WriteSpecies { using namespace PMacc::algorithms::forEach; - PMacc::log("HDF5: (begin) write species: %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: (begin) write species: %1%") % Hdf5FrameType::getName(); auto& dc = Environment::get().DataConnector(); const auto& subGrid = Environment::get().SubGrid(); /* load particle without copy particle data to host */ T_Species& speciesTmp = dc.getData(FrameType::getName()); /* count number of particles for this species on the device */ - PMacc::log("HDF5: (begin) count particles: %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: (begin) count particles: %1%") % Hdf5FrameType::getName(); uint64_t numParticles = PMacc::CountParticles::countOnDevice< PMacc::CORE + PMacc::BORDER >( speciesTmp, cellDescription, NoFilter() ); - PMacc::log("HDF5: ( end ) count particles: %1% = %2%") % Hdf5FrameType::getName() % numParticles; + PMacc::log("HDF5: ( end ) count particles: %1% = %2%") % Hdf5FrameType::getName() % numParticles; Hdf5FrameType hostFrame; - PMacc::log("HDF5: (begin) malloc host memory: %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: (begin) malloc host memory: %1%") % Hdf5FrameType::getName(); /*malloc memory on host*/ ForEach > mallocMem; mallocMem(PMacc::forward(hostFrame), numParticles); - PMacc::log("HDF5: ( end ) malloc host memory: %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: ( end ) malloc host memory: %1%") % Hdf5FrameType::getName(); if (numParticles != 0) { - PMacc::log("HDF5: (begin) copy particle host (with hierarchy) to host (without hierarchy): %1% (%2%)") + PMacc::log("HDF5: (begin) copy particle host (with hierarchy) to host (without hierarchy): %1% (%2%)") % Hdf5FrameType::getName() % numParticles; PMacc::MallocMCBuffer& mallocMCBuffer = dc.getData(PMacc::MallocMCBuffer::getName()); @@ -119,7 +119,7 @@ struct WriteSpecies dc.releaseData(PMacc::MallocMCBuffer::getName()); assert(globalParticleOffset == numParticles); - PMacc::log("HDF5: ( end ) copy particle host (with hierarchy) to host (without hierarchy): %1% (%2%)") + PMacc::log("HDF5: ( end ) copy particle host (with hierarchy) to host (without hierarchy): %1% (%2%)") % Hdf5FrameType::getName() % globalParticleOffset; } @@ -127,7 +127,7 @@ struct WriteSpecies * do an allgather during write to find out the global number of * particles. */ - PMacc::log("HDF5: (begin) collect particle sizes for %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: (begin) collect particle sizes for %1%") % Hdf5FrameType::getName(); auto& gc = Environment::get().GridController(); @@ -168,10 +168,10 @@ struct WriteSpecies if( particleCounts.at(2 * r + 1) < myParticlePatch[ 1 ] ) numParticlesOffset += particleCounts.at(2 * r); } - PMacc::log("HDF5: ( end ) collect particle sizes for %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: ( end ) collect particle sizes for %1%") % Hdf5FrameType::getName(); /* dump non-constant particle records to hdf5 file */ - PMacc::log("HDF5: (begin) write particle records for %1% (%2%:%3%)") + PMacc::log("HDF5: (begin) write particle records for %1% (%2%:%3%)") % Hdf5FrameType::getName() % numParticles % numParticlesOffset; writer.setCurrentDataset(std::string("particles/") + FrameType::getName()); @@ -211,10 +211,10 @@ struct WriteSpecies writeAttribute("particleInterpolation", "uniform"); writeAttribute("particleSmoothing", "none"); - PMacc::log("HDF5: ( end ) write particle records for %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: ( end ) write particle records for %1%") % Hdf5FrameType::getName(); /* write species particle patch meta information */ - PMacc::log("HDF5: (begin) writing particlePatches for %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: (begin) writing particlePatches for %1%") % Hdf5FrameType::getName(); writer.setCurrentDataset(writer.getCurrentDataset() + "/particlePatches"); @@ -264,9 +264,9 @@ struct WriteSpecies extentWriter.getAttributeWriter()("unitDimension", unitDimensionCellIdx); - PMacc::log("HDF5: ( end ) writing particlePatches for %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: ( end ) writing particlePatches for %1%") % Hdf5FrameType::getName(); - PMacc::log("HDF5: ( end ) writing species: %1%") % Hdf5FrameType::getName(); + PMacc::log("HDF5: ( end ) writing species: %1%") % Hdf5FrameType::getName(); } private: @@ -312,4 +312,4 @@ struct WriteSpecies } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/openPMD/helpers.hpp b/include/plugins/openPMD/helpers.hpp index e2b0946..edc52db 100644 --- a/include/plugins/openPMD/helpers.hpp +++ b/include/plugins/openPMD/helpers.hpp @@ -23,7 +23,7 @@ #include #include -namespace xrt { +namespace parataxis { namespace plugins { namespace openPMD { @@ -147,4 +147,4 @@ std::array getAxisLabels(T_SplashReader&& reader) } // namespace openPMD } // namespace plugins -} // namespace xrt +} // namespace parataxis diff --git a/include/plugins/plugins.hpp b/include/plugins/plugins.hpp index 0592977..3727485 100644 --- a/include/plugins/plugins.hpp +++ b/include/plugins/plugins.hpp @@ -22,30 +22,30 @@ #include "simulation_defines.hpp" #include "plugins/PrintParticles.hpp" #include "plugins/DebugHelper.hpp" -#if (XRT_ENABLE_PNG == 1 || XRT_ENABLE_TIFF == 1) +#if (PARATAXIS_ENABLE_PNG == 1 || PARATAXIS_ENABLE_TIFF == 1) # include "plugins/PrintField.hpp" #endif -#if (XRT_ENABLE_TIFF == 1) +#if (PARATAXIS_ENABLE_TIFF == 1) # include "plugins/TiffToDensity.hpp" #endif // PrintDetector handles TIFF and/or HDF5 output -#if (XRT_ENABLE_TIFF == 1 || XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_TIFF == 1 || PARATAXIS_ENABLE_HDF5 == 1) # include "plugins/PrintDetector.hpp" #endif -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) # include "plugins/hdf5/HDF5Output.hpp" #endif #include -namespace xrt { +namespace parataxis { /* stand alone plugins (no placeholders) */ typedef bmpl::vector< -#if (XRT_ENABLE_TIFF == 1) +#if (PARATAXIS_ENABLE_TIFF == 1) plugins::TiffToDensity #endif -#if (XRT_ENABLE_HDF5 == 1) -# if (XRT_ENABLE_TIFF == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) +# if (PARATAXIS_ENABLE_TIFF == 1) , # endif plugins::hdf5::HDF5Output @@ -62,16 +62,16 @@ namespace xrt { /* field plugins (with placeholder replaced by field) */ typedef bmpl::vector< -#if ENABLE_PRINT_FIELDS && (XRT_ENABLE_PNG == 1 || XRT_ENABLE_TIFF == 1) +#if ENABLE_PRINT_FIELDS && (PARATAXIS_ENABLE_PNG == 1 || PARATAXIS_ENABLE_TIFF == 1) plugins::PrintField #endif > FieldPlugins; /* detector plugins (with placeholder replaced by detector) */ typedef bmpl::vector< -#if ENABLE_PRINT_DETECTORS && (XRT_ENABLE_TIFF == 1 || XRT_ENABLE_HDF5 == 1) +#if ENABLE_PRINT_DETECTORS && (PARATAXIS_ENABLE_TIFF == 1 || PARATAXIS_ENABLE_HDF5 == 1) plugins::PrintDetector #endif > DetectorPlugins; -} // namespace xrt +} // namespace parataxis diff --git a/include/simulationControl/SimulationStarter.hpp b/include/simulationControl/SimulationStarter.hpp index bc7c9f8..d69e547 100644 --- a/include/simulationControl/SimulationStarter.hpp +++ b/include/simulationControl/SimulationStarter.hpp @@ -19,7 +19,7 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "plugins/plugins.hpp" #include "plugins/ISimulationPlugin.hpp" #include "fields/DensityField.hpp" @@ -31,7 +31,7 @@ #include #include -namespace xrt{ +namespace parataxis{ namespace po = boost::program_options; @@ -74,7 +74,7 @@ namespace xrt{ { PMacc::PluginConnector& pluginConnector = Environment::get().PluginConnector(); pluginConnector.loadPlugins(); - PMacc::log< XRTLogLvl::SIM_STATE >("Startup"); + PMacc::log< PARATAXISLogLvl::SIM_STATE >("Startup"); simulationClass.startSimulation(); } @@ -95,23 +95,23 @@ namespace xrt{ void load() { - PMacc::log< XRTLogLvl::SIM_STATE >("Loading simulation"); + PMacc::log< PARATAXISLogLvl::SIM_STATE >("Loading simulation"); simulationClass.load(); - PMacc::log< XRTLogLvl::SIM_STATE >("Loading plugins"); + PMacc::log< PARATAXISLogLvl::SIM_STATE >("Loading plugins"); for(auto&& plugin: Environment::get().PluginConnector().getPluginsFromType()) plugin->setMappingDesc(simulationClass.getMappingDesc()); - PMacc::log< XRTLogLvl::SIM_STATE >("Loading done"); + PMacc::log< PARATAXISLogLvl::SIM_STATE >("Loading done"); } void unload() { PMacc::PluginConnector& pluginConnector = Environment::get().PluginConnector(); - PMacc::log< XRTLogLvl::SIM_STATE >("Unloading plugins"); + PMacc::log< PARATAXISLogLvl::SIM_STATE >("Unloading plugins"); pluginConnector.unloadPlugins(); - PMacc::log< XRTLogLvl::SIM_STATE >("Unloading simulation"); + PMacc::log< PARATAXISLogLvl::SIM_STATE >("Unloading simulation"); simulationClass.unload(); - PMacc::log< XRTLogLvl::SIM_STATE >("Everything unloaded"); + PMacc::log< PARATAXISLogLvl::SIM_STATE >("Everything unloaded"); } private: @@ -200,4 +200,4 @@ namespace xrt{ return ArgsErrorCode::SUCCESS; } }; -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines.hpp b/include/simulation_defines.hpp index d464975..31cdef6 100644 --- a/include/simulation_defines.hpp +++ b/include/simulation_defines.hpp @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace bmpl = boost::mpl; enum class CommTag: uint32_t @@ -29,7 +29,7 @@ namespace xrt { SPECIES_FIRSTTAG /* This needs to be the last one! */ }; -} // namespace xrt +} // namespace parataxis /* Use #include <> to allow user overrides */ #include diff --git a/include/simulation_defines/param/FieldManipulator.param b/include/simulation_defines/param/FieldManipulator.param index 59aa424..494c8a4 100644 --- a/include/simulation_defines/param/FieldManipulator.param +++ b/include/simulation_defines/param/FieldManipulator.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace fieldManipulators { /** Static field */ @@ -32,4 +32,4 @@ namespace xrt { } // namespace fieldManipulators using FieldManipulator = fieldManipulators::Static; -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/detectorConfig.param b/include/simulation_defines/param/detectorConfig.param index 6cf705d..dee8806 100644 --- a/include/simulation_defines/param/detectorConfig.param +++ b/include/simulation_defines/param/detectorConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace detector { namespace particleHandlers { @@ -74,4 +74,4 @@ namespace detector { }; } // namespace detector -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/dimension.param b/include/simulation_defines/param/dimension.param index 004db34..691e340 100644 --- a/include/simulation_defines/param/dimension.param +++ b/include/simulation_defines/param/dimension.param @@ -19,8 +19,8 @@ #pragma once -namespace xrt { +namespace parataxis { constexpr uint32_t simDim = 3; -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/gridConfig.param b/include/simulation_defines/param/gridConfig.param index 47e841a..1f0c203 100644 --- a/include/simulation_defines/param/gridConfig.param +++ b/include/simulation_defines/param/gridConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace SI { /** Duration of one timestep @@ -37,4 +37,4 @@ namespace SI { constexpr float_64 CELL_DEPTH = CELL_WIDTH; } // namespace SI -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/initialDensity.param b/include/simulation_defines/param/initialDensity.param index 3f7ab8d..ed7f594 100644 --- a/include/simulation_defines/param/initialDensity.param +++ b/include/simulation_defines/param/initialDensity.param @@ -21,7 +21,7 @@ #include "math/vector/compile-time/UInt32.hpp" -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators{ @@ -146,4 +146,4 @@ namespace initialDensity { AvailableGenerators::DoubleSlit; } // namespace initialDensity -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/laserConfig.param b/include/simulation_defines/param/laserConfig.param index cff4e9d..0f50808 100644 --- a/include/simulation_defines/param/laserConfig.param +++ b/include/simulation_defines/param/laserConfig.param @@ -21,7 +21,7 @@ #include -namespace xrt { +namespace parataxis { namespace laserConfig { /* Initialization for the 'laser' */ @@ -96,4 +96,4 @@ namespace laserConfig { constexpr int32_t DIRECTION = 0; } // namespace laserConfig -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/memory.param b/include/simulation_defines/param/memory.param index b2611d3..c2dcb48 100644 --- a/include/simulation_defines/param/memory.param +++ b/include/simulation_defines/param/memory.param @@ -22,7 +22,7 @@ #include #include -namespace xrt { +namespace parataxis { constexpr uint32_t KiB = 1024; constexpr uint32_t MiB = 1024 * KiB; @@ -48,4 +48,4 @@ namespace xrt { } // namespace exchangeSize -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/physicalConstants.param b/include/simulation_defines/param/physicalConstants.param index d900311..e8fdc21 100644 --- a/include/simulation_defines/param/physicalConstants.param +++ b/include/simulation_defines/param/physicalConstants.param @@ -20,7 +20,7 @@ #pragma once -namespace xrt { +namespace parataxis { constexpr float_64 PI = 3.141592653589793238462643383279502884197169399; @@ -63,4 +63,4 @@ namespace xrt { // constexpr float_64 UNITCONV_keV_to_Joule = 1.60217646e-16; constexpr float_64 UNITCONV_Joule_to_keV = (1.0 / UNITCONV_keV_to_Joule); -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/precision.param b/include/simulation_defines/param/precision.param index 97f4f1d..1c43272 100644 --- a/include/simulation_defines/param/precision.param +++ b/include/simulation_defines/param/precision.param @@ -20,7 +20,7 @@ #pragma once -namespace xrt +namespace parataxis { namespace precision32Bit{} namespace precision64Bit{} @@ -31,18 +31,18 @@ namespace xrt * - precision64Bit : use 64Bit floating point numbers (need CUDA_ARCH>=sm_20) * [significant digits 15 to 16] */ - namespace precisionXRT = precision32Bit; + namespace precisionPARATAXIS = precision32Bit; /*! Select a precision special operations (can be different from simulation precision) - * - precisionXRT : use precision which is selected on top + * - precisionPARATAXIS : use precision which is selected on top * - precision32Bit : use 32Bit floating point numbers * - precision64Bit : use 64Bit floating point numbers */ - namespace precisionSqrt = precisionXRT; - namespace precisionExp = precisionXRT; - namespace precisionTrigonometric = precisionXRT; + namespace precisionSqrt = precisionPARATAXIS; + namespace precisionExp = precisionPARATAXIS; + namespace precisionTrigonometric = precisionPARATAXIS; -}//namespace xrt +}//namespace parataxis #include "simulation_defines/unitless/precision.unitless" diff --git a/include/simulation_defines/param/pusherConfig.param b/include/simulation_defines/param/pusherConfig.param index b3a2954..db60eea 100644 --- a/include/simulation_defines/param/pusherConfig.param +++ b/include/simulation_defines/param/pusherConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace particles { namespace pusher { @@ -28,4 +28,4 @@ namespace pusher { } // namespace pusher } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/renamings.param b/include/simulation_defines/param/renamings.param index 517563d..229fff5 100644 --- a/include/simulation_defines/param/renamings.param +++ b/include/simulation_defines/param/renamings.param @@ -32,7 +32,7 @@ namespace rng { } // namespace nvidia } // namespace PMacc -namespace xrt { +namespace parataxis { using PMacc::algorithms::precisionCast::precisionCast; @@ -59,4 +59,4 @@ namespace xrt { template< class T > using remove_reference_t = typename std::remove_reference::type; -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/rngConfig.param b/include/simulation_defines/param/rngConfig.param index 1bd95a3..a3cd274 100644 --- a/include/simulation_defines/param/rngConfig.param +++ b/include/simulation_defines/param/rngConfig.param @@ -23,22 +23,22 @@ #include -#ifndef XRT_USE_SLOW_RNG -# define XRT_USE_SLOW_RNG 0 +#ifndef PARATAXIS_USE_SLOW_RNG +# define PARATAXIS_USE_SLOW_RNG 0 #endif -#if XRT_USE_SLOW_RNG +#if PARATAXIS_USE_SLOW_RNG # include "nvidia/rng/RNG.hpp" # include "nvidia/rng/methods/Xor.hpp" # include "nvidia/rng/distributions/Uniform_float.hpp" # include "mpi/SeedPerRank.hpp" #endif -namespace xrt { +namespace parataxis { using RNGProvider = PMacc::random::RNGProvider; -#if XRT_USE_SLOW_RNG +#if PARATAXIS_USE_SLOW_RNG namespace nvrng = PMacc::nvidia::rng; namespace rngMethods = nvrng::methods; namespace rngDistributions = nvrng::distributions; @@ -81,4 +81,4 @@ namespace xrt { #endif -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/scattererConfig.param b/include/simulation_defines/param/scattererConfig.param index 5aae4c3..8f5bd4a 100644 --- a/include/simulation_defines/param/scattererConfig.param +++ b/include/simulation_defines/param/scattererConfig.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace particles { namespace scatterer { @@ -78,4 +78,4 @@ namespace scatterer { } // namespace scatterer } // namespace particles -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/seed.param b/include/simulation_defines/param/seed.param index 4302d80..2f893be 100644 --- a/include/simulation_defines/param/seed.param +++ b/include/simulation_defines/param/seed.param @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace seeds { /** global seed @@ -48,4 +48,4 @@ namespace seeds { static constexpr uint32_t xorRNG = 0xC24E47F2; } // namespace seeds -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/speciesAttributes.param b/include/simulation_defines/param/speciesAttributes.param index 465a876..1df3591 100644 --- a/include/simulation_defines/param/speciesAttributes.param +++ b/include/simulation_defines/param/speciesAttributes.param @@ -26,7 +26,7 @@ #include #include -namespace xrt { +namespace parataxis { /** relative (to cell origin) in-cell position of a particle * With this definition we don't define any type like float3, double3,... @@ -76,4 +76,4 @@ namespace xrt { alias(mass); alias(charge); -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/speciesDefinition.param b/include/simulation_defines/param/speciesDefinition.param index c72e7c8..8338281 100644 --- a/include/simulation_defines/param/speciesDefinition.param +++ b/include/simulation_defines/param/speciesDefinition.param @@ -21,12 +21,12 @@ #include "simulation_defines.hpp" #include "particles/Particles.hpp" -#include "particles/XrtParticleDescription.hpp" +#include "particles/ParataxisParticleDescription.hpp" #include #include #include -namespace xrt { +namespace parataxis { /*########################### define particle attributes #####################*/ @@ -36,7 +36,7 @@ namespace xrt { direction, //particleId, //creationTime, -#if XRT_FORCE_SINGLE_SCATTERING +#if PARATAXIS_FORCE_SINGLE_SCATTERING wasScattered, #endif startPhase @@ -72,7 +72,7 @@ namespace xrt { /*define species photons*/ typedef Particles< - xrt::particles::ParticleDescription< + parataxis::particles::ParticleDescription< bmpl::string<'p'>, SuperCellSize, DefaultAttributesSeq, @@ -80,4 +80,4 @@ namespace xrt { > > PIC_Photons; -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/param/types.param b/include/simulation_defines/param/types.param index 46eff22..c2fb4b7 100644 --- a/include/simulation_defines/param/types.param +++ b/include/simulation_defines/param/types.param @@ -25,7 +25,7 @@ #include #include -namespace xrt { +namespace parataxis { typedef PMacc::Environment Environment; typedef PMacc::DataSpace Space; @@ -34,4 +34,4 @@ namespace xrt { typedef PMacc::GridLayout GridLayout; typedef PMacc::SubGrid SubGrid; -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/unitless/FieldManipulator.unitless b/include/simulation_defines/unitless/FieldManipulator.unitless index 676de5c..d736d71 100644 --- a/include/simulation_defines/unitless/FieldManipulator.unitless +++ b/include/simulation_defines/unitless/FieldManipulator.unitless @@ -22,7 +22,7 @@ #include "fields/DensityField.hpp" #include "fields/StaticManipulator.hpp" #include "fields/RandomManipulator.hpp" -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) # include "fields/HDF5FieldInterpolator.hpp" #endif @@ -30,22 +30,22 @@ namespace PMacc { namespace traits { template<> - struct Resolve + struct Resolve { - using type = xrt::fields::StaticManipulator; + using type = parataxis::fields::StaticManipulator; }; template<> - struct Resolve + struct Resolve { - using type = xrt::fields::RandomManipulator; + using type = parataxis::fields::RandomManipulator; }; -#if (XRT_ENABLE_HDF5 == 1) +#if (PARATAXIS_ENABLE_HDF5 == 1) template<> - struct Resolve + struct Resolve { - using type = xrt::fields::HDF5FieldInterpolator; + using type = parataxis::fields::HDF5FieldInterpolator; }; #endif diff --git a/include/simulation_defines/unitless/detectorConfig.unitless b/include/simulation_defines/unitless/detectorConfig.unitless index cd2a473..947f037 100644 --- a/include/simulation_defines/unitless/detectorConfig.unitless +++ b/include/simulation_defines/unitless/detectorConfig.unitless @@ -27,28 +27,28 @@ namespace PMacc { namespace traits { template<> - struct Resolve + struct Resolve { - using type = xrt::detector::CountParticles<>; + using type = parataxis::detector::CountParticles<>; }; template<> - struct Resolve + struct Resolve { - using type = xrt::detector::AddWaveParticles<>; + using type = parataxis::detector::AddWaveParticles<>; }; template<> - struct Resolve + struct Resolve { - using Config = xrt::detector::PhotonDetector; - using type = xrt::detector::PhotonDetectorImpl; + using Config = parataxis::detector::PhotonDetector; + using type = parataxis::detector::PhotonDetectorImpl; }; template<> - struct Resolve + struct Resolve { - using type = xrt::detector::NoDetectorImpl; + using type = parataxis::detector::NoDetectorImpl; }; }} diff --git a/include/simulation_defines/unitless/gridConfig.unitless b/include/simulation_defines/unitless/gridConfig.unitless index b4fb449..cbdd655 100644 --- a/include/simulation_defines/unitless/gridConfig.unitless +++ b/include/simulation_defines/unitless/gridConfig.unitless @@ -22,7 +22,7 @@ #include -namespace xrt +namespace parataxis { // normed grid parameters constexpr float_X DELTA_T = float_X(SI::DELTA_T / UNIT_TIME); diff --git a/include/simulation_defines/unitless/initialDensity.unitless b/include/simulation_defines/unitless/initialDensity.unitless index a4a08b0..f547f72 100644 --- a/include/simulation_defines/unitless/initialDensity.unitless +++ b/include/simulation_defines/unitless/initialDensity.unitless @@ -21,7 +21,7 @@ #include "generators.hpp" -namespace xrt { +namespace parataxis { namespace initialDensity { namespace AvailableGenerators { @@ -37,63 +37,63 @@ namespace AvailableGenerators { } // namespace AvailableGenerators } // namespace initialDensity -} // namespace xrt +} // namespace parataxis namespace PMacc { namespace traits { template<> - struct Resolve + struct Resolve { - using type = xrt::generators::Const; + using type = parataxis::generators::Const; }; template<> - struct Resolve + struct Resolve { - using type = xrt::generators::Line; + using type = parataxis::generators::Line; }; template<> - struct Resolve + struct Resolve { - using type = xrt::generators::Cuboid; + using type = parataxis::generators::Cuboid; }; template<> - struct Resolve + struct Resolve { - using type = xrt::generators::Cylinder; + using type = parataxis::generators::Cylinder; }; template<> - struct Resolve + struct Resolve { - using type = xrt::generators::Edge; + using type = parataxis::generators::Edge; }; template<> - struct Resolve + struct Resolve { - using type = xrt::generators::DoubleSlit; + using type = parataxis::generators::DoubleSlit; }; template<> - struct Resolve + struct Resolve { - using type = xrt::generators::RaisingLine; + using type = parataxis::generators::RaisingLine; }; template<> - struct Resolve + struct Resolve { - using type = xrt::generators::Strips; + using type = parataxis::generators::Strips; }; template<> - struct Resolve + struct Resolve { - using Cfg = xrt::initialDensity::AvailableGenerators::CombinedGenerator; - using type = xrt::generators::CombinedGenerator; + using Cfg = parataxis::initialDensity::AvailableGenerators::CombinedGenerator; + using type = parataxis::generators::CombinedGenerator; }; }} diff --git a/include/simulation_defines/unitless/laserConfig.unitless b/include/simulation_defines/unitless/laserConfig.unitless index 8aff63f..30b4169 100644 --- a/include/simulation_defines/unitless/laserConfig.unitless +++ b/include/simulation_defines/unitless/laserConfig.unitless @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace laserConfig { /** Maximum in-cell position for the direction in which photons enter */ @@ -36,7 +36,7 @@ namespace laserConfig { PMacc::FRONT; } // namespace laserConfig -} // namespace xrt +} // namespace parataxis #include "particles/initPolicies/ConstDistribution.hpp" @@ -51,7 +51,7 @@ namespace laserConfig { #include #include -namespace xrt { +namespace parataxis { namespace laserConfig { namespace distribution { @@ -66,7 +66,7 @@ namespace position { } // namespace position } // namespace laserConfig -} // namespace xrt +} // namespace parataxis namespace PMacc { namespace traits { @@ -74,45 +74,45 @@ namespace traits { /* Distribution */ template<> - struct Resolve + struct Resolve { - using Value = xrt::laserConfig::distribution::Const; - using type = xrt::particles::initPolicies::ConstDistribution; + using Value = parataxis::laserConfig::distribution::Const; + using type = parataxis::particles::initPolicies::ConstDistribution; }; /* Position */ template<> - struct Resolve + struct Resolve { - using Value = xrt::laserConfig::position::Const; - using type = xrt::particles::initPolicies::ConstPosition; + using Value = parataxis::laserConfig::position::Const; + using type = parataxis::particles::initPolicies::ConstPosition; }; template<> - struct Resolve + struct Resolve { - using type = xrt::particles::initPolicies::EvenDistPosition; + using type = parataxis::particles::initPolicies::EvenDistPosition; }; template<> - struct Resolve + struct Resolve { - using Value = xrt::laserConfig::position::Random; - using type = xrt::particles::initPolicies::RandomPosition; + using Value = parataxis::laserConfig::position::Random; + using type = parataxis::particles::initPolicies::RandomPosition; }; /* Phase */ template<> - struct Resolve + struct Resolve { - using type = xrt::particles::initPolicies::PlaneWavePhase; + using type = parataxis::particles::initPolicies::PlaneWavePhase; }; /* Direction */ template<> - struct Resolve + struct Resolve { - using Value = xrt::laserConfig::direction::Const; - using type = xrt::particles::initPolicies::ConstDirection; + using Value = parataxis::laserConfig::direction::Const; + using type = parataxis::particles::initPolicies::ConstDirection; }; } // namespace traits diff --git a/include/simulation_defines/unitless/physicalConstants.unitless b/include/simulation_defines/unitless/physicalConstants.unitless index 1b6c491..5f187c0 100644 --- a/include/simulation_defines/unitless/physicalConstants.unitless +++ b/include/simulation_defines/unitless/physicalConstants.unitless @@ -20,7 +20,7 @@ #pragma once -namespace xrt { +namespace parataxis { /** Unit of Speed */ constexpr float_64 UNIT_SPEED = SI::SPEED_OF_LIGHT; @@ -39,4 +39,4 @@ namespace xrt { constexpr float_64 PLANCK_CONSTANT = SI::PLANCK_CONSTANT / (UNIT_ENERGY * UNIT_TIME); -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/unitless/precision.unitless b/include/simulation_defines/unitless/precision.unitless index 6b4303e..d74d4cf 100644 --- a/include/simulation_defines/unitless/precision.unitless +++ b/include/simulation_defines/unitless/precision.unitless @@ -21,7 +21,7 @@ #include "math/Vector.hpp" -namespace xrt +namespace parataxis { namespace precision32Bit @@ -45,11 +45,11 @@ namespace xrt } /*variable precision defines*/ - typedef precisionXRT::float_X float_X; - typedef precisionXRT::float1_X float1_X; - typedef precisionXRT::float2_X float2_X; - typedef precisionXRT::float3_X float3_X; - typedef precisionXRT::floatD_X floatD_X; + typedef precisionPARATAXIS::float_X float_X; + typedef precisionPARATAXIS::float1_X float1_X; + typedef precisionPARATAXIS::float2_X float2_X; + typedef precisionPARATAXIS::float3_X float3_X; + typedef precisionPARATAXIS::floatD_X floatD_X; /*32 Bit defines*/ typedef precision32Bit::float_X float_32; diff --git a/include/simulation_defines/unitless/pusherConfig.unitless b/include/simulation_defines/unitless/pusherConfig.unitless index 69c91a3..b045aba 100644 --- a/include/simulation_defines/unitless/pusherConfig.unitless +++ b/include/simulation_defines/unitless/pusherConfig.unitless @@ -26,9 +26,9 @@ namespace PMacc { namespace traits { template<> - struct Resolve + struct Resolve { - using type = xrt::particles::functors::NoAlgo; + using type = parataxis::particles::functors::NoAlgo; }; } // namespace traits diff --git a/include/simulation_defines/unitless/scattererConfig.unitless b/include/simulation_defines/unitless/scattererConfig.unitless index f1c417b..ae70f6a 100644 --- a/include/simulation_defines/unitless/scattererConfig.unitless +++ b/include/simulation_defines/unitless/scattererConfig.unitless @@ -27,7 +27,7 @@ #include "particles/scatterer/Reflect.hpp" #include "particles/scatterer/RandomDirection.hpp" -namespace xrt { namespace particles { namespace scatterer { +namespace parataxis { namespace particles { namespace scatterer { namespace conditions { struct Never; @@ -42,56 +42,56 @@ namespace xrt { namespace particles { namespace scatterer { struct RandomDirection; } // namespace direction -}}} // namespace xrt +}}} // namespace parataxis namespace PMacc { namespace traits { template<> - struct Resolve + struct Resolve { - using type = xrt::particles::scatterer::Never<>; + using type = parataxis::particles::scatterer::Never<>; }; template<> - struct Resolve + struct Resolve { - using Config = xrt::particles::scatterer::conditions::OnThreshold; - using type = xrt::particles::scatterer::OnThreshold; + using Config = parataxis::particles::scatterer::conditions::OnThreshold; + using type = parataxis::particles::scatterer::OnThreshold; }; template<> - struct Resolve + struct Resolve { - using Config = xrt::particles::scatterer::conditions::OnRandom; - using type = xrt::particles::scatterer::OnRandom; + using Config = parataxis::particles::scatterer::conditions::OnRandom; + using type = parataxis::particles::scatterer::OnRandom; }; template<> - struct Resolve + struct Resolve { - using Config = xrt::particles::scatterer::direction::Fixed; - using type = xrt::particles::scatterer::Fixed; + using Config = parataxis::particles::scatterer::direction::Fixed; + using type = parataxis::particles::scatterer::Fixed; }; template<> - struct Resolve + struct Resolve { - using Config = xrt::particles::scatterer::direction::LinearDensity; - using type = xrt::particles::scatterer::LinearDensity; + using Config = parataxis::particles::scatterer::direction::LinearDensity; + using type = parataxis::particles::scatterer::LinearDensity; }; template<> - struct Resolve + struct Resolve { - using type = xrt::particles::scatterer::Reflect<>; + using type = parataxis::particles::scatterer::Reflect<>; }; template<> - struct Resolve + struct Resolve { - using Config = xrt::particles::scatterer::direction::RandomDirection; - using type = xrt::particles::scatterer::RandomDirection; + using Config = parataxis::particles::scatterer::direction::RandomDirection; + using type = parataxis::particles::scatterer::RandomDirection; }; } // namespace traits diff --git a/include/simulation_defines/unitless/speciesAttributes.unitless b/include/simulation_defines/unitless/speciesAttributes.unitless index 445f28a..35800c9 100644 --- a/include/simulation_defines/unitless/speciesAttributes.unitless +++ b/include/simulation_defines/unitless/speciesAttributes.unitless @@ -24,7 +24,7 @@ #include "particles/functors/GetWavelength.hpp" #include -namespace xrt{ +namespace parataxis{ namespace traits{ template @@ -151,4 +151,4 @@ struct OpenPMDUnit }; } // namespace traits -} // namespace xrt +} // namespace parataxis diff --git a/include/simulation_defines/unitless/starter.unitless b/include/simulation_defines/unitless/starter.unitless index f05f09f..a9c9f61 100644 --- a/include/simulation_defines/unitless/starter.unitless +++ b/include/simulation_defines/unitless/starter.unitless @@ -22,8 +22,8 @@ #include "Simulation.hpp" #include "simulationControl/SimulationStarter.hpp" -namespace xrt { +namespace parataxis { using SimStarter = SimulationStarter; -} // namespace xrt +} // namespace parataxis diff --git a/include/traits/PICToOpenPMD.hpp b/include/traits/PICToOpenPMD.hpp index 529f3df..816f96f 100644 --- a/include/traits/PICToOpenPMD.hpp +++ b/include/traits/PICToOpenPMD.hpp @@ -20,7 +20,7 @@ #pragma once -namespace xrt +namespace parataxis { namespace traits { @@ -33,6 +33,6 @@ namespace traits struct OpenPMDUnit; } // namespace traits -} // namespace xrt +} // namespace parataxis #include "PICToOpenPMD.tpp" diff --git a/include/traits/PICToOpenPMD.tpp b/include/traits/PICToOpenPMD.tpp index 91cb1e5..1ae3ac2 100644 --- a/include/traits/PICToOpenPMD.tpp +++ b/include/traits/PICToOpenPMD.tpp @@ -20,10 +20,10 @@ #pragma once -#include "xrtTypes.hpp" +#include "parataxisTypes.hpp" #include "traits/SIBaseUnits.hpp" -namespace xrt +namespace parataxis { namespace traits { @@ -91,4 +91,4 @@ namespace traits }; } // namespace traits -} // namespace xrt +} // namespace parataxis diff --git a/include/traits/PICToSplash.hpp b/include/traits/PICToSplash.hpp index cbd0938..3dd6df1 100644 --- a/include/traits/PICToSplash.hpp +++ b/include/traits/PICToSplash.hpp @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace traits { /** Convert a PIConGPU Type to a Splash CollectionType * @@ -30,6 +30,6 @@ namespace traits { struct PICToSplash; } //namespace traits -}// namespace xrt +}// namespace parataxis #include "PICToSplash.tpp" diff --git a/include/traits/PICToSplash.tpp b/include/traits/PICToSplash.tpp index 77f17e9..5666843 100644 --- a/include/traits/PICToSplash.tpp +++ b/include/traits/PICToSplash.tpp @@ -19,14 +19,14 @@ #pragma once -#if (XRT_ENABLE_HDF5==1) +#if (PARATAXIS_ENABLE_HDF5==1) #include #include "simulation_defines.hpp" #include #include -namespace xrt { +namespace parataxis { namespace traits { template<> @@ -96,6 +96,6 @@ namespace traits { }; } //namespace traits -}// namespace xrt +}// namespace parataxis -#endif // (XRT_ENABLE_HDF5==1) +#endif // (PARATAXIS_ENABLE_HDF5==1) diff --git a/include/traits/SIBaseUnits.hpp b/include/traits/SIBaseUnits.hpp index 79af498..487582b 100644 --- a/include/traits/SIBaseUnits.hpp +++ b/include/traits/SIBaseUnits.hpp @@ -20,7 +20,7 @@ #pragma once -namespace xrt +namespace parataxis { namespace traits { @@ -45,4 +45,4 @@ namespace traits } } // namespace traits -} // namespace xrt +} // namespace parataxis diff --git a/include/traits/SplashToPIC.hpp b/include/traits/SplashToPIC.hpp index 2e16fb6..65baea0 100644 --- a/include/traits/SplashToPIC.hpp +++ b/include/traits/SplashToPIC.hpp @@ -19,7 +19,7 @@ #pragma once -namespace xrt { +namespace parataxis { namespace traits { /** Convert a Splash CollectionType to a PIConGPU Type * @@ -30,6 +30,6 @@ namespace traits { struct SplashToPIC; } //namespace traits -}// namespace xrt +}// namespace parataxis #include "SplashToPIC.tpp" diff --git a/include/traits/SplashToPIC.tpp b/include/traits/SplashToPIC.tpp index 3a79b9b..a4fe23a 100644 --- a/include/traits/SplashToPIC.tpp +++ b/include/traits/SplashToPIC.tpp @@ -19,12 +19,12 @@ #pragma once -#if (XRT_ENABLE_HDF5==1) +#if (PARATAXIS_ENABLE_HDF5==1) #include #include "simulation_defines.hpp" -namespace xrt { +namespace parataxis { namespace traits { template<> struct SplashToPIC @@ -82,6 +82,6 @@ namespace traits { }; } //namespace traits -}// namespace xrt +}// namespace parataxis -#endif // (XRT_ENABLE_HDF5==1) +#endif // (PARATAXIS_ENABLE_HDF5==1) diff --git a/include/traits/stdRenamings.hpp b/include/traits/stdRenamings.hpp index 32ed5c7..c4facff 100644 --- a/include/traits/stdRenamings.hpp +++ b/include/traits/stdRenamings.hpp @@ -21,7 +21,7 @@ #include -namespace xrt { +namespace parataxis { namespace traits { //Shortcuts from C++14 standard @@ -39,4 +39,4 @@ namespace traits { using remove_cv_t = typename std::remove_cv::type; } // namespace traits -} // namespace xrt +} // namespace parataxis diff --git a/include/version.hpp b/include/version.hpp index eb4d0c7..527f809 100644 --- a/include/version.hpp +++ b/include/version.hpp @@ -19,6 +19,6 @@ #pragma once -#define XRT_VERSION_MAJOR 0 -#define XRT_VERSION_MINOR 1 -#define XRT_VERSION_PATCH 0 +#define PARATAXIS_VERSION_MAJOR 0 +#define PARATAXIS_VERSION_MINOR 1 +#define PARATAXIS_VERSION_PATCH 0 diff --git a/main.cu b/main.cu index ff56373..9d12b58 100644 --- a/main.cu +++ b/main.cu @@ -18,8 +18,8 @@ */ #include "mallocMCConfig.hpp" -#include "xrtTypes.hpp" #include +#include "parataxisTypes.hpp" int main( int argc, char **argv ) { @@ -30,21 +30,21 @@ int main( int argc, char **argv ) /* Use nested region to make sure all simulation classes are * freed before we call MPI_Finalize */ - xrt::SimStarter starter; - xrt::ArgsErrorCode parserCode = starter.parseConfigs(argc, argv); + parataxis::SimStarter starter; + parataxis::ArgsErrorCode parserCode = starter.parseConfigs(argc, argv); switch(parserCode) { - case xrt::ArgsErrorCode::ERROR: + case parataxis::ArgsErrorCode::ERROR: errorCode = 1; break; - case xrt::ArgsErrorCode::SUCCESS: + case parataxis::ArgsErrorCode::SUCCESS: starter.load(); starter.start(); starter.unload(); errorCode = 0; break; - case xrt::ArgsErrorCode::SUCCESS_EXIT: + case parataxis::ArgsErrorCode::SUCCESS_EXIT: errorCode = 0; break; default: