properly link con2prim (no idea how that was working before) and also…

… switch test to explicitly use analytic minkowski
lanl · Mar 12, 2024 · 3e5190b · 3e5190b
1 parent 2614f78
commit 3e5190b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ set (SRC_LIST
   fluid/con2prim_statistics.hpp
   fluid/fluid.cpp
   fluid/fluid.hpp
+  fluid/prim2con.hpp
   fluid/riemann.hpp
   fluid/tmunu.cpp
   fluid/tmunu.hpp

diff --git a/src/fluid/fluid.cpp b/src/fluid/fluid.cpp
@@ -441,6 +441,15 @@ TaskStatus ConservedToPrimitiveRegion(T *rc, const IndexRange &ib, const IndexRa
   auto c2p = pkg->Param<c2p_type<T>>("c2p_func");
   return c2p(rc, ib, jb, kb);
 }
+// JMM: Must specialize function for both potential use cases so we
+// can keep it in this file.
+template TaskStatus ConservedToPrimitiveRegion<MeshData<Real>>(MeshData<Real> *rc,
+                                                               const IndexRange &ib,
+                                                               const IndexRange &jb,
+                                                               const IndexRange &kb);
+template TaskStatus ConservedToPrimitiveRegion<MeshBlockData<Real>>(
+    MeshBlockData<Real> *rc, const IndexRange &ib, const IndexRange &jb,
+    const IndexRange &kb);
 
 template <typename T>
 TaskStatus ConservedToPrimitive(T *rc) {

diff --git a/src/fluid/fluid.hpp b/src/fluid/fluid.hpp
@@ -29,9 +29,19 @@ std::shared_ptr<StateDescriptor> Initialize(ParameterInput *pin);
 TaskStatus PrimitiveToConserved(MeshBlockData<Real> *rc);
 TaskStatus PrimitiveToConservedRegion(MeshBlockData<Real> *rc, const IndexRange &ib,
                                       const IndexRange &jb, const IndexRange &kb);
+// JMM: Not sure how the templated value here worked in the first
+// place. But proper solution is need to tell the linker it's
+// available elsewhere.
 template <typename T>
 TaskStatus ConservedToPrimitiveRegion(T *rc, const IndexRange &ib, const IndexRange &jb,
                                       const IndexRange &kb);
+extern template TaskStatus
+ConservedToPrimitiveRegion<MeshData<Real>>(MeshData<Real> *rc, const IndexRange &ib,
+                                           const IndexRange &jb, const IndexRange &kb);
+extern template TaskStatus ConservedToPrimitiveRegion<MeshBlockData<Real>>(
+    MeshBlockData<Real> *rc, const IndexRange &ib, const IndexRange &jb,
+    const IndexRange &kb);
+
 template <typename T>
 TaskStatus ConservedToPrimitive(T *rc);
 template <typename T>

diff --git a/tst/unit/phoebus_utils/compile_constants.hpp b/tst/unit/phoebus_utils/compile_constants.hpp
diff --git a/tst/unit/phoebus_utils/test_relativity_utils.cpp b/tst/unit/phoebus_utils/test_relativity_utils.cpp
@@ -43,7 +43,8 @@ TEST_CASE("RELATIVITY", "[relativity_utils]") {
   GIVEN("A three-velocity and a coordinate system") {
     auto mb = GetDummyMeshBlock();
     auto rc = GetDummyMeshBlockData(mb);
-    auto system = GetCoordinateSystem(rc.get());
+    auto indexer = GetIndexer(rc.get());
+    auto system = MinkowskiMeshBlock(indexer);
     // Dummy grid position
     const CellLocation loc = CellLocation::Cent;
     const int k = 0;