From f37996cb8bdb489e6929c8aad5c8262848036fa7 Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Sat, 30 Nov 2024 16:23:08 -0700 Subject: [PATCH] dont shadow T parameter --- singularity-eos/eos/modifiers/eos_unitsystem.hpp | 12 ++++++------ singularity-eos/eos/modifiers/ramps_eos.hpp | 8 ++++---- singularity-eos/eos/modifiers/relativistic_eos.hpp | 8 ++++---- singularity-eos/eos/modifiers/scaled_eos.hpp | 8 ++++---- singularity-eos/eos/modifiers/shifted_eos.hpp | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/singularity-eos/eos/modifiers/eos_unitsystem.hpp b/singularity-eos/eos/modifiers/eos_unitsystem.hpp index 06ac894e0f..7fec533f65 100644 --- a/singularity-eos/eos/modifiers/eos_unitsystem.hpp +++ b/singularity-eos/eos/modifiers/eos_unitsystem.hpp @@ -255,17 +255,17 @@ class UnitSystem : public EosBase> { Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(nullptr)) const { - return t_.MeanAtomicMassFromDensityTemperature(rho * rho_unit_, T * temp_unit_, - lambda); + return t_.MeanAtomicMassFromDensityTemperature(rho * rho_unit_, + temperature * temp_unit_, lambda); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(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 index 5db6f340ab..202936186e 100644 --- a/singularity-eos/eos/modifiers/ramps_eos.hpp +++ b/singularity-eos/eos/modifiers/ramps_eos.hpp @@ -249,15 +249,15 @@ class BilinearRampEOS : public EosBase> { Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(nullptr)) const { - return t_.MeanAtomicMassFromDensityTemperature(rho, T, lambda); + return t_.MeanAtomicMassFromDensityTemperature(rho, temperature, lambda); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(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 index 72a34865f0..ad2ba15e5a 100644 --- a/singularity-eos/eos/modifiers/relativistic_eos.hpp +++ b/singularity-eos/eos/modifiers/relativistic_eos.hpp @@ -188,15 +188,15 @@ class RelativisticEOS : public EosBase> { Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(nullptr)) const { - return t_.MeanAtomicMassFromDensityTemperature(rho, T, lambda); + return t_.MeanAtomicMassFromDensityTemperature(rho, temperature, lambda); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(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 index 76db90a01a..d1ff50a2c0 100644 --- a/singularity-eos/eos/modifiers/scaled_eos.hpp +++ b/singularity-eos/eos/modifiers/scaled_eos.hpp @@ -348,15 +348,15 @@ class ScaledEOS : public EosBase> { Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(nullptr)) const { - return t_.MeanAtomicMassFromDensityTemperature(scale_ * rho, T, lambda); + return t_.MeanAtomicMassFromDensityTemperature(scale_ * rho, temperature, lambda); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(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 index 465b6e585f..e006a0ce68 100644 --- a/singularity-eos/eos/modifiers/shifted_eos.hpp +++ b/singularity-eos/eos/modifiers/shifted_eos.hpp @@ -358,15 +358,15 @@ class ShiftedEOS : public EosBase> { Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(nullptr)) const { - return t_.MeanAtomicMassFromDensityTemperature(rho, T, lambda); + return t_.MeanAtomicMassFromDensityTemperature(rho, temperature, lambda); } template PORTABLE_INLINE_FUNCTION Real MeanAtomicNumberFromDensityTemperature( - const Real rho, const Real T, + const Real rho, const Real temperature, Indexer_t &&lambda = static_cast(nullptr)) const { - return t_.MeanAtomicNumberFromDensityTemperature(rho, T, lambda); + return t_.MeanAtomicNumberFromDensityTemperature(rho, temperature, lambda); } SG_ADD_MODIFIER_METHODS(T, t_);