Merge remote-tracking branch 'mainline/release-0.3.1'

CHANGELOG.md

@@ -1,6 +1,62 @@
 Change Log / Release Log for PIConGPU
 ================================================================
 
+0.3.1
+-----
+**Date:** 2017-10-20
+
+Field Energy Plugin, Gaussian Density Profile and Restarts
+
+This release fixes the energy field plugin diagnostics and the "downramp"
+parameter of the pre-defined Gaussian density profile. Restarts with enabled
+background fields were fixed. Numerous improvements to our build system were
+added to deal more gracefully with co-existing system-wide default libraries.
+A stability issue due to an illegal memory access in the PMacc event system
+was fixed.
+
+### Changes to "0.3.0"
+
+**.param file changes:**
+ - `density.param`: in `Gaussian` profile, the parameter `gasSigmaRight`
+   was not properly honored but `gasCenterRight` was taken instead  #2214
+ - `fieldBackground.param`: remove micro meters usage in default file #2138
+
+**Bug Fixes:**
+ - PIConGPU:
+   - `gasSigmaRight` of `Gaussian` density profile was broken since
+     0.2.0 release #2214
+   - restart with enabled background fields #2113 #2139
+   - KHI example: missing constexpr in input #2309
+ - libPMacc:
+   - event system: illegal memory access #2151
+ - plugins:
+   - energy field reduce #2112
+ - tools:
+   - CMake:
+     - Boost dependency:
+       - same minimal version for tools #2293
+       - transient dependenciens: `date_time`, `chrono`, `atomic` #2195
+     - use targets of boost & zlib #2193 #2292
+     - possible linker error #2107
+   - XDMF script: positionOffset for openPMD #2309
+   - cmakeFlags: escape lists #2183
+   - tbg:
+     - `--help` exit with 0 return code #2213
+     - env variables: proper handling of \ and & #2262
+
+**Misc:**
+ - PIConGPU: `--help` to stdout #2148
+ - tools: all to C++11 #2194
+ - documentation:
+   - Hypnos .tpl files: remove passing `LD_LIBRARY_PATH` to avoid warning #2149
+   - fix plasma frequency and remove German comment #2110
+   - remove micro meters usage in default background field #2138
+   - README: update links of docs badge #2144
+
+Thanks to Axel Huebl, Richard Pausch and René Widera for contributions to this
+release!
+
+
 0.3.0
 -----
 **Date:** 2017-06-16

INSTALL.rst

@@ -92,15 +92,15 @@ zlib
 
 boost
 """""
-- 1.57.0-1.64.0 (``program options``, ``regex`` , ``filesystem``, ``system``, ``thread``, ``math``, ``serialization`` and nearly all header-only libs)
+- 1.57.0-1.64.0 (``program options``, ``regex`` , ``filesystem``, ``system``, ``thread``, ``chrono``, ``atomic``, ``date_time``, ``math``, ``serialization`` and nearly all header-only libs)
 - download from `http://www.boost.org <http://sourceforge.net/projects/boost/files/boost/1.57.0/boost_1_57_0.tar.gz/download>`_
-- *Debian/Ubuntu:* ``sudo apt-get install libboost-program-options-dev libboost-regex-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-math-dev libboost-serialization-dev``
+- *Debian/Ubuntu:* ``sudo apt-get install libboost-program-options-dev libboost-regex-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-chrono-dev libboost-atomic-dev libboost-date-time-dev libboost-math-dev libboost-serialization-dev``
 - *Arch Linux:* ``sudo pacman --sync boost``
 - *Spack:* ``spack install boost``
 - *from source:*
 
-  - ``./bootstrap.sh --with-libraries=filesystem,program_options,regex,system,thread,math,serialization --prefix=$HOME/lib/boost``
-  - ``./b2 -j4 && ./b2 install``
+  - ``./bootstrap.sh --with-libraries=atomic,chrono,date_time,filesystem,program_options,regex,system,thread,math,serialization --prefix=$HOME/lib/boost``
+  - ``./b2 cxxflags="-std=c++11" -j4 && ./b2 install``
 - *environment:* (assumes install from source in ``$HOME/lib/boost``)
 
   - ``export BOOST_ROOT=$HOME/lib/boost``

README.md

@@ -3,8 +3,7 @@ PIConGPU - A Many GPGPU PIC Code
 
 [![Code Status master](https://img.shields.io/travis/ComputationalRadiationPhysics/picongpu/master.svg?label=master)](https://travis-ci.org/ComputationalRadiationPhysics/picongpu/branches)
 [![Code Status dev](https://img.shields.io/travis/ComputationalRadiationPhysics/picongpu/dev.svg?label=dev)](https://travis-ci.org/ComputationalRadiationPhysics/picongpu/branches)
-[![Documentation Status](https://readthedocs.org/projects/picongpu/badge/?version=master)](http://picongpu.readthedocs.io/en/master/?badge=master)
-[![Documentation Status](https://readthedocs.org/projects/picongpu/badge/?version=dev)](http://picongpu.readthedocs.io/en/dev/?badge=dev)
+[![Documentation Status](https://readthedocs.org/projects/picongpu/badge/?version=latest)](http://picongpu.readthedocs.io)
 [![Language](https://img.shields.io/badge/language-C%2B%2B11-orange.svg)](https://isocpp.org/)
 [![License PIConGPU](https://img.shields.io/badge/license-GPLv3-blue.svg?label=PIConGPU)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![License PMacc](https://img.shields.io/badge/license-LGPLv3-blue.svg?label=PMacc)](https://www.gnu.org/licenses/lgpl-3.0.html)

docs/source/conf.py

@@ -89,9 +89,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.3.0'
+version = u'0.3.1'
 # The full version, including alpha/beta/rc tags.
-release = u'0.3.0'
+release = u'0.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

examples/Bunch/cmakeFlags

@@ -30,15 +30,15 @@
 #   - increase by 1, no gaps
 
 flags[0]="-DCUDA_ARCH=35"
-flags[1]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_INCLUDE_FIELDBACKGROUND=true"
-flags[2]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_INCLUDE_FIELDBACKGROUND=true;-DPARAM_DIMENSION=DIM2"
-flags[3]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_SINGLE_PARTICLE=true;-DPARAM_RADFORMFACTOR=radFormFactor_coherent"
-flags[4]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DENABLE_SYNCHROTRON_PHOTONS=1;-DPARAM_RADFORMFACTOR=radFormFactor_Gauss_cell"
-flags[5]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_FILTER_GAMMA=1;-DPARAM_RADFORMFACTOR=radFormFactor_incoherent"
-flags[6]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_RADWINDOW=radWindowFunctionTriangle;-DPARAM_RADFORMFACTOR=radFormFactor_CIC_3D"
-flags[7]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_RADWINDOW=radWindowFunctionHamming;-DPARAM_RADFORMFACTOR=radFormFactor_TSC_3D"
-flags[8]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_RADWINDOW=radWindowFunctionTriplett;-DPARAM_RADFORMFACTOR=radFormFactor_PCS_3D"
-flags[9]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_RADWINDOW=radWindowFunctionGauss;-DPARAM_RADFORMFACTOR=radFormFactor_CIC_1Dy"
+flags[1]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_INCLUDE_FIELDBACKGROUND=true'"
+flags[2]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_INCLUDE_FIELDBACKGROUND=true;-DPARAM_DIMENSION=DIM2'"
+flags[3]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_SINGLE_PARTICLE=true;-DPARAM_RADFORMFACTOR=radFormFactor_coherent'"
+flags[4]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DENABLE_SYNCHROTRON_PHOTONS=1;-DPARAM_RADFORMFACTOR=radFormFactor_Gauss_cell'"
+flags[5]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_FILTER_GAMMA=1;-DPARAM_RADFORMFACTOR=radFormFactor_incoherent'"
+flags[6]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_RADWINDOW=radWindowFunctionTriangle;-DPARAM_RADFORMFACTOR=radFormFactor_CIC_3D'"
+flags[7]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_RADWINDOW=radWindowFunctionHamming;-DPARAM_RADFORMFACTOR=radFormFactor_TSC_3D'"
+flags[8]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_RADWINDOW=radWindowFunctionTriplett;-DPARAM_RADFORMFACTOR=radFormFactor_PCS_3D'"
+flags[9]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_RADWINDOW=radWindowFunctionGauss;-DPARAM_RADFORMFACTOR=radFormFactor_CIC_1Dy'"
 
 ################################################################################
 # execution

examples/KelvinHelmholtz/cmakeFlags

@@ -30,13 +30,13 @@
 #   - increase by 1, no gaps
 
 flags[0]="-DCUDA_ARCH=20"
-flags[1]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_DIMENSION=DIM2"
-flags[2]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_RADIATION=1"
-flags[3]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=CIC"
-flags[4]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=PCS"
-flags[5]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=TSC"
-flags[6]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=TSC;-DPARAM_DIMENSION=DIM2"
-flags[7]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_FIELDSOLVER=fieldSolverDirSplitting"
+flags[1]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_DIMENSION=DIM2'"
+flags[2]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_RADIATION=1'"
+flags[3]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=CIC'"
+flags[4]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=PCS'"
+flags[5]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=TSC'"
+flags[6]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=ZigZag<UsedParticleShape>;-DPARAM_PARTICLESHAPE=TSC;-DPARAM_DIMENSION=DIM2'"
+flags[7]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_FIELDSOLVER=fieldSolverDirSplitting'"
 
 
 ################################################################################

examples/KelvinHelmholtz/include/simulation_defines/param/particle.param

@@ -51,9 +51,9 @@ namespace particles
     /** a particle with a weighting below MIN_WEIGHTING will not
      *      be created / will be deleted
      *  unit: none */
-    const float_X MIN_WEIGHTING = 10.0;
+    constexpr float_X MIN_WEIGHTING = 10.0;
 
-    const uint32_t TYPICAL_PARTICLES_PER_CELL = mCT::volume<
+    constexpr uint32_t TYPICAL_PARTICLES_PER_CELL = mCT::volume<
         startPosition::QuietParam::numParticlesPerDimension
     >::type::value;
 

examples/KelvinHelmholtz/include/simulation_defines/param/radiation.param

@@ -51,12 +51,11 @@ namespace rad_log_frequencies
 {
 namespace SI
 {
-//constexpr float_64 omega_min = 1.0e14;
-//constexpr float_64 omega_max = 1.0e17;
-  // plasma omega = sqrt( (Teilchendichte * (1.6e-19)^2) / (8.854e-12 * 9.11e-31) )
-  //              = 2.52e14 Hz
-constexpr float_64 omega_min = 0.1*2.52e14;
-constexpr float_64 omega_max = 200*2.52e14;
+// plasma omega = sqrt( (electron density * (1.6e-19)^2) / (8.854e-12 * 9.11e-31) )
+//              = 1.78e14 1/s
+constexpr float_64 omega_pe = 1.78e14;
+constexpr float_64 omega_min = 0.1 * omega_pe;
+constexpr float_64 omega_max = 200 * omega_pe;
 }
 
 constexpr unsigned int N_omega = 1024; // number of frequencies

examples/LaserWakefield/cmakeFlags

@@ -30,18 +30,18 @@
 #   - increase by 1, no gaps
 
 flags[0]="-DCUDA_ARCH=20"
-flags[1]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_FIELDSOLVER=fieldSolverLehe;-DPARAM_PARTICLEPUSHER=Vay"
-flags[2]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=Esirkepov;-DPARAM_PARTICLESHAPE=CIC"
-flags[3]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=VillaBune;-DPARAM_PARTICLESHAPE=CIC"
-flags[4]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit"
-flags[5]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DENABLE_CURRENT=0"
-flags[6]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_DIMENSION=DIM2"
-flags[7]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=Esirkepov;-DPARAM_PARTICLESHAPE=CIC;-DPARAM_DIMENSION=DIM2"
-flags[8]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PRECISION=precision64Bit;-DPARAM_DIMENSION=DIM2"
-flags[9]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DENABLE_CURRENT=0;-DPARAM_DIMENSION=DIM2"
-flags[10]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST=-DPARAM_IONS=1;-DPARAM_IONIZATION=1"
-flags[11]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=EmZ"
-flags[12]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_CURRENTSOLVER=EmZ;-DPARAM_DIMENSION=DIM2"
+flags[1]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_FIELDSOLVER=fieldSolverLehe;-DPARAM_PARTICLEPUSHER=Vay'"
+flags[2]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=Esirkepov;-DPARAM_PARTICLESHAPE=CIC'"
+flags[3]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=VillaBune;-DPARAM_PARTICLESHAPE=CIC'"
+flags[4]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PRECISION=precision64Bit'"
+flags[5]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DENABLE_CURRENT=0'"
+flags[6]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_DIMENSION=DIM2'"
+flags[7]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=Esirkepov;-DPARAM_PARTICLESHAPE=CIC;-DPARAM_DIMENSION=DIM2'"
+flags[8]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PRECISION=precision64Bit;-DPARAM_DIMENSION=DIM2'"
+flags[9]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DENABLE_CURRENT=0;-DPARAM_DIMENSION=DIM2'"
+flags[10]="-DCUDA_ARCH=35 -DPARAM_OVERWRITES:LIST='-DPARAM_IONS=1;-DPARAM_IONIZATION=1'"
+flags[11]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=EmZ'"
+flags[12]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_CURRENTSOLVER=EmZ;-DPARAM_DIMENSION=DIM2'"
 ################################################################################
 # execution
 

examples/SingleParticleTest/cmakeFlags

@@ -32,25 +32,25 @@
 # test all pushers in 3D and 2D
 # Boris Pusher
 flags[0]="-DCUDA_ARCH=20"
-flags[1]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_DIMENSION=DIM2"
+flags[1]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_DIMENSION=DIM2'"
 # Vay Pusher
-flags[2]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=Vay"
-flags[3]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=Vay;-DPARAM_DIMENSION=DIM2"
+flags[2]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=Vay'"
+flags[3]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=Vay;-DPARAM_DIMENSION=DIM2'"
 # disable the pusher
-flags[4]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_ENABLEPUSHER=0"
-flags[5]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_ENABLEPUSHER=0;-DPARAM_DIMENSION=DIM2"
+flags[4]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_ENABLEPUSHER=0'"
+flags[5]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_ENABLEPUSHER=0;-DPARAM_DIMENSION=DIM2'"
 # Free Pusher
-flags[6]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=Free"
-flags[7]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=Free;-DPARAM_DIMENSION=DIM2"
+flags[6]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=Free'"
+flags[7]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=Free;-DPARAM_DIMENSION=DIM2'"
 # Photon Pusher
-flags[8]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=Photon"
-flags[9]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=Photon;-DPARAM_DIMENSION=DIM2"
+flags[8]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=Photon'"
+flags[9]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=Photon;-DPARAM_DIMENSION=DIM2'"
 # Axel Pusher
-flags[10]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=Axel"
+flags[10]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=Axel'"
 # does not support 2D
 # Reduced Landau Lifshitz Pusher
-flags[11]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=ReducedLandauLifshitz"
-flags[12]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST=-DPARAM_PARTICLEPUSHER=ReducedLandauLifshitz;-DPARAM_DIMENSION=DIM2"
+flags[11]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=ReducedLandauLifshitz'"
+flags[12]="-DCUDA_ARCH=20 -DPARAM_OVERWRITES:LIST='-DPARAM_PARTICLEPUSHER=ReducedLandauLifshitz;-DPARAM_DIMENSION=DIM2'"
 
 ################################################################################
 # execution

examples/WarmCopper/cmakeFlags

@@ -30,7 +30,7 @@
 #   - increase by 1, no gaps
 
 flags[0]="-DCUDA_ARCH=20 -DCMAKE_DISABLE_FIND_PACKAGE_ISAAC=True"
-flags[1]="-DCUDA_ARCH=20 -DCMAKE_DISABLE_FIND_PACKAGE_ISAAC=True -DPARAM_OVERWRITES:LIST=-DPARAM_ENABLE_PUSHER=1;-DPARAM_ENABLE_CURRENT=1"
+flags[1]="-DCUDA_ARCH=20 -DCMAKE_DISABLE_FIND_PACKAGE_ISAAC=True -DPARAM_OVERWRITES:LIST='-DPARAM_ENABLE_PUSHER=1;-DPARAM_ENABLE_CURRENT=1'"
 
 
 ################################################################################

src/libPMacc/CMakeLists.txt

@@ -68,8 +68,12 @@ find_package(CUDA 7.5 REQUIRED)
 ###############################################################################
 
 find_package(Boost 1.57.0 COMPONENTS unit_test_framework REQUIRED)
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-set(LIBS ${LIBS} ${Boost_LIBRARIES})
+if(TARGET Boost::unit_test_framework)
+    set(LIBS ${LIBS} Boost::boost Boost::unit_test_framework)
+else()
+    include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+    set(LIBS ${LIBS} ${Boost_LIBRARIES})
+endif()
 
 
 ################################################################################

src/libPMacc/PMaccConfig.cmake

@@ -266,8 +266,13 @@ endif(MPI_CXX_FOUND)
 ################################################################################
 
 find_package(Boost 1.57.0 REQUIRED COMPONENTS filesystem system math_tr1)
-set(PMacc_INCLUDE_DIRS ${PMacc_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-set(PMacc_LIBRARIES ${PMacc_LIBRARIES} ${Boost_LIBRARIES})
+if(TARGET Boost::filesystem)
+    set(PMacc_LIBRARIES ${PMacc_LIBRARIES} Boost::boost Boost::filesystem
+                                           Boost::system Boost::math_tr1)
+else()
+    set(PMacc_INCLUDE_DIRS ${PMacc_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+    set(PMacc_LIBRARIES ${PMacc_LIBRARIES} ${Boost_LIBRARIES})
+endif()
 
 # Boost 1.55 added support for a define that makes result_of look for
 # the result<> template and falls back to decltype if none is found. This is

src/libPMacc/include/eventSystem/tasks/StreamTask.tpp

@@ -90,7 +90,7 @@ inline cudaStream_t StreamTask::getCudaStream( )
 inline void StreamTask::activate( )
 {
     cudaEvent = Environment<>::get().EventPool( ).pop( );
-    cudaEvent.recordEvent(this->stream->getCudaStream());
+    cudaEvent.recordEvent( getCudaStream( ) );
     hasCudaEventHandle = true;
 }
 

src/libPMacc/include/simulationControl/SimulationHelper.hpp

@@ -232,21 +232,17 @@ class SimulationHelper : public IPlugin
             TimeIntervall tRound;
             double roundAvg = 0.0;
 
+            /* Since in the main loop movingWindow is called always before the dump, we also call it here for consistency.
+             * This becomes only important, if movingWindowCheck does more than merely checking for a slide.
+             * TO DO in a new feature: Turn this into a general hook for pre-checks (window slides are just one possible action).
+             */
+            movingWindowCheck(currentStep);
+
             /* dump initial step if simulation starts without restart */
-            if (currentStep == 0)
+            if (!restartRequested)
             {
-                /* Since in the main loop movingWindow is called always before the dump, we also call it here for consistency.
-                This becomes only important, if movingWindowCheck does more than merely checking for a slide.
-                TO DO in a new feature: Turn this into a general hook for pre-checks (window slides are just one possible action). */
-                movingWindowCheck(currentStep);
                 dumpOneStep(currentStep);
             }
-            else
-            {
-                currentStep--; //We dump before calculation, thus we must go one step back when doing a restart.
-                Environment<>::get().SimulationDescription().setCurrentStep( currentStep );
-                movingWindowCheck(currentStep); //If we restart at any step check if we must slide.
-            }
 
             /* dump 0% output */
             dumpTimes(tSimCalculation, tRound, roundAvg, currentStep);
@@ -266,11 +262,11 @@ class SimulationHelper : public IPlugin
 
                 currentStep++;
                 Environment<>::get().SimulationDescription().setCurrentStep( currentStep );
-                /*output after a round*/
+                /* output times after a round */
                 dumpTimes(tSimCalculation, tRound, roundAvg, currentStep);
 
                 movingWindowCheck(currentStep);
-                /*dump after simulated step*/
+                /* dump at the beginning of the simulated step */
                 dumpOneStep(currentStep);
             }