From 232b3f7795aa1c944a2e21cc5035c22dcb816684 Mon Sep 17 00:00:00 2001
From: Nicola Castelletto <38361926+castelletto1@users.noreply.github.com>
Date: Fri, 8 May 2026 16:35:16 -0700
Subject: [PATCH 1/2] Fixing macOS build

---
 src/coreComponents/constitutive/PVTPackage      |  2 +-
 .../constitutive/solid/Damage.cpp               |  2 ++
 .../physicsSolvers/PhysicsSolverBase.cpp        | 17 +++++++++--------
 .../physicsSolvers/fluidFlow/CMakeLists.txt     |  4 +++-
 .../physicsSolvers/multiphysics/CMakeLists.txt  |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/coreComponents/constitutive/PVTPackage b/src/coreComponents/constitutive/PVTPackage
index a2cdca31546..3c497b97003 160000
--- a/src/coreComponents/constitutive/PVTPackage
+++ b/src/coreComponents/constitutive/PVTPackage
@@ -1 +1 @@
-Subproject commit a2cdca315464da11f2bdcc902c894ed1340b8572
+Subproject commit 3c497b970030279f776322e20794479ea1f4e171
diff --git a/src/coreComponents/constitutive/solid/Damage.cpp b/src/coreComponents/constitutive/solid/Damage.cpp
index 1b9e0c1e5da..525d6e0f0bf 100644
--- a/src/coreComponents/constitutive/solid/Damage.cpp
+++ b/src/coreComponents/constitutive/solid/Damage.cpp
@@ -168,6 +168,8 @@ void Damage< BASE >::saveConvergedState() const
   } );
 }
 
+template class Damage< ElasticIsotropic >;
+
 typedef Damage< ElasticIsotropic > DamageElasticIsotropic;
 
 REGISTER_CATALOG_ENTRY( ConstitutiveBase, DamageElasticIsotropic, string const &, Group * const )
diff --git a/src/coreComponents/physicsSolvers/PhysicsSolverBase.cpp b/src/coreComponents/physicsSolvers/PhysicsSolverBase.cpp
index 3d57a8a1b38..8d05dfd6958 100644
--- a/src/coreComponents/physicsSolvers/PhysicsSolverBase.cpp
+++ b/src/coreComponents/physicsSolvers/PhysicsSolverBase.cpp
@@ -1651,16 +1651,17 @@ Timestamp PhysicsSolverBase::getMeshModificationTimestamp( DomainPartition & dom
 
 R1Tensor const PhysicsSolverBase::gravityVector() const
 {
-  R1Tensor rval;
-  if( dynamicCast< PhysicsSolverManager const * >( &getParent() ) != nullptr )
+  // Avoid dynamic_cast< PhysicsSolverManager const * > here: it would force the
+  // base library (physicsSolversBase) to link against PhysicsSolverManager's
+  // typeinfo, which lives in the dependent physicsSolvers library — circular
+  // on macOS dylibs. Probe by wrapper presence; the gravityVector wrapper is
+  // only ever registered by PhysicsSolverManager.
+  auto const key = PhysicsSolverManager::viewKeyStruct::gravityVectorString();
+  if( getParent().hasWrapper( key ) )
   {
-    rval = getParent().getReference< R1Tensor >( PhysicsSolverManager::viewKeyStruct::gravityVectorString() );
+    return getParent().getReference< R1Tensor >( key );
   }
-  else
-  {
-    rval = {0.0, 0.0, -9.81};
-  }
-  return rval;
+  return { 0.0, 0.0, -9.81 };
 }
 
 bool PhysicsSolverBase::checkSequentialSolutionIncrements( DomainPartition & GEOS_UNUSED_PARAM( domain ) ) const
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt b/src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt
index 70bed3ec99e..645008d0dda 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt
+++ b/src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt
@@ -213,8 +213,10 @@ generateKernels( TEMPLATE "CompositionalMultiphaseFVMKernel_thermal.cpp.template
 list(APPEND fluidFlowSolvers_headers ${headerFiles})
 list(APPEND fluidFlowSolvers_sources ${sourceFiles})
 
+set( dependencyList ${parallelDeps} physicsSolversBase )
 
-
+geos_decorate_link_dependencies( LIST decoratedDependencies
+                                 DEPENDENCIES ${dependencyList} )
 
 
 blt_add_library( NAME       fluidFlowSolvers
diff --git a/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt b/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt
index 976f03d0c6c..36e8a23c9c0 100644
--- a/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt
+++ b/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt
@@ -87,7 +87,7 @@ set( multiPhysicsSolvers_sources
 
 #include(poromechanicsKernels/PoromechanicsKernels.cmake)
 
-set( dependencyList ${parallelDeps} fluidFlowSolvers simplePDESolvers solidMechanicsSolvers )
+set( dependencyList ${parallelDeps} fluidFlowSolvers simplePDESolvers solidMechanicsSolvers surfaceGeneration )
 
 geos_decorate_link_dependencies( LIST decoratedDependencies DEPENDENCIES ${dependencyList} )
 

From 4b53cb929c415491c12d403c93a7af49ebbf1ef0 Mon Sep 17 00:00:00 2001
From: Randolph Settgast <rrsettgast@gmail.com>
Date: Fri, 8 May 2026 20:46:05 -0700
Subject: [PATCH 2/2] update submodule hash

---
 src/coreComponents/constitutive/PVTPackage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreComponents/constitutive/PVTPackage b/src/coreComponents/constitutive/PVTPackage
index 3c497b97003..5f0e203391c 160000
--- a/src/coreComponents/constitutive/PVTPackage
+++ b/src/coreComponents/constitutive/PVTPackage
@@ -1 +1 @@
-Subproject commit 3c497b970030279f776322e20794479ea1f4e171
+Subproject commit 5f0e203391c83d2c64830501438c5fd1bfcb622b