Skip to content

Change search region for spiner #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2025
Merged

Change search region for spiner #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76f06d5
Change search region for spiner
jonahm-LANL Sep 17, 2025
5568316
Fix issue where we weren't taking the log
jonahm-LANL Sep 17, 2025
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
10 changes: 6 additions & 4 deletions singularity-eos/eos/eos_spiner_rho_sie.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,8 @@ SpinerEOSDependsRhoSieTransformable<TransformerT>::lRhoFromPlT_(
const RootFinding1D::RootCounts *pcounts =
(memoryStatus_ == DataStatus::OnDevice) ? nullptr : &counts;
RootFinding1D::Status status = RootFinding1D::Status::SUCCESS;
const Real rhopmin = spiner_common::to_log(rho_at_pmin_.interpToReal(lT), lRhoOffset_);

Real lRho;
Real dPdRhoMax = dPdRhoMax_.interpToReal(lT);
Real PMax = PlRhoMax_.interpToReal(lT);
Expand All @@ -779,14 +781,14 @@ SpinerEOSDependsRhoSieTransformable<TransformerT>::lRhoFromPlT_(
pcounts->increment(0);
}
} else {
Real lRhoGuess = reproducible_ ? lRhoMin_ : 0.5 * (lRhoMin_ + lRhoMax_);
Real lRhoGuess = reproducible_ ? lRhoMax_ : 0.5 * (rhopmin + lRhoMax_);
Real lRho_cache;
IndexerUtils::SafeGet<IndexableTypes::LogDensity>(lambda, Lambda::lRho, lRho_cache);
if ((lRhoMin_ <= lRho_cache) && (lRho_cache <= lRhoMax_)) {
if ((rhopmin <= lRho_cache) && (lRho_cache <= lRhoMax_)) {
lRhoGuess = lRho_cache;
}
const callable_interp::l_interp PFunc(dependsRhoT_.P, lT);
status = SP_ROOT_FINDER(PFunc, P, lRhoGuess, lRhoMin_, lRhoMax_, robust::EPS(),
status = SP_ROOT_FINDER(PFunc, P, lRhoGuess, rhopmin, lRhoMax_, robust::EPS(),
robust::EPS(), lRho, pcounts);
if (status != RootFinding1D::Status::SUCCESS) {
#if SPINER_EOS_VERBOSE
Expand All @@ -798,7 +800,7 @@ SpinerEOSDependsRhoSieTransformable<TransformerT>::lRhoFromPlT_(
<< "lRhoGuess = " << lRhoGuess << std::endl;
EOS_ERROR(errorMessage.str().c_str());
#endif // SPINER_EOS_VERBOSE
lRho = reproducible_ ? lRhoMin_ : lRhoGuess;
lRho = reproducible_ ? lRhoMax_ : lRhoGuess;
}
}
IndexerUtils::SafeSet<IndexableTypes::LogDensity>(lambda, Lambda::lRho, lRho);
Expand Down
30 changes: 12 additions & 18 deletions singularity-eos/eos/eos_spiner_rho_temp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ class SpinerEOSDependsRhoT : public EosBase<SpinerEOSDependsRhoT> {

int numRho_, numT_;
Real lRhoMin_, lRhoMax_, rhoMax_;
Real lRhoMinSearch_;
Real lTMin_, lTMax_, TMax_;
Real PMin_;
Real rhoNormal_, TNormal_, sieNormal_, PNormal_;
Expand Down Expand Up @@ -494,9 +493,6 @@ inline herr_t SpinerEOSDependsRhoT::loadDataboxes_(const std::string &matid_str,
TMax_ = from_log(lTMax_, lTOffset_);

Real rhoMin = from_log(lRhoMin_, lRhoOffset_);
Real rhoMinSearch = std::max(
rhoMin, std::max(std::abs(robust::EPS()) * 10, std::abs(robust::EPS() * rhoMin)));
lRhoMinSearch_ = to_log(rhoMinSearch, lRhoOffset_);

// bulk modulus can be wrong in the tables. Use FLAG's approach to
// fix the table.
Expand Down Expand Up @@ -920,40 +916,38 @@ template <typename Indexer_t>
PORTABLE_INLINE_FUNCTION Real SpinerEOSDependsRhoT::lRhoFromPlT_(
const Real P, const Real lT, TableStatus &whereAmI, Indexer_t &&lambda) const {
RootFinding1D::Status status = RootFinding1D::Status::SUCCESS;
Real rhopmin = lRho_(rho_at_pmin_.interpToReal(lT));

Real lRho;
Real lRhoGuess = reproducible_ ? lRhoMax_ : 0.5 * (lRhoMin_ + lRhoMax_);
Real lRhoGuess = reproducible_ ? lRhoMax_ : 0.5 * (rhopmin + lRhoMax_);
// Real lRhoGuess = lRhoMin_ + 0.9*(lRhoMax_ - lRhoMin_);
const RootFinding1D::RootCounts *pcounts =
(memoryStatus_ == DataStatus::OnDevice) ? nullptr : &counts;

Real lRho_cache;
IndexerUtils::SafeGet<IndexableTypes::LogDensity>(lambda, Lambda::lRho, lRho_cache);
if ((lRhoMin_ <= lRho_cache) && (lRho_cache <= lRhoMax_)) {
if ((rhopmin <= lRho_cache) && (lRho_cache <= lRhoMax_)) {
lRhoGuess = lRho_cache;
}

if (lT <= lTMin_) { // cold curve
whereAmI = TableStatus::OffBottom;
const callable_interp::interp PFunc(PCold_);
status =
SP_ROOT_FINDER(PFunc, P, lRhoGuess,
// lRhoMin_, lRhoMax_,
lRhoMinSearch_, lRhoMax_, ROOT_THRESH, ROOT_THRESH, lRho, pcounts);
status = SP_ROOT_FINDER(PFunc, P, lRhoGuess,
// lRhoMin_, lRhoMax_,
rhopmin, lRhoMax_, ROOT_THRESH, ROOT_THRESH, lRho, pcounts);
} else if (lT >= lTMax_) { // ideal gas
whereAmI = TableStatus::OffTop;
const callable_interp::prod_interp_1d PFunc(gm1Max_, dEdTMax_, lT);
status =
SP_ROOT_FINDER(PFunc, P, lRhoGuess,
// lRhoMin_, lRhoMax_,
lRhoMinSearch_, lRhoMax_, ROOT_THRESH, ROOT_THRESH, lRho, pcounts);
status = SP_ROOT_FINDER(PFunc, P, lRhoGuess,
// lRhoMin_, lRhoMax_,
rhopmin, lRhoMax_, ROOT_THRESH, ROOT_THRESH, lRho, pcounts);
} else { // on table
whereAmI = TableStatus::OnTable;
const callable_interp::l_interp PFunc(P_, lT);
status =
SP_ROOT_FINDER(PFunc, P, lRhoGuess,
// lRhoMin_, lRhoMax_,
lRhoMinSearch_, lRhoMax_, ROOT_THRESH, ROOT_THRESH, lRho, pcounts);
status = SP_ROOT_FINDER(PFunc, P, lRhoGuess,
// lRhoMin_, lRhoMax_,
rhopmin, lRhoMax_, ROOT_THRESH, ROOT_THRESH, lRho, pcounts);
}
if (status != RootFinding1D::Status::SUCCESS) {
#if SPINER_EOS_VERBOSE
Expand Down