Merge pull request #307 from lanl/jdolence/downstream_variant_pte

Allow downstream variants to use PTE solvers
lanl · Oct 13, 2023 · da6a73d · da6a73d
2 parents 70d370b + 29d2656
commit da6a73d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/singularity-eos/closure/mixed_cell_models.hpp b/singularity-eos/closure/mixed_cell_models.hpp
@@ -272,9 +272,10 @@ class PTESolverBase {
     return Tguess;
   }
 
-  PORTABLE_FORCEINLINE_FUNCTION
-  static Real GetPressureFromPreferred(const EOS &eos, const Real rho, const Real T,
-                                       Real sie, Real *lambda, const bool do_e_lookup) {
+  template <typename EOS_t>
+  PORTABLE_FORCEINLINE_FUNCTION static Real
+  GetPressureFromPreferred(const EOS_t &eos, const Real rho, const Real T, Real sie,
+                           Real *lambda, const bool do_e_lookup) {
     Real P{};
     if (eos.PreferredInput() ==
         (thermalqs::density | thermalqs::specific_internal_energy)) {

diff --git a/singularity-eos/eos/eos_variant.hpp b/singularity-eos/eos/eos_variant.hpp
@@ -62,7 +62,7 @@ class Variant {
             typename std::enable_if<
                 !std::is_same<Variant, typename std::decay<EOSChoice>::type>::value,
                 bool>::type = true>
-  EOSChoice get() {
+  PORTABLE_INLINE_FUNCTION EOSChoice get() {
     return mpark::get<EOSChoice>(eos_);
   }