Clean member variable and function names in Radiation.h to respect the Smilei rules

Mathieu Lobet · Mathieu Lobet · commit 393a5c90d089 · 2018-12-12T17:56:18.000+01:00
diff --git a/src/MultiphotonBreitWheeler/MultiphotonBreitWheeler.cpp b/src/MultiphotonBreitWheeler/MultiphotonBreitWheeler.cpp
@@ -25,11 +25,11 @@ MultiphotonBreitWheeler::MultiphotonBreitWheeler(Params& params, Species * speci
     dt    = params.timestep;
 
     // Normalized Schwinger Electric Field
-    norm_E_Schwinger = params.electron_mass*params.c_vacuum*params.c_vacuum
+    norm_E_Schwinger_ = params.electron_mass*params.c_vacuum*params.c_vacuum
                      / (params.red_planck_cst*params.reference_angular_frequency_SI);
 
-    // Inverse of norm_E_Schwinger
-    inv_norm_E_Schwinger = 1./norm_E_Schwinger;
+    // Inverse of norm_E_Schwinger_
+    inv_norm_E_Schwinger_ = 1./norm_E_Schwinger_;
 
     // Number of positrons and electrons generated per event
     this->mBW_pair_creation_sampling[0] = species->mBW_pair_creation_sampling[0];
diff --git a/src/MultiphotonBreitWheeler/MultiphotonBreitWheeler.h b/src/MultiphotonBreitWheeler/MultiphotonBreitWheeler.h
@@ -64,7 +64,7 @@ class MultiphotonBreitWheeler
                                     double & Bx, double & By, double & Bz)
         {
 
-            return inv_norm_E_Schwinger
+            return inv_norm_E_Schwinger_
                   * sqrt( fabs( pow(Ex*kx + Ey*ky + Ez*kz,2)
                   - pow(gamma*Ex - By*kz + Bz*ky,2)
                   - pow(gamma*Ey - Bz*kx + Bx*kz,2)
@@ -146,10 +146,10 @@ class MultiphotonBreitWheeler
         // Factors
 
         //! Normalized Schwinger Electric field
-        double norm_E_Schwinger;
+        double norm_E_Schwinger_;
 
         //! Inverse Normalized Schwinger Electric field
-        double inv_norm_E_Schwinger;
+        double inv_norm_E_Schwinger_;
 
         //! Espilon to check when tau is near 0
         const double epsilon_tau_ = 1e-100;
diff --git a/src/Radiation/Radiation.cpp b/src/Radiation/Radiation.cpp
@@ -20,20 +20,20 @@ Radiation::Radiation(Params& params, Species * species)
     nDim_ = params.nDim_particle;
 
     // Time step
-    dt    = params.timestep;
+    dt_   = params.timestep;
 
     // Inverse of the species mass
     one_over_mass_ = 1./species->mass;
 
     // Normalized Schwinger Electric Field
-    norm_E_Schwinger = params.electron_mass*params.c_vacuum*params.c_vacuum
+    norm_E_Schwinger_ = params.electron_mass*params.c_vacuum*params.c_vacuum
                      / (params.red_planck_cst* params.reference_angular_frequency_SI);
 
-    // Inverse of norm_E_Schwinger
-    inv_norm_E_Schwinger = 1./norm_E_Schwinger;
+    // Inverse of norm_E_Schwinger_
+    inv_norm_E_Schwinger_ = 1./norm_E_Schwinger_;
 
     // The thread radiated energy is initially null
-    radiated_energy = 0;
+    radiated_energy_ = 0;
 }
 
 // -----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ Radiation::~Radiation()
 //! \param iend        Index of the last particle
 //! \param ithread     Thread index
 // -----------------------------------------------------------------------------
-void Radiation::compute_thread_chipa(Particles &particles,
+void Radiation::computeParticlesChi(Particles &particles,
         SmileiMPI* smpi,
         int istart,
         int iend,
@@ -105,7 +105,7 @@ void Radiation::compute_thread_chipa(Particles &particles,
                          + momentum[2][ipart]*momentum[2][ipart]);
 
         // Computation of the Lorentz invariant quantum parameter
-        chi[ipart] = Radiation::compute_chipa(charge_over_mass2,
+        chi[ipart] = Radiation::computeParticleChi(charge_over_mass2,
                  momentum[0][ipart],momentum[1][ipart],momentum[2][ipart],
                  gamma,
                  (*(Ex+ipart-ipart_ref)),(*(Ey+ipart-ipart_ref)),(*(Ez+ipart-ipart_ref)),
diff --git a/src/Radiation/Radiation.h b/src/Radiation/Radiation.h
@@ -62,14 +62,14 @@ class Radiation
         //! \param By y component of the particle magnetic field
         //! \param Bz z component of the particle magnetic field
         //#pragma omp declare simd
-        double inline compute_chipa(double & charge_over_mass2,
+        double inline computeParticleChi(double & charge_over_mass2,
                                      double & px, double & py, double & pz,
                                      double & gamma,
                                      double & Ex, double & Ey, double & Ez,
                                      double & Bx, double & By, double & Bz)
         {
 
-            return fabs(charge_over_mass2)*inv_norm_E_Schwinger
+            return fabs(charge_over_mass2)*inv_norm_E_Schwinger_
                   * sqrt( fabs( pow(Ex*px + Ey*py + Ez*pz,2)
                   - pow(gamma*Ex - By*pz + Bz*py,2)
                   - pow(gamma*Ey - Bz*px + Bx*pz,2)
@@ -79,14 +79,14 @@ class Radiation
         //! Return the total normalized radiated energy
         double inline getRadiatedEnergy()
         {
-            return radiated_energy;
+            return radiated_energy_;
         };
 
         //! Set the total normalized radiated energy of the path
         //! \param value value of the radiated energy to be assigned
         void setRadiatedEnergy(double value)
         {
-            radiated_energy = value;
+            radiated_energy_ = value;
         };
 
         //! Computation of the quantum parameter for the given
@@ -96,7 +96,7 @@ class Radiation
         //! \param istart      Index of the first particle
         //! \param iend        Index of the last particle
         //! \param ithread     Thread index
-        void compute_thread_chipa(Particles &particles,
+        void computeParticlesChi(Particles &particles,
                 SmileiMPI* smpi,
                 int istart,
                 int iend,
@@ -117,19 +117,19 @@ class Radiation
         double one_over_mass_;
 
         //! Time step
-        double dt;
+        double dt_;
 
         //! Radiated energy of the total thread
-        double radiated_energy;
+        double radiated_energy_;
 
         // _________________________________________
         // Factors
 
         //! Normalized Schwinger Electric field
-        double norm_E_Schwinger;
+        double norm_E_Schwinger_;
 
         //! Inverse Normalized Schwinger Electric field
-        double inv_norm_E_Schwinger;
+        double inv_norm_E_Schwinger_;
 
     private:
 
diff --git a/src/Radiation/RadiationCorrLandauLifshitz.cpp b/src/Radiation/RadiationCorrLandauLifshitz.cpp
@@ -102,7 +102,7 @@ void RadiationCorrLandauLifshitz::operator() (
     std::vector <double> rad_norm_energy (iend-istart,0);
 
     // Reinitialize the cumulative radiated energy for the current thread
-    this->radiated_energy = 0.;
+    radiated_energy_ = 0.;
 
     // _______________________________________________________________
     // Computation
@@ -117,7 +117,7 @@ void RadiationCorrLandauLifshitz::operator() (
                              + momentum[2][ipart]*momentum[2][ipart]);
 
         // Computation of the Lorentz invariant quantum parameter
-        particle_chi = Radiation::compute_chipa(charge_over_mass2,
+        particle_chi = Radiation::computeParticleChi(charge_over_mass2,
                      momentum[0][ipart],momentum[1][ipart],momentum[2][ipart],
                      gamma,
                      (*(Ex+ipart-ipart_ref)),(*(Ey+ipart-ipart_ref)),(*(Ez+ipart-ipart_ref)),
@@ -130,7 +130,7 @@ void RadiationCorrLandauLifshitz::operator() (
 
             // Radiated energy during the time step
             temp =
-            RadiationTables.get_corrected_cont_rad_energy_Ridgers(particle_chi,dt);
+            RadiationTables.get_corrected_cont_rad_energy_Ridgers(particle_chi,dt_);
 
             // Temporary factor
             temp *= gamma/(gamma*gamma - 1);
@@ -159,5 +159,5 @@ void RadiationCorrLandauLifshitz::operator() (
     {
         radiated_energy_loc += weight[ipart]*rad_norm_energy[ipart] ;
     }
-    radiated_energy += radiated_energy_loc;
+    radiated_energy_ += radiated_energy_loc;
 }
diff --git a/src/Radiation/RadiationLandauLifshitz.cpp b/src/Radiation/RadiationLandauLifshitz.cpp
@@ -99,7 +99,7 @@ void RadiationLandauLifshitz::operator() (
     std::vector <double> rad_norm_energy (iend-istart,0);
 
     // Reinitialize the cumulative radiated energy for the current thread
-    this->radiated_energy = 0.;
+    radiated_energy_ = 0.;
 
     // _______________________________________________________________
     // Computation
@@ -114,7 +114,7 @@ void RadiationLandauLifshitz::operator() (
                              + momentum[2][ipart]*momentum[2][ipart]);
 
         // Computation of the Lorentz invariant quantum parameter
-        particle_chi = Radiation::compute_chipa(charge_over_mass2,
+        particle_chi = Radiation::computeParticleChi(charge_over_mass2,
                      momentum[0][ipart],momentum[1][ipart],momentum[2][ipart],
                      gamma,
                      (*(Ex+ipart-ipart_ref)),(*(Ey+ipart-ipart_ref)),(*(Ez+ipart-ipart_ref)),
@@ -126,7 +126,7 @@ void RadiationLandauLifshitz::operator() (
 
             // Radiated energy during the time step
             temp =
-            RadiationTables.get_classical_cont_rad_energy(particle_chi,dt);
+            RadiationTables.get_classical_cont_rad_energy(particle_chi,dt_);
 
             // Effect on the momentum
             // Temporary factor
@@ -155,5 +155,5 @@ void RadiationLandauLifshitz::operator() (
     {
         radiated_energy_loc += weight[ipart]*rad_norm_energy[ipart - istart] ;
     }
-    radiated_energy += radiated_energy_loc;
+    radiated_energy_ += radiated_energy_loc;
 }
diff --git a/src/Radiation/RadiationMonteCarlo.cpp b/src/Radiation/RadiationMonteCarlo.cpp
@@ -121,7 +121,7 @@ void RadiationMonteCarlo::operator() (
     // double* chi = &( particles.chi(0));
 
     // Reinitialize the cumulative radiated energy for the current thread
-    this->radiated_energy = 0.;
+    radiated_energy_ = 0.;
 
     // _______________________________________________________________
     // Computation
@@ -135,7 +135,7 @@ void RadiationMonteCarlo::operator() (
         mc_it_nb = 0;
 
         // Monte-Carlo Manager inside the time step
-        while ((local_it_time < dt)
+        while ((local_it_time < dt_)
              &&(mc_it_nb < max_monte_carlo_iterations_))
         {
 
@@ -145,7 +145,7 @@ void RadiationMonteCarlo::operator() (
                              + momentum[2][ipart]*momentum[2][ipart]);
 
             // Computation of the Lorentz invariant quantum parameter
-            particle_chi = Radiation::compute_chipa(charge_over_mass2,
+            particle_chi = Radiation::computeParticleChi(charge_over_mass2,
                      momentum[0][ipart],momentum[1][ipart],momentum[2][ipart],
                      gamma,
                      (*(Ex+ipart-ipart_ref)),(*(Ey+ipart-ipart_ref)),(*(Ez+ipart-ipart_ref)),
@@ -178,7 +178,7 @@ void RadiationMonteCarlo::operator() (
                 // Time to discontinuous emission
                 // If this time is > the remaining iteration time,
                 // we have a synchronization
-                emission_time = std::min(tau[ipart]/temp, dt - local_it_time);
+                emission_time = std::min(tau[ipart]/temp, dt_ - local_it_time);
 
                 // Update of the optical depth
                 tau[ipart] -= temp*emission_time;
@@ -221,7 +221,7 @@ void RadiationMonteCarlo::operator() (
             {
 
                 // Remaining time of the iteration
-                emission_time = dt - local_it_time;
+                emission_time = dt_ - local_it_time;
 
                 // Radiated energy during emission_time
                 cont_rad_energy =
@@ -236,18 +236,18 @@ void RadiationMonteCarlo::operator() (
                 }
 
                 // Incrementation of the radiated energy cumulative parameter
-                radiated_energy += weight[ipart]*(gamma - sqrt(1.0
+                radiated_energy_ += weight[ipart]*(gamma - sqrt(1.0
                                     + momentum[0][ipart]*momentum[0][ipart]
                                     + momentum[1][ipart]*momentum[1][ipart]
                                     + momentum[2][ipart]*momentum[2][ipart]));
 
                 // End for this particle
-                local_it_time = dt;
+                local_it_time = dt_;
             }
             // No emission since particle_chi is too low
             else // if (particle_chi < RadiationTables.get_chipa_radiation_threshold())
             {
-                local_it_time = dt;
+                local_it_time = dt_;
             }
 
         }
@@ -389,6 +389,6 @@ void RadiationMonteCarlo::photon_emission(int ipart,
         gammaph = gammapa - sqrt(1.0 + momentum[0][ipart]*momentum[0][ipart]
                                      + momentum[1][ipart]*momentum[1][ipart]
                                      + momentum[2][ipart]*momentum[2][ipart]);
-        radiated_energy += weight[ipart]*gammaph;
+        radiated_energy_ += weight[ipart]*gammaph;
     }
 }
diff --git a/src/Radiation/RadiationNiel.cpp b/src/Radiation/RadiationNiel.cpp
@@ -77,8 +77,8 @@ void RadiationNiel::operator() (
     // 1/mass^2
     const double one_over_mass_2 = pow(one_over_mass_,2.);
 
-    // Sqrt(dt), used intensively in these loops
-    const double sqrtdt = sqrt(dt);
+    // Sqrt(dt_), used intensively in these loops
+    const double sqrtdt = sqrt(dt_);
 
     // Number of particles
     const int nbparticles = iend-istart;
@@ -113,7 +113,7 @@ void RadiationNiel::operator() (
     double * particle_chi = &( particles.chi(istart));
 
     // Reinitialize the cumulative radiated energy for the current thread
-    this->radiated_energy = 0.;
+    radiated_energy_ = 0.;
 
     const double chipa_radiation_threshold = RadiationTables.get_chipa_radiation_threshold();
     const double factor_cla_rad_power      = RadiationTables.get_factor_cla_rad_power();
@@ -137,7 +137,7 @@ void RadiationNiel::operator() (
                              + momentum[2][ipart]*momentum[2][ipart]);
 
         // Computation of the Lorentz invariant quantum parameter
-        particle_chi[ipart] = Radiation::compute_chipa(charge_over_mass2,
+        particle_chi[ipart] = Radiation::computeParticleChi(charge_over_mass2,
                      momentum[0][ipart],momentum[1][ipart],momentum[2][ipart],
                      gamma[ipart],
                      (*(Ex+ipart-ipart_ref)),(*(Ey+ipart-ipart_ref)),(*(Ez+ipart-ipart_ref)),
@@ -155,7 +155,7 @@ void RadiationNiel::operator() (
         {
 
           // Pick a random number in the normal distribution of standard
-          // deviation sqrt(dt) (variance dt)
+          // deviation sqrt(dt_) (variance dt_)
           random_numbers[ipart] = Rand::normal(sqrtdt);
         }
     }*/
@@ -170,7 +170,7 @@ void RadiationNiel::operator() (
         {
 
           // Pick a random number in the normal distribution of standard
-          // deviation sqrt(dt) (variance dt)
+          // deviation sqrt(dt_) (variance dt_)
           //random_numbers[ipart] = 2.*Rand::uniform() -1.;
           random_numbers[ipart] = 2.*drand48() -1.;
         }
@@ -302,7 +302,7 @@ void RadiationNiel::operator() (
 
             // Radiated energy during the time step
             rad_energy =
-            RadiationTables.get_corrected_cont_rad_energy_Ridgers(particle_chi[ipart],dt);
+            RadiationTables.get_corrected_cont_rad_energy_Ridgers(particle_chi[ipart],dt_);
 
             // Effect on the momentum
             // Temporary factor
@@ -330,7 +330,7 @@ void RadiationNiel::operator() (
                             + momentum[1][ipart]*momentum[1][ipart]
                             + momentum[2][ipart]*momentum[2][ipart]));
     }
-    radiated_energy += radiated_energy_loc;
+    radiated_energy_ += radiated_energy_loc;
 
     //double t5 = MPI_Wtime();
 
diff --git a/src/Species/Species.cpp b/src/Species/Species.cpp
diff --git a/src/Species/SpeciesAdaptiveV2.cpp b/src/Species/SpeciesAdaptiveV2.cpp
diff --git a/src/Species/SpeciesV.cpp b/src/Species/SpeciesV.cpp
