Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) Added `sesame2spiner::saveAllMaterials` overloads taking a list of matids instead of a list of input files, with optional per-material `Params` overrides, so host codes can generate an sp5 file without writing input decks to disk. Also added an overload taking an already-open `hid_t`, plus `writeSP5RootAttributes`, so a single sp5 file can be built up one material at a time.

### Fixed (Repair bugs, etc)
- [[PR667]](https://github.com/lanl/singularity-eos/pull/667) Various fixes to shift/unit/scale EOS modifiers.
- [[PR666]](https://github.com/lanl/singularity-eos/pull/666) Add missing "template" to cast calls for compiler compatibility
- [[PR661]](https://github.com/lanl/singularity-eos/pull/661) Fix bug in InternalEnergyFromDensityPressure where the lambda wasn't threaded all the way through.
- `sesame2spiner` now validates the metadata returned by `eosGetMetadata` before using it. A matid absent from the sesame file previously produced all-zero bounds with no error, which reached `log()` and generated NaN grids; it is now reported and skipped.
Expand Down
2 changes: 1 addition & 1 deletion singularity-eos/eos/modifiers/eos_unitsystem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class UnitSystem : public EosBase<UnitSystem<T>> {
transform.y.apply(sie_unit_);
transform.f.apply(inv_press_unit_);)
SG_MODIFIER_FORWARD_1IN_1OUT(MinInternalEnergyFromDensity, transform.x.apply(rho_unit_);
transform.f.apply(sie_unit_);)
transform.f.apply(inv_sie_unit_);)
SG_MODIFIER_FORWARD_2IN_1OUT(SpecificHeatFromDensityTemperature,
transform.x.apply(rho_unit_);
transform.y.apply(temp_unit_);
Expand Down
49 changes: 26 additions & 23 deletions singularity-eos/eos/modifiers/scaled_eos.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
template <typename Indexer_t = Real *>
PORTABLE_FUNCTION Real InternalEnergyFromDensityTemperature(
const Real rho, const Real temperature, Indexer_t &&lambda = nullptr) const {
Real energy = t_.InternalEnergyFromDensityTemperature(rho, temperature, lambda);
Real energy =
t_.InternalEnergyFromDensityTemperature(scale_ * rho, temperature, lambda);
return scale_ * energy;
}
template <typename Indexer_t = Real *>
Expand All @@ -91,7 +92,7 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
template <typename Indexer_t = Real *>
PORTABLE_FUNCTION Real
MinInternalEnergyFromDensity(const Real rho, Indexer_t &&lambda = nullptr) const {
return t_.MinInternalEnergyFromDensity(scale_ * rho, lambda);
return scale_ * t_.MinInternalEnergyFromDensity(scale_ * rho, lambda);
}
template <typename Indexer_t = Real *>
PORTABLE_FUNCTION Real EntropyFromDensityInternalEnergy(
Expand All @@ -102,8 +103,8 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
template <typename Indexer_t = Real *>
PORTABLE_FUNCTION Real SpecificHeatFromDensityInternalEnergy(
const Real rho, const Real sie, Indexer_t &&lambda = nullptr) const {
return t_.SpecificHeatFromDensityInternalEnergy(scale_ * rho, inv_scale_ * sie,
lambda);
return scale_ * t_.SpecificHeatFromDensityInternalEnergy(scale_ * rho,
inv_scale_ * sie, lambda);
}
template <typename Indexer_t = Real *>
PORTABLE_FUNCTION Real BulkModulusFromDensityInternalEnergy(
Expand All @@ -130,7 +131,8 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
template <typename Indexer_t = Real *>
PORTABLE_FUNCTION Real SpecificHeatFromDensityTemperature(
const Real rho, const Real temperature, Indexer_t &&lambda = nullptr) const {
return t_.SpecificHeatFromDensityTemperature(scale_ * rho, temperature, lambda);
return scale_ *
t_.SpecificHeatFromDensityTemperature(scale_ * rho, temperature, lambda);
}
template <typename Indexer_t = Real *>
PORTABLE_FUNCTION Real BulkModulusFromDensityTemperature(
Expand All @@ -146,7 +148,9 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
PORTABLE_FUNCTION void
InternalEnergyFromDensityPressure(const Real rho, const Real P, Real &sie,
Indexer_t &&lambda = nullptr) const {
sie *= inv_scale_;
t_.InternalEnergyFromDensityPressure(scale_ * rho, P, sie, lambda);
sie *= scale_;
}

template <typename Lambda_t = Real *>
Expand All @@ -166,21 +170,14 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
PORTABLE_FUNCTION void FillEos(Real &rho, Real &temp, Real &energy, Real &press,
Real &cv, Real &bmod, const unsigned long output,
Indexer_t &&lambda = nullptr) const {
Real srho, senergy;
switch (t_.PreferredInput()) {
case thermalqs::density | thermalqs::temperature:
srho = scale_ * rho;
t_.FillEos(srho, temp, energy, press, cv, bmod, output, lambda);
energy = scale_ * energy;
break;
case thermalqs::density | thermalqs::specific_internal_energy:
srho = scale_ * rho;
senergy = inv_scale_ * energy;
t_.FillEos(srho, temp, senergy, press, cv, bmod, output, lambda);
break;
default:
EOS_ERROR("Didn't find a valid input for ScaledEOS::FillEOS\n");
}
Real srho = (output & thermalqs::density) ? 0 : scale_ * rho;
Real senergy =
(output & thermalqs::specific_internal_energy) ? 0 : inv_scale_ * energy;
Real scv = 0;
t_.FillEos(srho, temp, senergy, press, scv, bmod, output, lambda);
if (output & thermalqs::density) rho = inv_scale_ * srho;
if (output & thermalqs::specific_internal_energy) energy = scale_ * senergy;
if (output & thermalqs::specific_heat) cv = scale_ * scv;
}

template <typename Indexer_t = Real *>
Expand All @@ -191,6 +188,9 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
t_.ValuesAtReferenceState(rho, temp, sie, press, cv, bmod, dpde, dvdt, lambda);
rho *= inv_scale_;
sie *= scale_;
cv *= scale_;
dpde *= inv_scale_;
dvdt *= scale_;
}

// vector implementations
Expand All @@ -201,12 +201,14 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
SG_MODIFIER_FORWARD_2IN_1OUT(PressureFromDensityInternalEnergy,
transform.x.apply(scale_);
transform.y.apply(inv_scale_);)
SG_MODIFIER_FORWARD_1IN_1OUT(MinInternalEnergyFromDensity, transform.x.apply(scale_);)
SG_MODIFIER_FORWARD_1IN_1OUT(MinInternalEnergyFromDensity, transform.x.apply(scale_);
transform.f.apply(scale_);)
SG_MODIFIER_FORWARD_2IN_1OUT(SpecificHeatFromDensityTemperature,
transform.x.apply(scale_);)
transform.x.apply(scale_);
transform.f.apply(scale_);)
SG_MODIFIER_FORWARD_2IN_1OUT(SpecificHeatFromDensityInternalEnergy,
transform.x.apply(scale_);
transform.y.apply(inv_scale_);)
transform.y.apply(inv_scale_); transform.f.apply(scale_);)
SG_MODIFIER_FORWARD_2IN_1OUT(BulkModulusFromDensityTemperature,
transform.x.apply(scale_);)
SG_MODIFIER_FORWARD_2IN_1OUT(BulkModulusFromDensityInternalEnergy,
Expand All @@ -218,6 +220,7 @@ class ScaledEOS : public EosBase<ScaledEOS<T>> {
transform.x.apply(scale_);
transform.y.apply(inv_scale_);)
SG_MODIFIER_FORWARD_2IN_1OUT(InternalEnergyFromDensityTemperature,
transform.x.apply(scale_);
transform.f.apply(scale_);)
SG_MODIFIER_FORWARD_2IN_1OUT(EntropyFromDensityTemperature, transform.x.apply(scale_);
transform.f.apply(scale_);)
Expand Down
66 changes: 39 additions & 27 deletions singularity-eos/eos/modifiers/shifted_eos.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,42 +151,33 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
PORTABLE_FUNCTION void FillEos(Real &rho, Real &temp, Real &energy, Real &press,
Real &cv, Real &bmod, const unsigned long output,
Indexer_t &&lambda = nullptr) const {
Real senergy;
switch (t_.PreferredInput()) {
case thermalqs::density | thermalqs::temperature:
t_.FillEos(rho, temp, energy, press, cv, bmod, output, lambda);
energy = energy + shift_;
break;
case thermalqs::density | thermalqs::specific_internal_energy:
senergy = energy - shift_;
t_.FillEos(rho, temp, senergy, press, cv, bmod, output, lambda);
break;
default:
EOS_ERROR("Didn't find a valid input for ShiftedEOS::FillEOS\n");
}
Real senergy = (output & thermalqs::specific_internal_energy) ? 0 : energy - shift_;
t_.FillEos(rho, temp, senergy, press, cv, bmod, output, lambda);
if (output & thermalqs::specific_internal_energy) energy = senergy + shift_;
}

// vector implementations
template <typename Space, typename EnableIfSpace =
std::enable_if_t<!variadic_utils::has_int_index_v<Space>>>
inline void shift_sies(const Space &s, const Real *sies, Real *shifted,
const int num) const {
inline void shift_sies(const Space &s, const Real *sies, Real *shifted, const int num,
const Real input_scale = 1) const {
static auto const name =
singularity::mfuncname::member_func_name(typeid(ShiftedEOS<T>).name(), __func__);
static auto const cname = name.c_str();
const auto shift_val = shift_;
portableFor(
cname, s, 0, num,
PORTABLE_LAMBDA(const int i) { shifted[i] = sies[i] - shift_val; });
PORTABLE_LAMBDA(const int i) { shifted[i] = input_scale * sies[i] - shift_val; });
}

template <typename Space, typename EnableIfSpace =
std::enable_if_t<!variadic_utils::has_int_index_v<Space>>>
inline void unshift_sies(const Space &s, Real *sies, const int num) const {
inline void unshift_sies(const Space &s, Real *sies, const int num,
const Real output_scale = 1) const {
static auto const name =
singularity::mfuncname::member_func_name(typeid(ShiftedEOS<T>).name(), __func__);
static auto const cname = name.c_str();
const auto shift_val = shift_;
const auto shift_val = output_scale * shift_;
portableFor(
cname, s, 0, num, PORTABLE_LAMBDA(const int i) { sies[i] += shift_val; });
}
Expand All @@ -200,7 +191,10 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
LambdaIndexer &&lambdas,
Transform &&transform = Transform()) const {
Real *shifted_sies = scratch;
shift_sies(s, sies, shifted_sies, num);
// Apply an outer modifier's energy conversion before subtracting this shift.
const Real input_scale = transform.y.is_set() ? transform.y.get() : Real(1);
shift_sies(s, sies, shifted_sies, num, input_scale);
transform.y.clear();
t_.TemperatureFromDensityInternalEnergy(
s, rhos, shifted_sies, temperatures, &scratch[num], num,
std::forward<LambdaIndexer>(lambdas), std::forward<Transform>(transform));
Expand All @@ -226,7 +220,10 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
const Space &s, const Real *rhos, const Real *sies, Real *pressures, Real *scratch,
const int num, LambdaIndexer &&lambdas, Transform &&transform = Transform()) const {
Real *shifted_sies = scratch;
shift_sies(s, sies, shifted_sies, num);
// Apply an outer modifier's energy conversion before subtracting this shift.
const Real input_scale = transform.y.is_set() ? transform.y.get() : Real(1);
shift_sies(s, sies, shifted_sies, num, input_scale);
transform.y.clear();
t_.PressureFromDensityInternalEnergy(s, rhos, shifted_sies, pressures, &scratch[num],
num, std::forward<LambdaIndexer>(lambdas),
std::forward<Transform>(transform));
Expand All @@ -239,10 +236,11 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
Real *scratch, const int num,
LambdaIndexer &&lambdas,
Transform &&transform = Transform()) const {
t_.MinInternalEnergyFromDensity(s, rhos, sies, &scratch[num], num,
const Real output_scale = transform.f.is_set() ? transform.f.get() : Real(1);
t_.MinInternalEnergyFromDensity(s, rhos, sies, scratch, num,
std::forward<LambdaIndexer>(lambdas),
std::forward<Transform>(transform));
unshift_sies(s, sies, num);
unshift_sies(s, sies, num, output_scale);
}

template <
Expand All @@ -265,7 +263,10 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
const Space &s, const Real *rhos, const Real *sies, Real *cvs, Real *scratch,
const int num, LambdaIndexer &&lambdas, Transform &&transform = Transform()) const {
Real *shifted_sies = scratch;
shift_sies(s, sies, shifted_sies, num);
// Apply an outer modifier's energy conversion before subtracting this shift.
const Real input_scale = transform.y.is_set() ? transform.y.get() : Real(1);
shift_sies(s, sies, shifted_sies, num, input_scale);
transform.y.clear();
t_.SpecificHeatFromDensityInternalEnergy(s, rhos, shifted_sies, cvs, &scratch[num],
num, std::forward<LambdaIndexer>(lambdas),
std::forward<Transform>(transform));
Expand All @@ -291,7 +292,10 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
const Space &s, const Real *rhos, const Real *sies, Real *bmods, Real *scratch,
const int num, LambdaIndexer &&lambdas, Transform &&transform = Transform()) const {
Real *shifted_sies = scratch;
shift_sies(s, sies, shifted_sies, num);
// Apply an outer modifier's energy conversion before subtracting this shift.
const Real input_scale = transform.y.is_set() ? transform.y.get() : Real(1);
shift_sies(s, sies, shifted_sies, num, input_scale);
transform.y.clear();
t_.BulkModulusFromDensityInternalEnergy(s, rhos, shifted_sies, bmods, &scratch[num],
num, std::forward<LambdaIndexer>(lambdas),
std::forward<Transform>(transform));
Expand All @@ -316,7 +320,10 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
const Space &s, const Real *rhos, const Real *sies, Real *gm1s, Real *scratch,
const int num, LambdaIndexer &&lambdas, Transform &&transform = Transform()) const {
Real *shifted_sies = scratch;
shift_sies(s, sies, shifted_sies, num);
// Apply an outer modifier's energy conversion before subtracting this shift.
const Real input_scale = transform.y.is_set() ? transform.y.get() : Real(1);
shift_sies(s, sies, shifted_sies, num, input_scale);
transform.y.clear();
t_.GruneisenParamFromDensityInternalEnergy(s, rhos, shifted_sies, gm1s, &scratch[num],
num, std::forward<LambdaIndexer>(lambdas),
std::forward<Transform>(transform));
Expand All @@ -329,10 +336,12 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
const Space &s, const Real *rhos, const Real *temperatures, Real *sies,
Real *scratch, const int num, LambdaIndexer &&lambdas,
Transform &&transform = Transform()) const {
// Capture the outer output conversion before inner modifiers compose it.
const Real output_scale = transform.f.is_set() ? transform.f.get() : Real(1);
t_.InternalEnergyFromDensityTemperature(s, rhos, temperatures, sies, scratch, num,
std::forward<LambdaIndexer>(lambdas),
std::forward<Transform>(transform));
unshift_sies(s, sies, num);
unshift_sies(s, sies, num, output_scale);
}

template <
Expand All @@ -355,7 +364,10 @@ class ShiftedEOS : public EosBase<ShiftedEOS<T>> {
const Space &s, const Real *rhos, const Real *sies, Real *entropies, Real *scratch,
const int num, LambdaIndexer &&lambdas, Transform &&transform = Transform()) const {
Real *shifted_sies = scratch;
shift_sies(s, sies, shifted_sies, num);
// Apply an outer modifier's energy conversion before subtracting this shift.
const Real input_scale = transform.y.is_set() ? transform.y.get() : Real(1);
shift_sies(s, sies, shifted_sies, num, input_scale);
transform.y.clear();
t_.EntropyFromDensityInternalEnergy(s, rhos, shifted_sies, entropies, &scratch[num],
num, std::forward<LambdaIndexer>(lambdas),
std::forward<Transform>(transform));
Expand Down
Loading
Loading