Fixed last changes

ComputationalRadiationPhysics · Jul 27, 2020 · be2a62a · be2a62a
1 parent be717f7
commit be2a62a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/docs/TBG_macros.cfg b/docs/TBG_macros.cfg
@@ -145,7 +145,9 @@ TBG_<species>_pngYX="--<species>_png.period 10 --<species>_png.axis yx --<specie
 TBG_<species>_merger="--<species>_merger.period 100 --<species>_merger.minParticlesToMerge 8 --<species>_merger.posSpreadThreshold 0.2 --<species>_merger.absMomSpreadThreshold 0.01"
 
 # Enable probabilistic version of particle merging
-TBG_<species>_randomizedMerger="--<species>_randomizedMerger.period 100 --<species>_randomizedMerger.maxParticlesToMerge 8 --<species>_randomizedMerger.ratioDeletedParticles 0.9"
+TBG_<species>_randomizedMerger="--<species>_randomizedMerger.period 100 --<species>_randomizedMerger.maxParticlesToMerge 8        \
+                                --<species>_randomizedMerger.ratioDeletedParticles 0.9 --<species>_merger.posSpreadThreshold 0.01 \
+                                --<species>_merger.momSpreadThreshold  0.0005"
 
 # Notification period of position plugin (single-particle debugging)
 TBG_<species>_pos_dbg="--<species>_position.period 1"

diff --git a/docs/source/usage/plugins/particleMergerProbabilistic.rst b/docs/source/usage/plugins/particleMergerProbabilistic.rst
@@ -29,7 +29,7 @@ PIConGPU command line option                 Description
 ============================================ ================================================================================================================
 ``--<species>_merger.period``                The ouput periodicity of the plugin. A value of ``100`` would mean an output at simulation time step *0, 100, 200, ...*.
 
-``--<species>_merger.ratioOfDeletedParticles`` The ratio of particles to delete. The parameter have to be in Range *[0:1]*.
+``--<species>_merger.ratioDeletedParticles`` The ratio of particles to delete. The parameter have to be in Range *[0:1]*.
 
 ``--<species>_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
@@ -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;
         }