Skip to content

Commit

Permalink
re-introduce options for dynamic libraries for each component
Browse files Browse the repository at this point in the history
  • Loading branch information
rrsettgast committed Aug 15, 2024
1 parent dbcfffc commit 8fb6542
Show file tree
Hide file tree
Showing 25 changed files with 75 additions and 50 deletions.
4 changes: 3 additions & 1 deletion host-configs/apple/macOS_base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ set( LAPACK_LIBRARIES ${HOMEBREW_DIR}/opt/lapack/lib/liblapack.dylib CACHE PATH

set(ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE)
set(ENABLE_MATHPRESSO OFF CACHE BOOL "" FORCE )
#set(GEOS_BUILD_OBJ_LIBS ON CACHE BOOL "" FORCE)

set(GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
set(GEOS_BUILD_SHARED_CORE_LIB OFF CACHE BOOL "" FORCE)



Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ endif()
blt_add_executable( NAME geosx
SOURCES main/main.cpp
DEPENDS_ON ${extraComponentsLinkList}
${externalComponentsLinkList} fmt::fmt-header-only HDF5::HDF5 )
${externalComponentsLinkList} )

# blt_print_target_properties(TARGET geosx
# CHILDREN TRUE
Expand Down
2 changes: 2 additions & 0 deletions src/cmake/GeosxOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ option( GEOS_BUILD_OBJ_LIBS "Builds coreComponent modules as object libraries" O

option( GEOS_BUILD_SHARED_CORE_LIB "Builds geosx_core as a shared library " ON )

option( GEOS_BUILD_SHARED_LIBS "Builds geosx_core as a shared library " OFF )

set( GEOS_PARALLEL_COMPILE_JOBS "" CACHE STRING "Maximum number of concurrent compilation jobs" )
if( GEOS_PARALLEL_COMPILE_JOBS )
set_property( GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${GEOS_PARALLEL_COMPILE_JOBS} )
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/codingUtilities/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ blt_add_library( NAME codingUtilities
HEADERS ${codingUtilities_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

# Avoid compiling with nvcc which sometimes crashes on fast_float
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ blt_add_library( NAME common
HEADERS ${common_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( common PUBLIC ${CMAKE_BINARY_DIR}/include )
Expand Down
54 changes: 28 additions & 26 deletions src/coreComponents/constitutive/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ set( constitutive_headers
fluid/multifluid/MultiFluidConstants.hpp
fluid/multifluid/MultiFluidUtils.hpp
fluid/multifluid/MultiFluidFields.hpp
fluid/multifluid/PVTDriver.hpp
fluid/multifluid/PVTDriverRunTest.hpp
# fluid/multifluid/PVTDriver.hpp
# fluid/multifluid/PVTDriverRunTest.hpp
fluid/multifluid/blackOil/BlackOilFluidBase.hpp
fluid/multifluid/blackOil/BlackOilFluid.hpp
fluid/multifluid/blackOil/DeadOilFluid.hpp
Expand Down Expand Up @@ -89,8 +89,8 @@ set( constitutive_headers
fluid/multifluid/reactive/ReactiveBrineFluid.hpp
fluid/multifluid/reactive/ReactiveMultiFluid.hpp
fluid/multifluid/reactive/ReactiveMultiFluidFields.hpp
fluid/multifluid/reactive/ReactiveFluidDriver.hpp
fluid/multifluid/reactive/ReactiveFluidSelector.hpp
# fluid/multifluid/reactive/ReactiveFluidDriver.hpp
# fluid/multifluid/reactive/ReactiveFluidSelector.hpp
fluid/multifluid/reactive/chemicalReactions/EquilibriumReactions.hpp
fluid/multifluid/reactive/chemicalReactions/KineticReactions.hpp
fluid/multifluid/reactive/chemicalReactions/ReactionsBase.hpp
Expand All @@ -116,8 +116,8 @@ set( constitutive_headers
permeability/ProppantPermeability.hpp
permeability/SlipDependentPermeability.hpp
permeability/WillisRichardsPermeability.hpp
relativePermeability/RelpermDriver.hpp
relativePermeability/RelpermDriverRunTest.hpp
# relativePermeability/RelpermDriver.hpp
# relativePermeability/RelpermDriverRunTest.hpp
relativePermeability/BrooksCoreyBakerRelativePermeability.hpp
relativePermeability/BrooksCoreyStone2RelativePermeability.hpp
relativePermeability/BrooksCoreyRelativePermeability.hpp
Expand Down Expand Up @@ -161,7 +161,7 @@ set( constitutive_headers
solid/SolidModelDiscretizationOpsTransverseIsotropic.hpp
solid/SolidModelDiscretizationOpsOrthotropic.hpp
solid/CeramicDamage.hpp
solid/TriaxialDriver.hpp
# solid/TriaxialDriver.hpp
solid/porosity/PorosityFields.hpp
solid/porosity/BiotPorosity.hpp
solid/porosity/PorosityBase.hpp
Expand Down Expand Up @@ -203,17 +203,17 @@ set( constitutive_sources
dispersion/DispersionBase.cpp
dispersion/LinearIsotropicDispersion.cpp
fluid/multifluid/MultiFluidBase.cpp
fluid/multifluid/PVTDriver.cpp
# fluid/multifluid/PVTDriver.cpp
fluid/multifluid/blackOil/BlackOilFluidBase.cpp
fluid/multifluid/blackOil/BlackOilFluid.cpp
fluid/multifluid/blackOil/DeadOilFluid.cpp
fluid/multifluid/blackOil/PVTDriverRunTestDeadOilFluid.cpp
# fluid/multifluid/blackOil/PVTDriverRunTestDeadOilFluid.cpp
fluid/multifluid/blackOil/PVTOData.cpp
fluid/multifluid/CO2Brine/CO2BrineFluid.cpp
fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsFluid.cpp
fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsThermalFluid.cpp
fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiFluid.cpp
fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiThermalFluid.cpp
# fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsFluid.cpp
# fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsThermalFluid.cpp
# fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiFluid.cpp
# fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiThermalFluid.cpp
fluid/multifluid/CO2Brine/functions/PhillipsBrineDensity.cpp
fluid/multifluid/CO2Brine/functions/PhillipsBrineViscosity.cpp
fluid/multifluid/CO2Brine/functions/EzrokhiBrineDensity.cpp
Expand All @@ -235,11 +235,11 @@ set( constitutive_sources
fluid/multifluid/compositional/models/NegativeTwoPhaseFlashModel.cpp
fluid/multifluid/compositional/CompositionalMultiphaseFluid.cpp
fluid/multifluid/compositional/CompositionalMultiphaseFluidUpdates.cpp
fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseConstantViscosity.cpp
fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseLohrenzBrayClarkViscosity.cpp
# fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseConstantViscosity.cpp
# fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseLohrenzBrayClarkViscosity.cpp
fluid/multifluid/reactive/ReactiveBrineFluid.cpp
fluid/multifluid/reactive/ReactiveMultiFluid.cpp
fluid/multifluid/reactive/ReactiveFluidDriver.cpp
# fluid/multifluid/reactive/ReactiveFluidDriver.cpp
fluid/multifluid/reactive/chemicalReactions/EquilibriumReactions.cpp
fluid/multifluid/reactive/chemicalReactions/KineticReactions.cpp
fluid/multifluid/reactive/chemicalReactions/ReactionsBase.cpp
Expand Down Expand Up @@ -268,14 +268,14 @@ set( constitutive_sources
relativePermeability/TableRelativePermeabilityHysteresis.cpp
relativePermeability/VanGenuchtenBakerRelativePermeability.cpp
relativePermeability/VanGenuchtenStone2RelativePermeability.cpp
relativePermeability/RelpermDriver.cpp
relativePermeability/RelpermDriverBrooksCoreyBakerRunTest.cpp
relativePermeability/RelpermDriverBrooksCoreyStone2RunTest.cpp
relativePermeability/RelpermDriverBrooksCoreyRunTest.cpp
relativePermeability/RelpermDriverVanGenuchtenBakerRunTest.cpp
relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp
relativePermeability/RelpermDriverTableRelativeRunTest.cpp
relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp
# relativePermeability/RelpermDriver.cpp
# relativePermeability/RelpermDriverBrooksCoreyBakerRunTest.cpp
# relativePermeability/RelpermDriverBrooksCoreyStone2RunTest.cpp
# relativePermeability/RelpermDriverBrooksCoreyRunTest.cpp
# relativePermeability/RelpermDriverVanGenuchtenBakerRunTest.cpp
# relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp
# relativePermeability/RelpermDriverTableRelativeRunTest.cpp
# relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp
solid/CompressibleSolid.cpp
solid/CoupledSolidBase.cpp
solid/ProppantSolid.cpp
Expand All @@ -296,7 +296,7 @@ set( constitutive_sources
solid/SolidBase.cpp
solid/SolidInternalEnergy.cpp
solid/CeramicDamage.cpp
solid/TriaxialDriver.cpp
# solid/TriaxialDriver.cpp
solid/porosity/BiotPorosity.cpp
solid/porosity/PorosityBase.cpp
solid/porosity/PressurePorosity.cpp
Expand All @@ -318,7 +318,8 @@ if( ENABLE_PVTPackage )
set( constitutive_sources
${constitutive_sources}
fluid/multifluid/compositional/CompositionalMultiphaseFluidPVTPackage.cpp
fluid/multifluid/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp )
# fluid/multifluid/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp
)

add_subdirectory( PVTPackage )

Expand All @@ -330,6 +331,7 @@ blt_add_library( NAME constitutive
HEADERS ${constitutive_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( constitutive PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
4 changes: 3 additions & 1 deletion src/coreComponents/dataRepository/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ blt_add_library( NAME dataRepository
SOURCES ${dataRepository_sources}
HEADERS ${dataRepository_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS} )
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( dataRepository PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )

Expand Down
4 changes: 3 additions & 1 deletion src/coreComponents/denseLinearAlgebra/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ blt_add_library( NAME denseLinearAlgebra
SOURCES ${denseLinearAlgebra_sources}
HEADERS ${denseLinearAlgebra_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS} )
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( denseLinearAlgebra PUBLIC ${CMAKE_CURRENT_LIST_DIR} )

Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/discretizationMethods/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ blt_add_library( NAME discretizationMethods
HEADERS ${mainInterface_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( discretizationMethods PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
3 changes: 2 additions & 1 deletion src/coreComponents/events/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ set( events_sources
tasks/TasksManager.cpp
)

set( dependencyList ${parallelDeps} fileIO )
set( dependencyList ${parallelDeps} mesh )

blt_add_library( NAME events
SOURCES ${events_sources}
HEADERS ${events_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( events PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/fieldSpecification/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ blt_add_library( NAME fieldSpecification
HEADERS ${fieldSpecification_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( fieldSpecification PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
6 changes: 4 additions & 2 deletions src/coreComponents/fileIO/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set( fileIO_sources
timeHistory/PackCollection.cpp
timeHistory/HDFHistoryIO.cpp )

set( dependencyList ${parallelDeps} mesh HDF5::HDF5 )
set( dependencyList ${parallelDeps} events mesh HDF5::HDF5 )
if( ENABLE_PYGEOSX )
list( APPEND fileIO_headers
python/PyHistoryCollectionType.hpp
Expand Down Expand Up @@ -83,7 +83,9 @@ blt_add_library( NAME fileIO
SOURCES ${fileIO_sources}
HEADERS ${fileIO_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS} )
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)


target_include_directories( fileIO PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/finiteElement/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ blt_add_library( NAME finiteElement
HEADERS ${finiteElement_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( finiteElement PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/finiteVolume/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ blt_add_library( NAME finiteVolume
HEADERS ${finiteVolume_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( finiteVolume PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/functions/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ blt_add_library( NAME functions
HEADERS ${functions_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( functions PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/linearAlgebra/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ blt_add_library( NAME linearAlgebra
HEADERS ${linearAlgebra_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( linearAlgebra PUBLIC ${CMAKE_CURRENT_LIST_DIR} )
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/mainInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ blt_add_library( NAME mainInterface
HEADERS ${mainInterface_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

add_dependencies( mainInterface generate_version )
Expand Down
4 changes: 3 additions & 1 deletion src/coreComponents/mesh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ blt_add_library( NAME mesh
SOURCES ${mesh_sources}
HEADERS ${mesh_headers}
DEPENDS_ON ${dependencyList}
OBJECT ${GEOS_BUILD_OBJ_LIBS} )
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( mesh PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )

Expand Down
6 changes: 4 additions & 2 deletions src/coreComponents/physicsSolvers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if( GEOS_ENABLE_WAVEPROPAGATION )
add_subdirectory( wavePropagation )
endif()

set( dependencyList ${parallelDeps} discretizationMethods events )
set( dependencyList ${parallelDeps} fileIO discretizationMethods events )
if( ENABLE_PYGEOSX )
list( APPEND physicsSolvers_headers
python/PySolver.hpp
Expand All @@ -65,7 +65,9 @@ blt_add_library( NAME physicsSolvers
SOURCES ${physicsSolvers_sources}
HEADERS ${physicsSolvers_headers}
DEPENDS_ON ${dependencyList} ${externalComponentDeps}
OBJECT ${GEOS_BUILD_OBJ_LIBS} )
OBJECT ${GEOS_BUILD_OBJ_LIBS}
SHARED ${GEOS_BUILD_SHARED_LIBS}
)

target_include_directories( physicsSolvers PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
if( externalComponentDeps )
Expand Down
5 changes: 2 additions & 3 deletions src/coreComponents/physicsSolvers/FieldStatisticsBase.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

#include "events/tasks/TaskBase.hpp"
#include "physicsSolvers/PhysicsSolverManager.hpp"
#include "mainInterface/ProblemManager.hpp"
#include "mesh/MeshLevel.hpp"
#include "fileIO/Outputs/OutputBase.hpp"

Expand Down Expand Up @@ -84,8 +83,8 @@ class FieldStatisticsBase : public TaskBase

void postInputInitialization() override
{
ProblemManager & problemManager = this->getGroupByPath< ProblemManager >( "/Problem" );
PhysicsSolverManager & physicsSolverManager = problemManager.getPhysicsSolverManager();
Group & problemManager = this->getGroupByPath( "/Problem" );
Group & physicsSolverManager = problemManager.getGroup("Solvers");

m_solver = physicsSolverManager.getGroupPointer< SOLVER >( m_solverName );
GEOS_THROW_IF( m_solver == nullptr,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "constitutive/permeability/PermeabilityBase.hpp"
#include "constitutive/permeability/PermeabilityFields.hpp"
#include "physicsSolvers/fluidFlow/StencilAccessors.hpp"
#include "mainInterface/ProblemManager.hpp"
#include "physicsSolvers/PhysicsSolverManager.hpp"
#include "common/format/table/TableFormatter.hpp"

Expand Down Expand Up @@ -61,10 +60,10 @@ StencilDataCollection::StencilDataCollection( const string & name,

void StencilDataCollection::postInputInitialization()
{
ProblemManager & problemManager = this->getGroupByPath< ProblemManager >( "/Problem" );
Group & problemManager = this->getGroupByPath( "/Problem" );

{ // find targeted solver
PhysicsSolverManager & physicsSolverManager = problemManager.getPhysicsSolverManager();
Group & physicsSolverManager = problemManager.getGroup("Solvers");

m_solver = physicsSolverManager.getGroupPointer< FlowSolverBase >( m_solverName );
GEOS_THROW_IF( m_solver == nullptr,
Expand All @@ -75,7 +74,8 @@ void StencilDataCollection::postInputInitialization()
}

{ // find mesh & discretization
DomainPartition & domain = problemManager.getDomainPartition();
// DomainPartition & domain = problemManager.getDomainPartition();
DomainPartition & domain = problemManager.getGroup< DomainPartition >( "domain" );

MeshBody const & meshBody = domain.getMeshBody( m_meshName );
m_meshLevel = &meshBody.getBaseDiscretization();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "physicsSolvers/multiphysics/SinglePhasePoromechanicsConformingFractures.hpp"
#include "physicsSolvers/multiphysics/SinglePhasePoromechanicsEmbeddedFractures.hpp"
#include "physicsSolvers/multiphysics/HydrofractureSolver.hpp"
#include "mainInterface/ProblemManager.hpp"
#include "physicsSolvers/fluidFlow/SinglePhaseBase.hpp"
#include "physicsSolvers/multiphysics/SinglePhaseReservoirAndWells.hpp"
#include "physicsSolvers/multiphysics/CompositionalMultiphaseReservoirAndWells.hpp"
Expand Down Expand Up @@ -68,8 +67,8 @@ void
PoromechanicsInitialization< POROMECHANICS_SOLVER >::
postInputInitialization()
{
ProblemManager & problemManager = this->getGroupByPath< ProblemManager >( "/Problem" );
PhysicsSolverManager & physicsSolverManager = problemManager.getPhysicsSolverManager();
Group & problemManager = this->getGroupByPath( "/Problem" );
Group & physicsSolverManager = problemManager.getGroup("Solvers");

GEOS_THROW_IF( !physicsSolverManager.hasGroup( m_poromechanicsSolverName ),
GEOS_FMT( "{}: {} solver named {} not found",
Expand All @@ -82,7 +81,7 @@ postInputInitialization()

if( !m_solidMechanicsStatisticsName.empty())
{
TasksManager & tasksManager = problemManager.getTasksManager();
TasksManager & tasksManager = problemManager.getGroup<TasksManager>("Tasks");

GEOS_THROW_IF( !tasksManager.hasGroup( m_solidMechanicsStatisticsName ),
GEOS_FMT( "{}: statistics task named {} not found",
Expand Down
Loading

0 comments on commit 8fb6542

Please sign in to comment.