Merge branch 'main' into joss-review-6805

lanl · Jul 22, 2024 · c91f19c · c91f19c
2 parents 407ebb0 + 9aeae78
commit c91f19c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/doc/sphinx/src/using-eos.rst b/doc/sphinx/src/using-eos.rst
@@ -646,7 +646,7 @@ returns the the bulk modulus
 
 .. math::
 
-  B_s = (\partial P/\partial \rho)_s
+  B_s = \rho (\partial P/\partial \rho)_s
 
 in units of :math:`g cm^2/s^2` given density in :math:`g/cm^3` and
 temperature in Kelvin. For most material models, the square of the

diff --git a/singularity-eos/CMakeLists.txt b/singularity-eos/CMakeLists.txt
@@ -39,6 +39,8 @@ register_headers(
     eos/eos_stellar_collapse.hpp
     eos/eos_ideal.hpp
     eos/eos_models.hpp
+    eos/eos_mgusup.hpp
+    eos/eos_powermg.hpp
     eos/eos_spiner.hpp
     eos/eos_davis.hpp
     eos/eos_gruneisen.hpp

diff --git a/singularity-eos/eos/get_sg_eos_functors.hpp b/singularity-eos/eos/get_sg_eos_functors.hpp
@@ -144,8 +144,8 @@ struct init_functor {
       PORTABLE_ALWAYS_ABORT(
           "Bad values INPUT to singularity-eos interface. See output for details");
     }
-  }
 #endif // #ifndef NDEBUG
+  }
 };
 
 struct final_functor {
@@ -376,8 +376,8 @@ struct final_functor {
       PORTABLE_ALWAYS_ABORT(
           "Bad value RETURNED from singularity-eos. See output for details");
     }
-  }
 #endif // #ifndef NDEBUG
+  }
 };
 
 } // namespace singularity