Skip to content

Fixing macOS build #4052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrsettgast merged 2 commits into from
May 9, 2026
Merged

Fixing macOS build #4052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
232b3f7
Fixing macOS build
castelletto1 May 8, 2026
4b53cb9
update submodule hash
rrsettgast May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreComponents/constitutive/PVTPackage
Open in desktop
Submodule PVTPackage updated 1 files
+1 −1 CMakeLists.txt
2 changes: 2 additions & 0 deletions src/coreComponents/constitutive/solid/Damage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
17 changes: 9 additions & 8 deletions src/coreComponents/physicsSolvers/PhysicsSolverBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} )

Expand Down