Reintroduce modernize-pass-by-value check and fix. (Exawind#528)

stephan-rohr · Dec 31, 2021 · d424a89 · d424a89
1 parent 994ab5b
commit d424a89
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 30 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,corecppguidelines-*,modernize-*,readability-*,-readability-magic-numbers,-readability-identifier-naming,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,-readability-named-parameter,-readability-implicit-bool-conversion,-readability-isolate-declaration,-readability-braces-around-statements,-modernize-pass-by-value,-clang-analyzer-optin.cplusplus.VirtualCall,-clang-analyzer-core.NonNullParamChecker'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,corecppguidelines-*,modernize-*,readability-*,-readability-magic-numbers,-readability-identifier-naming,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,-readability-named-parameter,-readability-implicit-bool-conversion,-readability-isolate-declaration,-readability-braces-around-statements,-clang-analyzer-optin.cplusplus.VirtualCall,-clang-analyzer-core.NonNullParamChecker'
 WarningsAsErrors: ''
 HeaderFilterRegex: '^((?!/amrex/Src/|/googletest/).)*$'
 AnalyzeTemporaryDtors: false

diff --git a/amr-wind/core/Field.H b/amr-wind/core/Field.H
@@ -31,7 +31,7 @@ struct FieldInfo
     static constexpr int max_field_states = 5;
 
     FieldInfo(
-        const std::string& basename,
+        std::string basename,
         const int ncomp,
         const int ngrow,
         const int nstates,
@@ -360,8 +360,8 @@ public:
 protected:
     Field(
         FieldRepo& repo,
-        const std::string& name,
-        const std::shared_ptr<FieldInfo>& finfo,
+        std::string name,
+        std::shared_ptr<FieldInfo> finfo,
         const unsigned fid,
         FieldState state);
 

diff --git a/amr-wind/core/Field.cpp b/amr-wind/core/Field.cpp
@@ -1,3 +1,5 @@
+#include <utility>
+
 #include "amr-wind/core/Field.H"
 #include "amr-wind/core/FieldRepo.H"
 #include "amr-wind/core/FieldFillPatchOps.H"
@@ -8,12 +10,12 @@
 namespace amr_wind {
 
 FieldInfo::FieldInfo(
-    const std::string& basename,
+    std::string basename,
     const int ncomp,
     const int ngrow,
     const int nstates,
     const FieldLoc floc)
-    : m_basename(basename)
+    : m_basename(std::move(basename))
     , m_ncomp(ncomp)
     , m_ngrow(ngrow)
     , m_nstates(nstates)
@@ -84,11 +86,15 @@ void FieldInfo::copy_bc_to_device() noexcept
 
 Field::Field(
     FieldRepo& repo,
-    const std::string& name,
-    const std::shared_ptr<FieldInfo>& info,
+    std::string name,
+    std::shared_ptr<FieldInfo> info,
     const unsigned fid,
     const FieldState state)
-    : m_repo(repo), m_name(name), m_info(info), m_id(fid), m_state(state)
+    : m_repo(repo)
+    , m_name(std::move(name))
+    , m_info(std::move(info))
+    , m_id(fid)
+    , m_state(state)
 {}
 
 Field::~Field() = default;

diff --git a/amr-wind/core/IntField.H b/amr-wind/core/IntField.H
@@ -60,7 +60,7 @@ public:
 protected:
     IntField(
         FieldRepo& repo,
-        const std::string& name,
+        std::string name,
         const unsigned fid,
         const int ncomp = 1,
         const int ngrow = 1,

diff --git a/amr-wind/core/IntField.cpp b/amr-wind/core/IntField.cpp
@@ -1,17 +1,19 @@
+#include <utility>
+
 #include "amr-wind/core/IntField.H"
 #include "amr-wind/core/FieldRepo.H"
 
 namespace amr_wind {
 
 IntField::IntField(
     FieldRepo& repo,
-    const std::string& name,
+    std::string name,
     const unsigned fid,
     const int ncomp,
     const int ngrow,
     const FieldLoc floc)
     : m_repo(repo)
-    , m_name(name)
+    , m_name(std::move(name))
     , m_id(fid)
     , m_ncomp(ncomp)
     , m_ngrow(ngrow)

diff --git a/amr-wind/utilities/averaging/TimeAveraging.H b/amr-wind/utilities/averaging/TimeAveraging.H
@@ -51,7 +51,7 @@ class TimeAveraging : public PostProcessBase::Register<TimeAveraging>
 public:
     static std::string identifier() { return "TimeAveraging"; }
 
-    TimeAveraging(CFDSim&, const std::string&);
+    TimeAveraging(CFDSim&, std::string);
 
     virtual ~TimeAveraging();
 

diff --git a/amr-wind/utilities/averaging/TimeAveraging.cpp b/amr-wind/utilities/averaging/TimeAveraging.cpp
@@ -1,3 +1,5 @@
+#include <utility>
+
 #include "amr-wind/utilities/averaging/TimeAveraging.H"
 #include "amr-wind/utilities/averaging/ReAveraging.H"
 #include "amr-wind/CFDSim.H"
@@ -7,8 +9,8 @@
 namespace amr_wind {
 namespace averaging {
 
-TimeAveraging::TimeAveraging(CFDSim& sim, const std::string& label)
-    : m_sim(sim), m_label(label)
+TimeAveraging::TimeAveraging(CFDSim& sim, std::string label)
+    : m_sim(sim), m_label(std::move(label))
 {}
 
 TimeAveraging::~TimeAveraging() = default;

diff --git a/amr-wind/utilities/sampling/Enstrophy.H b/amr-wind/utilities/sampling/Enstrophy.H
@@ -19,7 +19,7 @@ class Enstrophy : public PostProcessBase::Register<Enstrophy>
 public:
     static const std::string identifier() { return "Enstrophy"; }
 
-    Enstrophy(CFDSim&, const std::string&);
+    Enstrophy(CFDSim&, std::string);
 
     ~Enstrophy();
 

diff --git a/amr-wind/utilities/sampling/Enstrophy.cpp b/amr-wind/utilities/sampling/Enstrophy.cpp
@@ -2,16 +2,17 @@
 #include "amr-wind/utilities/io_utils.H"
 #include "amr-wind/utilities/ncutils/nc_interface.H"
 #include <AMReX_MultiFabUtil.H>
+#include <utility>
 #include "AMReX_ParmParse.H"
 #include "amr-wind/utilities/IOManager.H"
 #include "amr-wind/fvm/vorticity_mag.H"
 
 namespace amr_wind {
 namespace enstrophy {
 
-Enstrophy::Enstrophy(CFDSim& sim, const std::string& label)
+Enstrophy::Enstrophy(CFDSim& sim, std::string label)
     : m_sim(sim)
-    , m_label(label)
+    , m_label(std::move(label))
     , m_velocity(sim.repo().get_field("velocity"))
     , m_density(sim.repo().get_field("density"))
 {}

diff --git a/amr-wind/utilities/sampling/FieldNorms.H b/amr-wind/utilities/sampling/FieldNorms.H
@@ -19,7 +19,7 @@ class FieldNorms : public PostProcessBase::Register<FieldNorms>
 public:
     static const std::string identifier() { return "FieldNorms"; }
 
-    FieldNorms(CFDSim&, const std::string&);
+    FieldNorms(CFDSim&, std::string);
 
     ~FieldNorms();
 

diff --git a/amr-wind/utilities/sampling/FieldNorms.cpp b/amr-wind/utilities/sampling/FieldNorms.cpp
@@ -2,14 +2,15 @@
 #include "amr-wind/utilities/io_utils.H"
 #include "amr-wind/utilities/ncutils/nc_interface.H"
 #include <AMReX_MultiFabUtil.H>
+#include <utility>
 #include "AMReX_ParmParse.H"
 #include "amr-wind/utilities/IOManager.H"
 
 namespace amr_wind {
 namespace field_norms {
 
-FieldNorms::FieldNorms(CFDSim& sim, const std::string& label)
-    : m_sim(sim), m_label(label)
+FieldNorms::FieldNorms(CFDSim& sim, std::string label)
+    : m_sim(sim), m_label(std::move(label))
 {}
 
 FieldNorms::~FieldNorms() = default;

diff --git a/amr-wind/utilities/sampling/FreeSurface.H b/amr-wind/utilities/sampling/FreeSurface.H
@@ -32,7 +32,7 @@ class FreeSurface : public PostProcessBase::Register<FreeSurface>
 public:
     static const std::string identifier() { return "FreeSurface"; }
 
-    FreeSurface(CFDSim&, const std::string&);
+    FreeSurface(CFDSim&, std::string);
 
     ~FreeSurface();
 

diff --git a/amr-wind/utilities/sampling/FreeSurface.cpp b/amr-wind/utilities/sampling/FreeSurface.cpp
@@ -1,15 +1,16 @@
 #include "amr-wind/utilities/sampling/FreeSurface.H"
 #include "amr-wind/utilities/io_utils.H"
 #include <AMReX_MultiFabUtil.H>
+#include <utility>
 #include "amr-wind/utilities/ncutils/nc_interface.H"
 
 #include "AMReX_ParmParse.H"
 
 namespace amr_wind {
 namespace free_surface {
 
-FreeSurface::FreeSurface(CFDSim& sim, const std::string& label)
-    : m_sim(sim), m_label(label), m_vof(sim.repo().get_field("vof"))
+FreeSurface::FreeSurface(CFDSim& sim, std::string label)
+    : m_sim(sim), m_label(std::move(label)), m_vof(sim.repo().get_field("vof"))
 {
 #ifdef AMREX_USE_GPU
     amrex::Print() << "WARNING: FreeSurface: Running on GPUs..." << std::endl;

diff --git a/amr-wind/utilities/sampling/KineticEnergy.H b/amr-wind/utilities/sampling/KineticEnergy.H
@@ -19,7 +19,7 @@ class KineticEnergy : public PostProcessBase::Register<KineticEnergy>
 public:
     static const std::string identifier() { return "KineticEnergy"; }
 
-    KineticEnergy(CFDSim&, const std::string&);
+    KineticEnergy(CFDSim&, std::string);
 
     ~KineticEnergy();
 

diff --git a/amr-wind/utilities/sampling/KineticEnergy.cpp b/amr-wind/utilities/sampling/KineticEnergy.cpp
@@ -2,15 +2,16 @@
 #include "amr-wind/utilities/io_utils.H"
 #include "amr-wind/utilities/ncutils/nc_interface.H"
 #include <AMReX_MultiFabUtil.H>
+#include <utility>
 #include "AMReX_ParmParse.H"
 #include "amr-wind/utilities/IOManager.H"
 
 namespace amr_wind {
 namespace kinetic_energy {
 
-KineticEnergy::KineticEnergy(CFDSim& sim, const std::string& label)
+KineticEnergy::KineticEnergy(CFDSim& sim, std::string label)
     : m_sim(sim)
-    , m_label(label)
+    , m_label(std::move(label))
     , m_velocity(sim.repo().get_field("velocity"))
     , m_density(sim.repo().get_field("density"))
 {}

diff --git a/amr-wind/utilities/sampling/Sampling.H b/amr-wind/utilities/sampling/Sampling.H
@@ -42,7 +42,7 @@ class Sampling : public PostProcessBase::Register<Sampling>
 public:
     static const std::string identifier() { return "Sampling"; }
 
-    Sampling(CFDSim&, const std::string&);
+    Sampling(CFDSim&, std::string);
 
     virtual ~Sampling();
 

diff --git a/amr-wind/utilities/sampling/Sampling.cpp b/amr-wind/utilities/sampling/Sampling.cpp
@@ -1,4 +1,5 @@
 #include <memory>
+#include <utility>
 
 #include "amr-wind/utilities/sampling/Sampling.H"
 #include "amr-wind/utilities/io_utils.H"
@@ -9,8 +10,8 @@
 namespace amr_wind {
 namespace sampling {
 
-Sampling::Sampling(CFDSim& sim, const std::string& label)
-    : m_sim(sim), m_label(label)
+Sampling::Sampling(CFDSim& sim, std::string label)
+    : m_sim(sim), m_label(std::move(label))
 {}
 
 Sampling::~Sampling() = default;