Merge Pull Request #253 from E3SM-Project/EKAT/bartgol/units-classes-…

…mods Automatically Merged using E3SM Pull Request AutoTester PR Title: Removed pointless const, which prevented assignment PR Author: bartgol
E3SM-Project · Sep 19, 2022 · 741edc4 · 741edc4
2 parents 03ac1e0 + 4dc8381
commit 741edc4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/ekat/util/ekat_rational_constant.hpp b/src/ekat/util/ekat_rational_constant.hpp
@@ -36,8 +36,8 @@ struct RationalConstant {
 
   using iType = long long;
 
-  const iType num;
-  const iType den;
+  iType num;
+  iType den;
 
   // No default
   RationalConstant () = delete;
@@ -65,6 +65,7 @@ struct RationalConstant {
     // Nothing to do here
   }
   constexpr RationalConstant (const RationalConstant&) = default;
+  constexpr RationalConstant& operator= (const RationalConstant&) = default;
 
   constexpr RationalConstant operator- () const {
     return RationalConstant(-num,den);

diff --git a/src/ekat/util/ekat_scaling_factor.hpp b/src/ekat/util/ekat_scaling_factor.hpp
@@ -10,8 +10,8 @@ namespace ekat
 {
 
 struct ScalingFactor {
-  const RationalConstant base;
-  const RationalConstant exp;
+  RationalConstant base;
+  RationalConstant exp;
 
   ScalingFactor () = delete;
   constexpr ScalingFactor (const RationalConstant& s)
@@ -29,6 +29,8 @@ struct ScalingFactor {
 
   constexpr ScalingFactor (const ScalingFactor&) = default;
 
+  constexpr ScalingFactor& operator= (const ScalingFactor&) = default;
+
   static constexpr ScalingFactor one () { return ScalingFactor(1); }
   static constexpr ScalingFactor zero () { return ScalingFactor(0); }
 

diff --git a/src/ekat/util/ekat_units.hpp b/src/ekat/util/ekat_units.hpp
@@ -133,10 +133,10 @@ class Units {
 
   friend std::string to_string(const Units&);
 
-  const ScalingFactor                   m_scaling;
-  const std::array<RationalConstant,7>  m_units;
+  ScalingFactor                   m_scaling;
+  std::array<RationalConstant,7>  m_units;
 
-  const char*                           m_name;
+  const char*                     m_name;
 };
 
 // === Operators/functions overload === //