short-circuit variadic_utils

lanl · Feb 12, 2024 · 9bce4e3 · 9bce4e3
1 parent 78f6cb4
commit 9bce4e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/microphysics/eos_phoebus/eos_phoebus.cpp b/src/microphysics/eos_phoebus/eos_phoebus.cpp
@@ -20,9 +20,6 @@
 // parthenon includes
 #include <parthenon/package.hpp>
 
-// singularity includes
-#include <singularity-eos/eos/eos.hpp>
-
 // phoebus includes
 #include "microphysics/eos_phoebus/eos_phoebus.hpp"
 #include "phoebus_utils/unit_conversions.hpp"

diff --git a/src/microphysics/eos_phoebus/eos_phoebus.hpp b/src/microphysics/eos_phoebus/eos_phoebus.hpp
@@ -17,7 +17,13 @@
 #include <memory>
 #include <parthenon/package.hpp>
 
-#include <singularity-eos/eos/eos.hpp>
+#include <singularity-eos/eos/eos_ideal.hpp>
+#include <singularity-eos/eos/eos_variant.hpp>
+#include <singularity-eos/eos/modifiers/eos_unitsystem.hpp>
+
+#ifdef SPINER_USE_HDF
+#include <singularity-eos/eos/eos_stellar_collapse.hpp>
+#endif
 
 using namespace parthenon::package::prelude;