Skip to content

Commit

Permalink
zsplit compiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonahm-LANL
jonahm-LANL committed Dec 16, 2024
1 parent 6167b75 commit 4b4a2fa
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 30 deletions.
35 changes: 18 additions & 17 deletions singularity-eos/eos/eos_base.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,24 @@ char *StrCat(char *destination, const char *source) {
// VECTOR functionality to overload the scalar implementations in the derived
// classes. Do not add functions here that are not overloads of derived class features.
// TODO(JMM): Should we have more macros that capture just some of these?
#define SG_ADD_BASE_CLASS_USINGS(EOSDERIVED) \
using EosBase<EOSDERIVED>::TemperatureFromDensityInternalEnergy; \
using EosBase<EOSDERIVED>::InternalEnergyFromDensityTemperature; \
using EosBase<EOSDERIVED>::PressureFromDensityTemperature; \
using EosBase<EOSDERIVED>::PressureFromDensityInternalEnergy; \
using EosBase<EOSDERIVED>::MinInternalEnergyFromDensity; \
using EosBase<EOSDERIVED>::SpecificHeatFromDensityTemperature; \
using EosBase<EOSDERIVED>::SpecificHeatFromDensityInternalEnergy; \
using EosBase<EOSDERIVED>::BulkModulusFromDensityTemperature; \
using EosBase<EOSDERIVED>::BulkModulusFromDensityInternalEnergy; \
using EosBase<EOSDERIVED>::GruneisenParamFromDensityTemperature; \
using EosBase<EOSDERIVED>::GruneisenParamFromDensityInternalEnergy; \
using EosBase<EOSDERIVED>::FillEos; \
using EosBase<EOSDERIVED>::EntropyFromDensityTemperature; \
using EosBase<EOSDERIVED>::EntropyFromDensityInternalEnergy; \
using EosBase<EOSDERIVED>::GibbsFreeEnergyFromDensityTemperature; \
using EosBase<EOSDERIVED>::GibbsFreeEnergyFromDensityInternalEnergy;
// JMM: Use VA_ARGS to capture more complex template types
#define SG_ADD_BASE_CLASS_USINGS(...) \
using EosBase<__VA_ARGS__>::TemperatureFromDensityInternalEnergy; \
using EosBase<__VA_ARGS__>::InternalEnergyFromDensityTemperature; \
using EosBase<__VA_ARGS__>::PressureFromDensityTemperature; \
using EosBase<__VA_ARGS__>::PressureFromDensityInternalEnergy; \
using EosBase<__VA_ARGS__>::MinInternalEnergyFromDensity; \
using EosBase<__VA_ARGS__>::SpecificHeatFromDensityTemperature; \
using EosBase<__VA_ARGS__>::SpecificHeatFromDensityInternalEnergy; \
using EosBase<__VA_ARGS__>::BulkModulusFromDensityTemperature; \
using EosBase<__VA_ARGS__>::BulkModulusFromDensityInternalEnergy; \
using EosBase<__VA_ARGS__>::GruneisenParamFromDensityTemperature; \
using EosBase<__VA_ARGS__>::GruneisenParamFromDensityInternalEnergy; \
using EosBase<__VA_ARGS__>::FillEos; \
using EosBase<__VA_ARGS__>::EntropyFromDensityTemperature; \
using EosBase<__VA_ARGS__>::EntropyFromDensityInternalEnergy; \
using EosBase<__VA_ARGS__>::GibbsFreeEnergyFromDensityTemperature; \
using EosBase<__VA_ARGS__>::GibbsFreeEnergyFromDensityInternalEnergy;

// This macro adds these methods to a derived class. Due to scope,
// these can't be implemented in the base class, unless we make
Expand Down
8 changes: 2 additions & 6 deletions singularity-eos/eos/modifiers/scaled_eos.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,9 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
}

PORTABLE_INLINE_FUNCTION
Real MeanAtomicMass() const {
return inv_scale_*t_.MeanAtomicMass();
}
Real MeanAtomicMass() const { return inv_scale_ * t_.MeanAtomicMass(); }
PORTABLE_INLINE_FUNCTION
Real MeanAtomicNumber() const {
return t_.MeanAtomicNumber();
}
Real MeanAtomicNumber() const { return t_.MeanAtomicNumber(); }

template <typename Indexer_t = Real *>
PORTABLE_INLINE_FUNCTION Real MeanAtomicMassFromDensityTemperature(
Expand Down
75 changes: 68 additions & 7 deletions singularity-eos/eos/modifiers/zsplit_eos.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,17 @@ class ZSplit : public EosBase<ZSplit<ztype, T>> {
SG_ADD_BASE_CLASS_USINGS(ZSplit<ztype, T>);

static std::string EosType() {
std::string ts = (ztype == Electrons) ? "Electrons, " : "Ions, ";
std::string ts = (ztype == ZSplitComponent::Electrons) ? "Electrons, " : "Ions, ";
return std::string("ZSplit<") + ts + T::EosType() + std::string(">");
}
std::string ts = (ztype == Electrons) ? "Electrons" : "Ions";
static std::string EosPyType() { return std::string("ZSplit") + ts + T::EosPyType(); }
static std::string EosPyType() {
std::string ts = (ztype == ZSplitComponent::Electrons) ? "Electrons" : "Ions";
return std::string("ZSplit") + ts + T::EosPyType();
}

ZSplit() = default;
PORTABLE_INLINE_FUNCTION
ZSplit(T &&t) : t_(std::forward<T>(t));
{}
ZSplit(T &&t) : t_(std::forward<T>(t)) {}

PORTABLE_INLINE_FUNCTION void CheckParams() const { t_.CheckParams(); }
auto GetOnDevice() { return ZSplit<ztype, T>(t_.GetOnDevice()); }
Expand Down Expand Up @@ -140,7 +141,66 @@ class ZSplit : public EosBase<ZSplit<ztype, T>> {
return scale * t_.BulkModulusFromDensityInternalEnergy(rho, iscale * sie, lambda);
}

template <typename Indexer_t = Real *>
PORTABLE_INLINE_FUNCTION Real GruneisenParamFromDensityTemperature(
const Real rho, const Real temperature,
Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
// (1/rho) (dP/de). Scale cancels in P and e
return t_.GruneisenParameterFromDensityTemperature(rho, temperature, lambda);
}
template <typename Indexer_t = Real *>
PORTABLE_INLINE_FUNCTION Real GruneisenParamFromDensityInternalEnergy(
const Real rho, const Real sie,
Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
const Real iscale = GetInvScale_(lambda);
return t_.GruneisenParameterFromDensityInternalEnergy(rho, iscale * sie, lambda);
}

template <typename Indexer_t = Real *>
PORTABLE_INLINE_FUNCTION void
FillEos(Real &rho, Real &temp, Real &energy, Real &press, Real &cv, Real &bmod,
const unsigned long output,
Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
const Real scale = GetScale_(lambda);
const Real iscale = GetInvScale_(lambda);

const bool sie_output = (output & thermalqs::specific_internal_energy);
const bool sie_input = !sie_output;

const bool press_output = (output & thermalqs::pressure);
const bool press_input = !press_output;

const bool cv_output = (output & thermalqs::specific_heat);
const bool bmod_output = (output & thermalqs::bulk_modulus);

if (sie_input) energy *= iscale;
if (press_input) press *= iscale;

t_.FillEos(rho, temp, energy, press, cv, output, lambda);

// do it to undo if it was input. do it because you need to if
// output
energy *= scale;
press *= scale;
// These aren't input
if (cv_output) cv *= scale;
if (bmod_output) bmod *= scale;
}

template <typename Indexer_t = Real *>
PORTABLE_INLINE_FUNCTION void
ValuesAtReferenceState(Real &rho, Real &temp, Real &sie, Real &press, Real &cv,
Real &bmod, Real &dpde, Real &dvdt,
Indexer_t &&lambda = static_cast<Real *>(nullptr)) const {
const Real scale = GetScale_(lambda);
const Real iscale = GetInvScale_(lambda);
t_.ValuesAtReferenceState(rho, temp, sie, press, cv, bmod, dpde, dvdt);
sie *= scale;
press *= scale;
cv *= scale;
bmod *= scale;
// dvdt, dpde unchanged
}

PORTABLE_INLINE_FUNCTION
int nlambda() const noexcept { return NL + t_.nlambda(); }
Expand Down Expand Up @@ -182,8 +242,9 @@ class ZSplit : public EosBase<ZSplit<ztype, T>> {
PORTABLE_FORCEINLINE_FUNCTION Real GetIonizationState_(const Indexer_t &&lambda) const {
return std::max(0.0, lambda[t_.nlambda()]);
}
// TODO(JMM): Runtime?
template <typename Indexer_t>
PORTABLE_INLINE_FUNCTION Real GetScale_(const Indexer_t &&lambda) const {
PORTABLE_FORCEINLINE_FUNCTION Real GetScale_(const Indexer_t &&lambda) const {
Real Z = GetIonizationState_(lambda);
if constexpr (ztype == ZSplitComponent::Electrons) {
return robust::ratio(Z, Z + 1);
Expand All @@ -192,7 +253,7 @@ class ZSplit : public EosBase<ZSplit<ztype, T>> {
}
}
template <typename Indexer_t>
PORTABLE_INLINE_FUNCTION Real GetInvScale_(const Indexer_t &&lambda) const {
PORTABLE_FORCEINLINE_FUNCTION Real GetInvScale_(const Indexer_t &&lambda) const {
Real Z = GetIonizationState_(lambda);
if constexpr (ztype == ZSplitComponent::Electrons) {
return robust::ratio(Z + 1, Z);
Expand Down

0 comments on commit 4b4a2fa

Please sign in to comment.