Merge pull request #263 from lanl/jmm/singularity-fix-mass-fractions

fix interpolation of mass fractions
lanl · Jun 1, 2023 · b2a61fa · b2a61fa
2 parents c59bb3a + a9b686c
commit b2a61fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current develop
 
 ### Fixed (Repair bugs, etc)
+- [[PR263]](https://github.com/lanl/singularity-eos/pull/263) Fix stellar collapse mass fraction interpolation
 - [[PR258]](https://github.com/lanl/singularity-eos/pull/258) Fix EOSPAC vector performance and add warnings when slower version gets selected.
 - [[PR243]](https://github.com/lanl/singularity-eos/pull/243) Remove undefined behavior caused by diagnostic variables. Also fixed some compiler warnings.
 - [[PR239]](https://github.com/lanl/singularity-eos/pull/239#issuecomment-1473166925) Add JQuery to dependencies for docs to repair build

diff --git a/singularity-eos/eos/eos_stellar_collapse.hpp b/singularity-eos/eos/eos_stellar_collapse.hpp
@@ -604,12 +604,12 @@ void StellarCollapse::MassFractionsFromDensityTemperature(
     Real &Abar, Real &Zbar, Real *lambda) const {
   Real lRho, lT, Ye;
   getLogsFromRhoT_(rho, temperature, lambda, lRho, lT, Ye);
-  Xa = Xa_.interpToReal(Ye, lRho, lT);
-  Xh = Xh_.interpToReal(Ye, lRho, lT);
-  Xn = Xn_.interpToReal(Ye, lRho, lT);
-  Xp = Xp_.interpToReal(Ye, lRho, lT);
-  Abar = Abar_.interpToReal(Ye, lRho, lT);
-  Zbar = Zbar_.interpToReal(Ye, lRho, lT);
+  Xa = Xa_.interpToReal(Ye, lT, lRho);
+  Xh = Xh_.interpToReal(Ye, lT, lRho);
+  Xn = Xn_.interpToReal(Ye, lT, lRho);
+  Xp = Xp_.interpToReal(Ye, lT, lRho);
+  Abar = Abar_.interpToReal(Ye, lT, lRho);
+  Zbar = Zbar_.interpToReal(Ye, lT, lRho);
 }
 
 PORTABLE_INLINE_FUNCTION