More clang-tidy fixes related to variable name length

Author: php1ic

include/inch/dripline.hpp

@@ -18,7 +18,6 @@
 #include <fmt/format.h>
 
 #include <filesystem>
-#include <fstream>
 #include <string>
 #include <utility>
 #include <vector>
@@ -53,7 +52,7 @@ class DripLine
 
   /// Delete both due to const members
   DripLine& operator=(const DripLine&) = delete;
-  DripLine& operator=(DripLine&&) = delete;
+  DripLine& operator=(DripLine&&)      = delete;
 
   virtual ~DripLine() = default;
 
@@ -101,7 +100,10 @@ class DripLine
   /// Container to hold each isotope in the drop model data file
   struct drop_model_data
   {
-    drop_model_data(const int a, const int z, const double me) : A(a), Z(z), N(a - z), ME(me) {}
+    drop_model_data(const int mass_number, const int proton_number, const double mass_excess) :
+        A(mass_number), Z(proton_number), N(mass_number - proton_number), ME(mass_excess)
+    {
+    }
 
     int A{ 0 };
     int Z{ 0 };
@@ -216,7 +218,7 @@ class DripLine
    *
    * \return The neutron number of the dripline
    */
-  inline int GetNeutronDripValue(const int Z) const { return GetDripValue(Z, "Z"); }
+  inline int GetNeutronDripValue(const int proton_number) const { return GetDripValue(proton_number, "Z"); }
 
   /**
    * Wrapper around GetDripValue explicitly for N values and looking for Z
@@ -225,7 +227,7 @@ class DripLine
    *
    * \return The proton number of the dripline
    */
-  inline int GetProtonDripValue(const int N) const { return GetDripValue(N, "N"); }
+  inline int GetProtonDripValue(const int neutron_number) const { return GetDripValue(neutron_number, "N"); }
 
   /**
    * Output the dripline data in a consistent format
@@ -236,9 +238,9 @@ class DripLine
    *
    * \return A std::string to be written to the data file
    */
-  [[nodiscard]] static inline std::string WriteDataLine(const int N, const int Z)
+  [[nodiscard]] static inline std::string WriteDataLine(const int neutron_number, const int proton_number)
   {
-    return fmt::format("{0:>3d} {1:>3d}\n", N, Z);
+    return fmt::format("{0:>3d} {1:>3d}\n", neutron_number, proton_number);
   }
 
   /**

src/dripline.cpp

@@ -45,14 +45,14 @@ bool DripLine::readFRDMFile(const bool overwrite) const
     }
 
   // Read the remainder of the file into the container created for it
-  int A{ 0 };
-  int Z{ 0 };
-  double ME{ 0.0 };
+  int mass_number{ 0 };
+  int proton_number{ 0 };
+  double mass_excess{ 0.0 };
   std::string dummy;
 
-  while (modelFile >> A >> Z >> dummy >> ME)
+  while (modelFile >> mass_number >> proton_number >> dummy >> mass_excess)
     {
-      DripLine::dm_data.emplace_back(A, Z, ME);
+      DripLine::dm_data.emplace_back(mass_number, proton_number, mass_excess);
     }
 
   modelFile.close();
@@ -174,24 +174,25 @@ int DripLine::createFile() const
   // For the neutron drip line, loop through all Z and look for the N value when the separation energy is negative
   if (the_line == LineType::singleneutron || the_line == LineType::doubleneutron)
     {
-      for (int z = DripLine::single_p_lower_limits.first; z <= Limits::MAX_Z; ++z)
+      for (auto proton_number = DripLine::single_p_lower_limits.first; proton_number <= Limits::MAX_Z; ++proton_number)
         {
           // Ignore cases when there is no dripline
-          if (auto N = GetNeutronDripValue(z); N != 0)
+          if (auto neutron_number = GetNeutronDripValue(proton_number); neutron_number != 0)
             {
-              fmt::print(dripFile, "{}", WriteDataLine(N, z));
+              fmt::print(dripFile, "{}", WriteDataLine(neutron_number, proton_number));
             }
         }
     }
   // For the proton drip line, loop through all N and look for the Z value when the separation energy is negative
   else // must be a proton dripline
     {
-      for (int n = DripLine::single_n_lower_limits.second; n <= Limits::MAX_N; ++n)
+      for (auto neutron_number = DripLine::single_n_lower_limits.second; neutron_number <= Limits::MAX_N;
+           ++neutron_number)
         {
           // Ignore cases when there is no dripline
-          if (auto Z = GetProtonDripValue(n); Z != 0)
+          if (auto proton_number = GetProtonDripValue(neutron_number); proton_number != 0)
             {
-              fmt::print(dripFile, "{}", WriteDataLine(n, Z));
+              fmt::print(dripFile, "{}", WriteDataLine(neutron_number, proton_number));
             }
         }
     }