Particles: initGas -> initDensityProfile

ComputationalRadiationPhysics · Jan 11, 2017 · 151c23b · 151c23b
1 parent 0d64c3c
commit 151c23b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/picongpu/include/particles/InitFunctors.hpp b/src/picongpu/include/particles/InitFunctors.hpp
@@ -98,7 +98,7 @@ struct CreateDensity
         auto speciesPtr = tuple[SpeciesName()];
         DensityFunctor densityFunctor(currentStep);
         PositionFunctor positionFunctor(currentStep);
-        speciesPtr->initGas(densityFunctor, positionFunctor, currentStep);
+        speciesPtr->initDensityProfile(densityFunctor, positionFunctor, currentStep);
     }
 };
 

diff --git a/src/picongpu/include/particles/Particles.hpp b/src/picongpu/include/particles/Particles.hpp
@@ -88,8 +88,8 @@ class Particles : public ParticlesBase<
 
     void update(uint32_t currentStep);
 
-    template<typename T_GasFunctor, typename T_PositionFunctor>
-    void initGas(T_GasFunctor& gasFunctor, T_PositionFunctor& positionFunctor, const uint32_t currentStep);
+    template<typename T_DensityFunctor, typename T_PositionFunctor>
+    void initDensityProfile(T_DensityFunctor& densityFunctor, T_PositionFunctor& positionFunctor, const uint32_t currentStep);
 
     template<
         typename T_SrcName,

diff --git a/src/picongpu/include/particles/Particles.tpp b/src/picongpu/include/particles/Particles.tpp
@@ -266,17 +266,19 @@ template<
     typename T_Attributes,
     typename T_Flags
 >
-template<typename T_GasFunctor, typename T_PositionFunctor>
+template<typename T_DensityFunctor, typename T_PositionFunctor>
 void
 Particles<
     T_Name,
     T_Attributes,
     T_Flags
->::initGas( T_GasFunctor& gasFunctor,
-                                                T_PositionFunctor& positionFunctor,
-                                                const uint32_t currentStep )
+>::initDensityProfile(
+    T_DensityFunctor& densityFunctor,
+    T_PositionFunctor& positionFunctor,
+    const uint32_t currentStep
+)
 {
-    log<picLog::SIMULATION_STATE > ( "initialize gas profile for species %1%" ) % FrameType::getName( );
+    log<picLog::SIMULATION_STATE > ( "initialize density profile for species %1%" ) % FrameType::getName( );
 
     const uint32_t numSlides = MovingWindow::getInstance( ).getSlideCounter( currentStep );
     const SubGrid<simDim>& subGrid = Environment<simDim>::get( ).SubGrid( );
@@ -288,7 +290,7 @@ Particles<
     AreaMapping<CORE+BORDER,MappingDesc> mapper(this->cellDescription);
     PMACC_KERNEL( KernelFillGridWithParticles< Particles >{} )
         (mapper.getGridDim(), block)
-        ( gasFunctor, positionFunctor, totalGpuCellOffset, this->particlesBuffer->getDeviceParticleBox( ), mapper );
+        ( densityFunctor, positionFunctor, totalGpuCellOffset, this->particlesBuffer->getDeviceParticleBox( ), mapper );
 
 
     this->fillAllGaps( );