From be2a62acced7837d70c93e1fde509272c28782cc Mon Sep 17 00:00:00 2001 From: Xeinia Bastrakova Date: Mon, 27 Jul 2020 23:26:08 +0200 Subject: [PATCH] Fixed last changes --- docs/TBG_macros.cfg | 4 +++- docs/source/usage/plugins/particleMergerProbabilistic.rst | 2 +- .../randomizedParticleMerger/RandomizedParticleMerger.kernel | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/TBG_macros.cfg b/docs/TBG_macros.cfg index c0303791f0..7f34e5e690 100644 --- a/docs/TBG_macros.cfg +++ b/docs/TBG_macros.cfg @@ -145,7 +145,9 @@ TBG__pngYX="--_png.period 10 --_png.axis yx --_merger="--_merger.period 100 --_merger.minParticlesToMerge 8 --_merger.posSpreadThreshold 0.2 --_merger.absMomSpreadThreshold 0.01" # Enable probabilistic version of particle merging -TBG__randomizedMerger="--_randomizedMerger.period 100 --_randomizedMerger.maxParticlesToMerge 8 --_randomizedMerger.ratioDeletedParticles 0.9" +TBG__randomizedMerger="--_randomizedMerger.period 100 --_randomizedMerger.maxParticlesToMerge 8 \ + --_randomizedMerger.ratioDeletedParticles 0.9 --_merger.posSpreadThreshold 0.01 \ + --_merger.momSpreadThreshold 0.0005" # Notification period of position plugin (single-particle debugging) TBG__pos_dbg="--_position.period 1" diff --git a/docs/source/usage/plugins/particleMergerProbabilistic.rst b/docs/source/usage/plugins/particleMergerProbabilistic.rst index 233223a49a..56993bcde2 100644 --- a/docs/source/usage/plugins/particleMergerProbabilistic.rst +++ b/docs/source/usage/plugins/particleMergerProbabilistic.rst @@ -29,7 +29,7 @@ PIConGPU command line option Description ============================================ ================================================================================================================ ``--_merger.period`` The ouput periodicity of the plugin. A value of ``100`` would mean an output at simulation time step *0, 100, 200, ...*. -``--_merger.ratioOfDeletedParticles`` The ratio of particles to delete. The parameter have to be in Range *[0:1]*. +``--_merger.ratioDeletedParticles`` The ratio of particles to delete. The parameter have to be in Range *[0:1]*. ``--_merger.maxParticlesToMerge`` Maximum number of macroparticles that can be merged into a single macroparticle. diff --git a/include/picongpu/plugins/randomizedParticleMerger/RandomizedParticleMerger.kernel b/include/picongpu/plugins/randomizedParticleMerger/RandomizedParticleMerger.kernel index 620eaa3dc3..0e1b2f6113 100644 --- a/include/picongpu/plugins/randomizedParticleMerger/RandomizedParticleMerger.kernel +++ b/include/picongpu/plugins/randomizedParticleMerger/RandomizedParticleMerger.kernel @@ -233,7 +233,7 @@ namespace randomizedParticleMerger if ( voronoiCell.numMacroParticles == 2 ) subdivisionProbability = voronoiCell.expectedNumMacroParticles - 1.0_X; if ( voronoiCell.numMacroParticles == 3 ) - subdivisionProbability = ( voronoiCell.expectedNumMacroParticles - 1 ) / 2.0_X; + subdivisionProbability = ( voronoiCell.expectedNumMacroParticles - 1.0_X ) / 2.0_X; return randomGen() < subdivisionProbability; }