dont shadow T parameter

lanl · Nov 30, 2024 · f37996c · f37996c
1 parent 3e9a1f2
commit f37996c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/singularity-eos/eos/modifiers/eos_unitsystem.hpp b/singularity-eos/eos/modifiers/eos_unitsystem.hpp
@@ -255,17 +255,17 @@ class UnitSystem : public EosBase<UnitSystem<T>> {
   Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicMassFromDensityTemperature(rho * rho_unit_, T * temp_unit_,
-                                                   lambda);
+    return t_.MeanAtomicMassFromDensityTemperature(rho * rho_unit_,
+                                                   temperature * temp_unit_, lambda);
   }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicNumberFromDensityTemperature(rho * rho_unit_, T * temp_unit_,
-                                                     lambda);
+    return t_.MeanAtomicNumberFromDensityTemperature(rho * rho_unit_,
+                                                     temperature * temp_unit_, lambda);
   }
 
   // vector implementations

diff --git a/singularity-eos/eos/modifiers/ramps_eos.hpp b/singularity-eos/eos/modifiers/ramps_eos.hpp
@@ -249,15 +249,15 @@ class BilinearRampEOS : public EosBase<BilinearRampEOS<T>> {
   Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicMassFromDensityTemperature(rho, T, lambda);
+    return t_.MeanAtomicMassFromDensityTemperature(rho, temperature, lambda);
   }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicNumberFromDensityTemperature(rho, T, lambda);
+    return t_.MeanAtomicNumberFromDensityTemperature(rho, temperature, lambda);
   }
 
   // vector implementations

diff --git a/singularity-eos/eos/modifiers/relativistic_eos.hpp b/singularity-eos/eos/modifiers/relativistic_eos.hpp
@@ -188,15 +188,15 @@ class RelativisticEOS : public EosBase<RelativisticEOS<T>> {
   Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicMassFromDensityTemperature(rho, T, lambda);
+    return t_.MeanAtomicMassFromDensityTemperature(rho, temperature, lambda);
   }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicNumberFromDensityTemperature(rho, T, lambda);
+    return t_.MeanAtomicNumberFromDensityTemperature(rho, temperature, lambda);
   }
 
   SG_ADD_MODIFIER_METHODS(T, t_);

diff --git a/singularity-eos/eos/modifiers/scaled_eos.hpp b/singularity-eos/eos/modifiers/scaled_eos.hpp
@@ -348,15 +348,15 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
   Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicMassFromDensityTemperature(scale_ * rho, T, lambda);
+    return t_.MeanAtomicMassFromDensityTemperature(scale_ * rho, temperature, lambda);
   }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicNumberFromDensityTemperature(scale_ * rho, T, lambda);
+    return t_.MeanAtomicNumberFromDensityTemperature(scale_ * rho, temperature, lambda);
   }
 
   SG_ADD_MODIFIER_METHODS(T, t_);

diff --git a/singularity-eos/eos/modifiers/shifted_eos.hpp b/singularity-eos/eos/modifiers/shifted_eos.hpp
@@ -358,15 +358,15 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
   Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicMassFromDensityTemperature(rho, T, lambda);
+    return t_.MeanAtomicMassFromDensityTemperature(rho, temperature, lambda);
   }
   template <typename Indexer_t = Real *>
   PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature(
-      const Real rho, const Real T,
+      const Real rho, const Real temperature,
       Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
-    return t_.MeanAtomicNumberFromDensityTemperature(rho, T, lambda);
+    return t_.MeanAtomicNumberFromDensityTemperature(rho, temperature, lambda);
   }
 
   SG_ADD_MODIFIER_METHODS(T, t_);