fix-clang-tidy issues

lucafedeli88 · Sep 18, 2024 · 5976c62 · 5976c62
1 parent d4ea23b
commit 5976c62
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 30 deletions.
diff --git a/Source/FieldSolver/ElectrostaticSolvers/RelativisticExplicitES.cpp b/Source/FieldSolver/ElectrostaticSolvers/RelativisticExplicitES.cpp
@@ -110,7 +110,7 @@ void RelativisticExplicitES::AddSpaceChargeField (
     }
 
     // Apply filter, perform MPI exchange, interpolate across levels
-    Vector<std::unique_ptr<MultiFab>> rho_buf(num_levels);
+    const Vector<std::unique_ptr<MultiFab>> rho_buf(num_levels);
     warpx.SyncRho(
         amrex::GetVecOfPtrs(rho),
         amrex::GetVecOfPtrs(rho_coarse),

diff --git a/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.H b/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.H
@@ -90,23 +90,23 @@ public:
         ablastr::fields::MultiLevelVectorField const& Bfield,
         ablastr::fields::MultiLevelScalarField const& rhofield,
         ablastr::fields::MultiLevelVectorField const& edge_lengths,
-        bool solve_for_Faraday);
+        bool solve_for_Faraday) const;
 
     void HybridPICSolveE (
         ablastr::fields::VectorField const& Efield,
         ablastr::fields::VectorField const& Jfield,
         ablastr::fields::VectorField const& Bfield,
         amrex::MultiFab const& rhofield,
         ablastr::fields::VectorField const& edge_lengths,
-        int lev, bool solve_for_Faraday);
+        int lev, bool solve_for_Faraday) const;
 
     void HybridPICSolveE (
         ablastr::fields::VectorField const& Efield,
         ablastr::fields::VectorField const& Jfield,
         ablastr::fields::VectorField const& Bfield,
         amrex::MultiFab const& rhofield,
         ablastr::fields::VectorField const& edge_lengths,
-        int lev, PatchType patch_type, bool solve_for_Faraday);
+        int lev, PatchType patch_type, bool solve_for_Faraday) const;
 
     void BfieldEvolveRK (
         ablastr::fields::MultiLevelVectorField const& Bfield,
@@ -140,8 +140,8 @@ public:
      * Function to calculate the electron pressure using the simulation charge
      * density. Used in the Ohm's law solver (kinetic-fluid hybrid model).
      */
-    void CalculateElectronPressure ();
-    void CalculateElectronPressure (int lev);
+    void CalculateElectronPressure () const;
+    void CalculateElectronPressure (int lev) const;
 
     /**
      * \brief Fill the electron pressure multifab given the kinetic particle

diff --git a/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.cpp b/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.cpp
@@ -421,7 +421,7 @@ void HybridPICModel::HybridPICSolveE (
     ablastr::fields::MultiLevelVectorField const& Bfield,
     ablastr::fields::MultiLevelScalarField const& rhofield,
     ablastr::fields::MultiLevelVectorField const& edge_lengths,
-    const bool solve_for_Faraday)
+    const bool solve_for_Faraday) const
 {
     auto& warpx = WarpX::GetInstance();
     for (int lev = 0; lev <= warpx.finestLevel(); ++lev)
@@ -439,7 +439,7 @@ void HybridPICModel::HybridPICSolveE (
     ablastr::fields::VectorField const& Bfield,
     amrex::MultiFab const& rhofield,
     ablastr::fields::VectorField const& edge_lengths,
-    const int lev, const bool solve_for_Faraday)
+    const int lev, const bool solve_for_Faraday) const
 {
     WARPX_PROFILE("WarpX::HybridPICSolveE()");
 
@@ -461,7 +461,7 @@ void HybridPICModel::HybridPICSolveE (
     amrex::MultiFab const& rhofield,
     ablastr::fields::VectorField const& edge_lengths,
     const int lev, PatchType patch_type,
-    const bool solve_for_Faraday)
+    const bool solve_for_Faraday) const
 {
     using ablastr::fields::va2vm;
 
@@ -481,7 +481,7 @@ void HybridPICModel::HybridPICSolveE (
     warpx.ApplyEfieldBoundary(lev, patch_type);
 }
 
-void HybridPICModel::CalculateElectronPressure()
+void HybridPICModel::CalculateElectronPressure() const
 {
     auto& warpx = WarpX::GetInstance();
     for (int lev = 0; lev <= warpx.finestLevel(); ++lev)
@@ -490,7 +490,7 @@ void HybridPICModel::CalculateElectronPressure()
     }
 }
 
-void HybridPICModel::CalculateElectronPressure(const int lev)
+void HybridPICModel::CalculateElectronPressure(const int lev) const
 {
     WARPX_PROFILE("WarpX::CalculateElectronPressure()");
 

diff --git a/Source/Fluids/WarpXFluidContainer.H b/Source/Fluids/WarpXFluidContainer.H
@@ -38,7 +38,7 @@ public:
     WarpXFluidContainer(WarpXFluidContainer&& )                   = default;
     WarpXFluidContainer& operator=(WarpXFluidContainer&& )        = default;
 
-    void AllocateLevelMFs (ablastr::fields::MultiFabRegister& m_fields, const amrex::BoxArray& ba, const amrex::DistributionMapping& dm, int lev);
+    void AllocateLevelMFs (ablastr::fields::MultiFabRegister& m_fields, const amrex::BoxArray& ba, const amrex::DistributionMapping& dm, int lev) const;
 
     void InitData (ablastr::fields::MultiFabRegister& m_fields, amrex::Box init_box, amrex::Real cur_time, int lev);
 
@@ -49,7 +49,7 @@ public:
      */
     void Evolve (ablastr::fields::MultiFabRegister& fields,
                  int lev,
-                 std::string current_fp_string,
+                 const std::string& current_fp_string,
                  amrex::Real cur_time,
                  bool skip_deposition=false);
 

diff --git a/Source/Fluids/WarpXFluidContainer.cpp b/Source/Fluids/WarpXFluidContainer.cpp
@@ -136,7 +136,7 @@ void WarpXFluidContainer::ReadParameters()
     }
 }
 
-void WarpXFluidContainer::AllocateLevelMFs(ablastr::fields::MultiFabRegister& fields, const BoxArray &ba, const DistributionMapping &dm, int lev)
+void WarpXFluidContainer::AllocateLevelMFs(ablastr::fields::MultiFabRegister& fields, const BoxArray &ba, const DistributionMapping &dm, int lev) const
 {
     using ablastr::fields::Direction;
     const int ncomps = 1;
@@ -254,7 +254,7 @@ void WarpXFluidContainer::InitData(ablastr::fields::MultiFabRegister& fields, am
 void WarpXFluidContainer::Evolve(
     ablastr::fields::MultiFabRegister& fields,
     int lev,
-    std::string current_fp_string,
+    const std::string& current_fp_string,
     amrex::Real cur_time,
     bool skip_deposition)
 {

diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp
@@ -96,7 +96,7 @@ namespace
      */
     void CheckGuardCells (
         ablastr::fields::MultiFabRegister& fields,
-        std::string mf_name,
+        const std::string& mf_name,
         int lev
     )
     {

diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp
@@ -1067,7 +1067,7 @@ WarpX::FillBoundaryAux (int lev, IntVect ng)
 }
 
 void
-WarpX::SyncCurrent (std::string current_fp_string)
+WarpX::SyncCurrent (const std::string& current_fp_string)
 {
     using ablastr::fields::Direction;
 
@@ -1237,13 +1237,13 @@ WarpX::SyncCurrent (std::string current_fp_string)
 
 void
 WarpX::SyncRho () {
-    ablastr::fields::MultiLevelScalarField rho_fp = m_fields.has("rho_fp", 0) ?
+    const ablastr::fields::MultiLevelScalarField rho_fp = m_fields.has("rho_fp", 0) ?
         m_fields.get_mr_levels("rho_fp", finest_level) :
         ablastr::fields::MultiLevelScalarField{static_cast<size_t>(finest_level+1)};
-    ablastr::fields::MultiLevelScalarField rho_cp = m_fields.has("rho_cp", 1) ?
+    const ablastr::fields::MultiLevelScalarField rho_cp = m_fields.has("rho_cp", 1) ?
         m_fields.get_mr_levels("rho_cp", finest_level) :
         ablastr::fields::MultiLevelScalarField{static_cast<size_t>(finest_level+1)};
-    ablastr::fields::MultiLevelScalarField rho_buf = m_fields.has("rho_buf", 1) ?
+    const ablastr::fields::MultiLevelScalarField rho_buf = m_fields.has("rho_buf", 1) ?
         m_fields.get_mr_levels("rho_buf", finest_level) :
         ablastr::fields::MultiLevelScalarField{static_cast<size_t>(finest_level+1)};
 

diff --git a/Source/Particles/LaserParticleContainer.H b/Source/Particles/LaserParticleContainer.H
@@ -66,7 +66,7 @@ public:
 
     void Evolve (ablastr::fields::MultiFabRegister& fields,
                  int lev,
-                 std::string current_fp_string,
+                 const std::string& current_fp_string,
                  amrex::Real t, amrex::Real dt, DtType a_dt_type=DtType::Full,
                  bool skip_deposition=false, PushType push_type=PushType::Explicit) final;
 

diff --git a/Source/Particles/LaserParticleContainer.cpp b/Source/Particles/LaserParticleContainer.cpp
@@ -558,7 +558,7 @@ LaserParticleContainer::InitData (int lev)
 void
 LaserParticleContainer::Evolve (ablastr::fields::MultiFabRegister& fields,
                                 int lev,
-                                std::string current_fp_string,
+                                const std::string& current_fp_string,
                                 Real t, Real dt, DtType /*a_dt_type*/, bool skip_deposition, PushType push_type)
 {
     using ablastr::fields::Direction;

diff --git a/Source/Particles/PhotonParticleContainer.H b/Source/Particles/PhotonParticleContainer.H
@@ -48,7 +48,7 @@ public:
 
     void Evolve (ablastr::fields::MultiFabRegister& fields,
                  int lev,
-                 std::string current_fp_string,
+                 const std::string& current_fp_string,
                  amrex::Real t,
                  amrex::Real dt,
                  DtType a_dt_type=DtType::Full,

diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
@@ -231,7 +231,7 @@ PhotonParticleContainer::PushPX (WarpXParIter& pti,
 void
 PhotonParticleContainer::Evolve (ablastr::fields::MultiFabRegister& fields,
                                  int lev,
-                                 std::string current_fp_string,
+                                 const std::string& current_fp_string,
                                  Real t, Real dt, DtType a_dt_type, bool skip_deposition,
                                  PushType push_type)
 {

diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H
@@ -96,7 +96,7 @@ public:
      */
     void Evolve (ablastr::fields::MultiFabRegister& fields,
                  int lev,
-                 std::string current_fp_string,
+                 const std::string& current_fp_string,
                  amrex::Real t,
                  amrex::Real dt,
                  DtType a_dt_type=DtType::Full,

diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
@@ -1746,7 +1746,7 @@ PhysicalParticleContainer::AddPlasmaFlux (PlasmaInjector const& plasma_injector,
 void
 PhysicalParticleContainer::Evolve (ablastr::fields::MultiFabRegister& fields,
                                    int lev,
-                                   std::string current_fp_string,
+                                   const std::string& current_fp_string,
                                    Real /*t*/, Real dt, DtType a_dt_type, bool skip_deposition,
                                    PushType push_type)
 {

diff --git a/Source/Particles/RigidInjectedParticleContainer.H b/Source/Particles/RigidInjectedParticleContainer.H
@@ -63,7 +63,7 @@ public:
 
     void Evolve (ablastr::fields::MultiFabRegister& fields,
                  int lev,
-                 std::string current_fp_string,
+                 const std::string& current_fp_string,
                  amrex::Real t,
                  amrex::Real dt,
                  DtType a_dt_type=DtType::Full,

diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -293,7 +293,7 @@ RigidInjectedParticleContainer::PushPX (WarpXParIter& pti,
 void
 RigidInjectedParticleContainer::Evolve (ablastr::fields::MultiFabRegister& fields,
                                         int lev,
-                                        std::string current_fp_string,
+                                        const std::string& current_fp_string,
                                         Real t, Real dt, DtType a_dt_type, bool skip_deposition,
                                         PushType push_type)
 {

diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
@@ -149,7 +149,7 @@ public:
      */
     virtual void Evolve (ablastr::fields::MultiFabRegister& fields,
                          int lev,
-                         std::string current_fp_string,
+                         const std::string& current_fp_string,
                          amrex::Real t, amrex::Real dt, DtType a_dt_type=DtType::Full, bool skip_deposition=false,
                          PushType push_type=PushType::Explicit) = 0;
 

diff --git a/Source/WarpX.H b/Source/WarpX.H
@@ -805,7 +805,7 @@ public:
      *
      * \param[in] current_fp_string the coarse of fine patch to use for current
      */
-    void SyncCurrent (std::string current_fp_string);
+    void SyncCurrent (const std::string& current_fp_string);
 
     void SyncRho ();