Edit after rebase / compare to mainline/dev

After having rebased on mainline/dev I checked whether all changes made in the pull requests ComputationalRadiationPhysics#594, ComputationalRadiationPhysics#596 and ComputationalRadiationPhysics#607 are active. I also cleaned the code from small errors that occurred due to automatic merging.
n01r · Jan 7, 2015 · b45acc0 · b45acc0
1 parent 47a4c9b
commit b45acc0
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 38 deletions.
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/starter.param b/examples/SingleParticleCurrent/include/simulation_defines/param/starter.param
@@ -28,14 +28,9 @@ namespace picongpu
 
     namespace singleParticleTest
     {
-        typedef uint32_t ChargeStateType;
 
     }
-        }
-        /* return charge state of the ion*/
-        HDINLINE static ChargeStateType getChargeState(const float_X weighting, uint32_t chargeState)
-        {
-            return (chargeState * weighting);
+
 }
 
 

diff --git a/src/picongpu/include/fields/FieldJ.kernel b/src/picongpu/include/fields/FieldJ.kernel
@@ -137,7 +137,6 @@ struct ComputeCurrentPerFrame
 
         PMACC_AUTO(particle, frame[localIdx]);
         const float_X weighting = particle[weighting_];
-        uint32_t chState = particle[chargeState_];
         const floatD_X pos = particle[position_];
         const int particleCellIdx = particle[localCellIdx_];
         const float_X charge = attribute::getCharge(weighting,particle);

diff --git a/src/picongpu/include/particles/Particles.kernel b/src/picongpu/include/particles/Particles.kernel
@@ -408,7 +408,6 @@ struct PushParticlePerFrame
 
         PMACC_AUTO(particle, frame[localIdx]);
         const float_X weighting = particle[weighting_];
-        unsigned int chState = particle[chargeState_];
 
         floatD_X pos = particle[position_];
         const int particleCellIdx = particle[localCellIdx_];

diff --git a/src/picongpu/include/particles/ParticlesInit.kernel b/src/picongpu/include/particles/ParticlesInit.kernel
@@ -205,8 +205,6 @@ __global__ void kernelFillGridWithParticles(ParBox pb,
             particle[multiMask_] = 1;
             particle[localCellIdx_] = linearThreadIdx;
             particle[weighting_] = macroWeighting;
-            // seems to be necessary - won't be initialized in MySimulation.hpp
-            particle[chargeState_] = 1;
 
 #if(ENABLE_RADIATION == 1)
 #if(RAD_MARK_PARTICLE>1) || (RAD_ACTIVATE_GAMMA_FILTER!=0)

diff --git a/src/picongpu/include/particles/particleToGrid/ComputeGridValuePerFrame.hpp b/src/picongpu/include/particles/particleToGrid/ComputeGridValuePerFrame.hpp
@@ -102,8 +102,6 @@ ComputeGridValuePerFrame<T_ParticleShape, calcType>::operator()
     const float_X weighting = particle[weighting_];
     const floatD_X pos = particle[position_];
     const float3_X mom = particle[momentum_];
-    unsigned int chState = particle[chargeState_];
-
 #if(ENABLE_RADIATION == 1)
     const float3_X mom_mt1 = particle[momentumPrev1_];
     const float3_X mom_dt = mom - mom_mt1;

diff --git a/src/picongpu/include/simulationControl/MySimulation.hpp b/src/picongpu/include/simulationControl/MySimulation.hpp
@@ -1,6 +1,6 @@
 /**
  * Copyright 2013-2014 Axel Huebl, Felix Schmitt, Heiko Burau, Rene Widera,
- *                     Richard Pausch
+ *                     Richard Pausch, Marco Garten
  *
  * This file is part of PIConGPU.
  *
@@ -354,7 +354,8 @@ class MySimulation : public SimulationHelper<simDim>
                        currentStep, fieldBackgroundE::InfluenceParticlePusher);
         (*pushBGField)(fieldB, nvfct::Add(), fieldBackgroundB(fieldB->getUnit()),
                        currentStep, fieldBackgroundB::InfluenceParticlePusher);
-/* Ionization */
+
+        /* Ionization */
 //        std::cout << "Begin Ionization of Ions" << std::endl;
         ForEach<VectorAllSpecies, particles::CallIonization<bmpl::_1>, MakeIdentifier<bmpl::_1> > particleIonization;
         particleIonization(forward(particleStorage), currentStep);
@@ -367,6 +368,8 @@ class MySimulation : public SimulationHelper<simDim>
         ForEach<VectorAllSpecies, particles::CallUpdate<bmpl::_1>, MakeIdentifier<bmpl::_1> > particleUpdate;
         particleUpdate(forward(particleStorage), currentStep, initEvent, forward(updateEvent), forward(commEvent));
 
+        __setTransactionEvent(updateEvent);
+
         /** remove background field for particle pusher */
         (*pushBGField)(fieldE, nvfct::Sub(), fieldBackgroundE(fieldE->getUnit()),
                        currentStep, fieldBackgroundE::InfluenceParticlePusher);
@@ -377,7 +380,7 @@ class MySimulation : public SimulationHelper<simDim>
 
         fieldJ->clear();
 
-        __setTransactionEvent(updateEvent + commEvent);
+        __setTransactionEvent(commEvent);
         (*currentBGField)(fieldJ, nvfct::Add(), fieldBackgroundJ(fieldJ->getUnit()),
                           currentStep, fieldBackgroundJ::activated);
 #if (ENABLE_CURRENT == 1)

diff --git a/src/picongpu/include/simulation_defines/_defaultParam.loader b/src/picongpu/include/simulation_defines/_defaultParam.loader
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Axel Huebl, Heiko Burau, Rene Widera
+ * Copyright 2013 Axel Huebl, Heiko Burau, Rene Widera, Marco Garten
  *
  * This file is part of PIConGPU.
  *

diff --git a/src/picongpu/include/simulation_defines/_defaultUnitless.loader b/src/picongpu/include/simulation_defines/_defaultUnitless.loader
@@ -1,5 +1,6 @@
 /**
- * Copyright 2013-2014 Axel Huebl, Heiko Burau, Rene Widera, Felix Schmitt
+ * Copyright 2013-2014 Axel Huebl, Heiko Burau, Rene Widera, Felix Schmitt,
+ *                      Marco Garten
  *
  * This file is part of PIConGPU.
  *

diff --git a/src/picongpu/include/simulation_defines/param/componentsConfig.param b/src/picongpu/include/simulation_defines/param/componentsConfig.param
@@ -71,15 +71,6 @@ namespace gasProfile = gasNone;
  */
 namespace particleInit = particleInitRandomPos;
 
-///* Ionization Model Configuration ----------------------------------------
-// * 
-// * For development purposes: ---------------------------------------------
-// * - particleIonizerNone : no particle is ionized
-// */
-//namespace particleIonizer = particleIonizerNone;
-///*enable (1) or disable (0) ionization*/
-//#define ENABLE_IONIZATION 1
-
 /*enable (1) or disable (0) current calculation*/
 #define ENABLE_CURRENT 1
 

diff --git a/src/picongpu/include/simulation_defines/param/speciesDefinition.param b/src/picongpu/include/simulation_defines/param/speciesDefinition.param
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2014 Rene Widera
+ * Copyright 2013-2014 Rene Widera, Marco Garten
  *
  * This file is part of PIConGPU.
  *

diff --git a/src/picongpu/include/simulation_defines/unitless/speciesAttributes.unitless b/src/picongpu/include/simulation_defines/unitless/speciesAttributes.unitless
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2014 Rene Widera, Felix Schmitt, Marco Garten
+ * Copyright 2013-2014 Rene Widera, Felix Schmitt
  *
  * This file is part of PIConGPU.
  *
@@ -118,15 +118,6 @@ struct Unit<chargeState >
   }
 };
 
-template<>
-struct Unit<chargeState >
-{
-  static std::vector<double> get()
-  {
-      std::vector<double> unit;
-      return unit;
-  }
-};
 
 }//namespace traits
 } //namespace picongpu
diff --git a/src/picongpu/include/simulation_defines/unitless/speciesDefinition.unitless b/src/picongpu/include/simulation_defines/unitless/speciesDefinition.unitless
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Rene Widera, Marco Garten
+ * Copyright 2014 Rene Widera
  *
  * This file is part of PIConGPU.
  *