Code Tidy January 2024 (#1784)

disorderedmaterials · Jan 31, 2024 · 570aa3a · 570aa3a
1 parent 20874c9
commit 570aa3a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/gui/keywordWidgets/function1DFuncs.cpp b/src/gui/keywordWidgets/function1DFuncs.cpp
@@ -130,9 +130,6 @@ void Function1DKeywordWidget::updateValue(const Flags<DissolveSignals::DataMutat
 // Update keyword data based on widget values
 void Function1DKeywordWidget::updateKeywordData()
 {
-    // Grab the target Function1D
-    auto &function = keyword_->data();
-
     // Get current data from widgets
     auto func = ui_.FunctionCombo->currentData().value<Functions::Function1D>();
     std::vector<double> newParams;

diff --git a/src/kernels/energy.h b/src/kernels/energy.h
@@ -51,12 +51,12 @@ class EnergyResult
 {
     public:
     EnergyResult(PairPotentialEnergyValue pp = {}, double geom = 0.0, double ext = 0.0)
-        : total_(pp.total() + geom + ext), pairPotential_(pp), geometry_(geom), extended_(ext){};
+        : total_(pp.total() + geom + ext), geometry_(geom), extended_(ext), pairPotential_(pp){};
 
     private:
     // Components
-    PairPotentialEnergyValue pairPotential_;
     double total_, geometry_, extended_;
+    PairPotentialEnergyValue pairPotential_;
 
     public:
     double total() const { return total_; };

diff --git a/src/main/io.cpp b/src/main/io.cpp
@@ -232,11 +232,11 @@ bool Dissolve::loadInput(std::string_view filename)
             deserialise(contents);
             return true;
         }
-        catch (toml::syntax_error e)
+        catch (toml::syntax_error &e)
         {
             Messenger::error("Syntax error in TOML file (are you sure you meant the .toml extension?).\n\n{}", e.what());
         }
-        catch (toml::type_error e)
+        catch (toml::type_error &e)
         {
             Messenger::error("Could not load TOML file\n\n{}", e.what());
         }
@@ -262,7 +262,7 @@ bool Dissolve::loadInput(std::string_view filename)
         deserialise(contents);
         return true;
     }
-    catch (toml::syntax_error e)
+    catch (toml::syntax_error &e)
     {
         // The file didn't have TOML syntax, so try the original parser
         // Open file and check that we're OK to proceed reading from it
@@ -279,7 +279,7 @@ bool Dissolve::loadInput(std::string_view filename)
 
         return result;
     }
-    catch (toml::type_error e)
+    catch (toml::type_error &e)
     {
         // The file *was* a TOML file, but it had problems loading
         Messenger::error("Could not load TOML file\n\n{}", e.what());

diff --git a/src/procedure/nodes/operateNumberDensityNormalise.cpp b/src/procedure/nodes/operateNumberDensityNormalise.cpp
@@ -32,7 +32,7 @@ OperateNumberDensityNormaliseProcedureNode::OperateNumberDensityNormaliseProcedu
 // Operate on Data1D target
 bool OperateNumberDensityNormaliseProcedureNode::operateData1D(const ProcessPool &procPool, Configuration *cfg)
 {
-    for (const auto node : normalisationSites_)
+    for (const auto &node : normalisationSites_)
         if (targetPopulation_ == SelectProcedureNode::SelectionPopulation::Average)
             (*targetData1D_) /= (node->nAverageSites() / cfg->box()->volume());
         else if (targetPopulation_ == SelectProcedureNode::SelectionPopulation::Available)
@@ -44,7 +44,7 @@ bool OperateNumberDensityNormaliseProcedureNode::operateData1D(const ProcessPool
 // Operate on Data2D target
 bool OperateNumberDensityNormaliseProcedureNode::operateData2D(const ProcessPool &procPool, Configuration *cfg)
 {
-    for (const auto node : normalisationSites_)
+    for (const auto &node : normalisationSites_)
         if (targetPopulation_ == SelectProcedureNode::SelectionPopulation::Average)
             (*targetData2D_) /= (node->nAverageSites() / cfg->box()->volume());
         else if (targetPopulation_ == SelectProcedureNode::SelectionPopulation::Available)
@@ -56,7 +56,7 @@ bool OperateNumberDensityNormaliseProcedureNode::operateData2D(const ProcessPool
 // Operate on Data3D target
 bool OperateNumberDensityNormaliseProcedureNode::operateData3D(const ProcessPool &procPool, Configuration *cfg)
 {
-    for (const auto node : normalisationSites_)
+    for (const auto &node : normalisationSites_)
         if (targetPopulation_ == SelectProcedureNode::SelectionPopulation::Average)
             (*targetData3D_) /= (node->nAverageSites() / cfg->box()->volume());
         else if (targetPopulation_ == SelectProcedureNode::SelectionPopulation::Available)