move constitutive drivers outside of constitutive to resolve circular…

… dependencies
GEOS-DEV · Aug 16, 2024 · 26710c0 · 26710c0
1 parent d4eefe9
commit 26710c0
Show file tree

Hide file tree

Showing 32 changed files with 3 additions and 28 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -144,7 +144,7 @@ endif()
 blt_add_executable( NAME geosx
                     SOURCES main/main.cpp
                     DEPENDS_ON ${extraComponentsLinkList}
-                               ${externalComponentsLinkList}  )
+                               ${externalComponentsLinkList} common fmt::fmt-header-only HDF5::HDF5 )
 
 # blt_print_target_properties(TARGET               geosx
 #                             CHILDREN             TRUE

diff --git a/src/coreComponents/CMakeLists.txt b/src/coreComponents/CMakeLists.txt
@@ -6,6 +6,7 @@ set( subdirs
      schema
      functions
      constitutive
+     constitutiveDrivers
      mesh
      denseLinearAlgebra
      linearAlgebra
@@ -79,7 +80,7 @@ if( GEOS_BUILD_SHARED_CORE_LIB AND GEOS_BUILD_OBJ_LIBS )
 elseif( GEOS_BUILD_SHARED_CORE_LIB AND NOT GEOS_BUILD_OBJ_LIBS )
   message( "Building shared geosx_core library with static coreComponents, executables link to geosx_core" )
   blt_combine_static_libraries( NAME          geosx_core
-                                SOURCE_LIBS   ${coreLibs}
+                                SOURCE_LIBS   mainInterface 
                                 LIB_TYPE      SHARED
                                 LINK_PREPEND  ${GEOS_LINK_PREPEND_FLAG}
                                 LINK_POSTPEND ${GEOS_LINK_POSTPEND_FLAG} )

diff --git a/src/coreComponents/constitutive/CMakeLists.txt b/src/coreComponents/constitutive/CMakeLists.txt
@@ -39,8 +39,6 @@ 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/blackOil/BlackOilFluidBase.hpp
      fluid/multifluid/blackOil/BlackOilFluid.hpp
      fluid/multifluid/blackOil/DeadOilFluid.hpp
@@ -89,8 +87,6 @@ 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/chemicalReactions/EquilibriumReactions.hpp
      fluid/multifluid/reactive/chemicalReactions/KineticReactions.hpp
      fluid/multifluid/reactive/chemicalReactions/ReactionsBase.hpp
@@ -116,8 +112,6 @@ set( constitutive_headers
      permeability/ProppantPermeability.hpp
      permeability/SlipDependentPermeability.hpp
      permeability/WillisRichardsPermeability.hpp
-     # relativePermeability/RelpermDriver.hpp
-     # relativePermeability/RelpermDriverRunTest.hpp
      relativePermeability/BrooksCoreyBakerRelativePermeability.hpp
      relativePermeability/BrooksCoreyStone2RelativePermeability.hpp
      relativePermeability/BrooksCoreyRelativePermeability.hpp
@@ -161,7 +155,6 @@ set( constitutive_headers
      solid/SolidModelDiscretizationOpsTransverseIsotropic.hpp
      solid/SolidModelDiscretizationOpsOrthotropic.hpp
      solid/CeramicDamage.hpp
-     # solid/TriaxialDriver.hpp
      solid/porosity/PorosityFields.hpp
      solid/porosity/BiotPorosity.hpp
      solid/porosity/PorosityBase.hpp
@@ -203,17 +196,11 @@ set( constitutive_sources
      dispersion/DispersionBase.cpp
      dispersion/LinearIsotropicDispersion.cpp
      fluid/multifluid/MultiFluidBase.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/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/functions/PhillipsBrineDensity.cpp
      fluid/multifluid/CO2Brine/functions/PhillipsBrineViscosity.cpp
      fluid/multifluid/CO2Brine/functions/EzrokhiBrineDensity.cpp
@@ -235,11 +222,8 @@ 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/reactive/ReactiveBrineFluid.cpp
      fluid/multifluid/reactive/ReactiveMultiFluid.cpp
-     # fluid/multifluid/reactive/ReactiveFluidDriver.cpp
      fluid/multifluid/reactive/chemicalReactions/EquilibriumReactions.cpp
      fluid/multifluid/reactive/chemicalReactions/KineticReactions.cpp
      fluid/multifluid/reactive/chemicalReactions/ReactionsBase.cpp
@@ -268,14 +252,6 @@ 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
      solid/CompressibleSolid.cpp
      solid/CoupledSolidBase.cpp
      solid/ProppantSolid.cpp
@@ -318,7 +294,6 @@ if( ENABLE_PVTPackage )
     set( constitutive_sources
          ${constitutive_sources}
          fluid/multifluid/compositional/CompositionalMultiphaseFluidPVTPackage.cpp
-     #     fluid/multifluid/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp
           )
 
     add_subdirectory( PVTPackage )

diff --git a/src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp b/src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp
@@ -22,7 +22,6 @@
 #include "constitutive/relativePermeability/RelativePermeabilityFields.hpp"
 #include "constitutive/relativePermeability/TableRelativePermeabilityHelpers.hpp"
 #include "functions/FunctionManager.hpp"
-#include "constitutive/relativePermeability/RelpermDriver.hpp"
 
 namespace geos
 {

diff --git a/...omponents/constitutive/docs/PVTDriver.rst → ...ts/constitutiveDrivers/docs/PVTDriver.rst b/...omponents/constitutive/docs/PVTDriver.rst → ...ts/constitutiveDrivers/docs/PVTDriver.rst
diff --git a/...onstitutive/docs/solid/TriaxialDriver.rst → ...tiveDrivers/docs/solid/TriaxialDriver.rst b/...onstitutive/docs/solid/TriaxialDriver.rst → ...tiveDrivers/docs/solid/TriaxialDriver.rst
diff --git a/...onstitutive/docs/solid/TriaxialDriver.svg → ...tiveDrivers/docs/solid/TriaxialDriver.svg b/...onstitutive/docs/solid/TriaxialDriver.svg → ...tiveDrivers/docs/solid/TriaxialDriver.svg
diff --git a/.../PVTDriverRunTestCO2BrineEzrokhiFluid.cpp → .../PVTDriverRunTestCO2BrineEzrokhiFluid.cpp b/.../PVTDriverRunTestCO2BrineEzrokhiFluid.cpp → .../PVTDriverRunTestCO2BrineEzrokhiFluid.cpp
diff --git a/...verRunTestCO2BrineEzrokhiThermalFluid.cpp → ...verRunTestCO2BrineEzrokhiThermalFluid.cpp b/...verRunTestCO2BrineEzrokhiThermalFluid.cpp → ...verRunTestCO2BrineEzrokhiThermalFluid.cpp
diff --git a/...PVTDriverRunTestCO2BrinePhillipsFluid.cpp → ...PVTDriverRunTestCO2BrinePhillipsFluid.cpp b/...PVTDriverRunTestCO2BrinePhillipsFluid.cpp → ...PVTDriverRunTestCO2BrinePhillipsFluid.cpp
diff --git a/...erRunTestCO2BrinePhillipsThermalFluid.cpp → ...erRunTestCO2BrinePhillipsThermalFluid.cpp b/...erRunTestCO2BrinePhillipsThermalFluid.cpp → ...erRunTestCO2BrinePhillipsThermalFluid.cpp
diff --git a/...nstitutive/fluid/multifluid/PVTDriver.cpp → ...iveDrivers/fluid/multiFluid/PVTDriver.cpp b/...nstitutive/fluid/multifluid/PVTDriver.cpp → ...iveDrivers/fluid/multiFluid/PVTDriver.cpp
diff --git a/...nstitutive/fluid/multifluid/PVTDriver.hpp → ...iveDrivers/fluid/multiFluid/PVTDriver.hpp b/...nstitutive/fluid/multifluid/PVTDriver.hpp → ...iveDrivers/fluid/multiFluid/PVTDriver.hpp
diff --git a/...ive/fluid/multifluid/PVTDriverRunTest.hpp → ...ers/fluid/multiFluid/PVTDriverRunTest.hpp b/...ive/fluid/multifluid/PVTDriverRunTest.hpp → ...ers/fluid/multiFluid/PVTDriverRunTest.hpp
diff --git a/...blackOil/PVTDriverRunTestDeadOilFluid.cpp → ...blackOil/PVTDriverRunTestDeadOilFluid.cpp b/...blackOil/PVTDriverRunTestDeadOilFluid.cpp → ...blackOil/PVTDriverRunTestDeadOilFluid.cpp
diff --git a/...erRunTestCompositionalMultiphaseFluid.cpp → ...erRunTestCompositionalMultiphaseFluid.cpp b/...erRunTestCompositionalMultiphaseFluid.cpp → ...erRunTestCompositionalMultiphaseFluid.cpp
diff --git a/...ompositionalTwoPhaseConstantViscosity.cpp → ...ompositionalTwoPhaseConstantViscosity.cpp b/...ompositionalTwoPhaseConstantViscosity.cpp → ...ompositionalTwoPhaseConstantViscosity.cpp
diff --git a/...onalTwoPhaseLohrenzBrayClarkViscosity.cpp → ...onalTwoPhaseLohrenzBrayClarkViscosity.cpp b/...onalTwoPhaseLohrenzBrayClarkViscosity.cpp → ...onalTwoPhaseLohrenzBrayClarkViscosity.cpp
diff --git a/...ltifluid/reactive/ReactiveFluidDriver.cpp → ...ltiFluid/reactive/ReactiveFluidDriver.cpp b/...ltifluid/reactive/ReactiveFluidDriver.cpp → ...ltiFluid/reactive/ReactiveFluidDriver.cpp
diff --git a/...ltifluid/reactive/ReactiveFluidDriver.hpp → ...ltiFluid/reactive/ReactiveFluidDriver.hpp b/...ltifluid/reactive/ReactiveFluidDriver.hpp → ...ltiFluid/reactive/ReactiveFluidDriver.hpp
diff --git a/...ve/relativePermeability/RelpermDriver.cpp → ...rs/relativePermeability/RelpermDriver.cpp b/...ve/relativePermeability/RelpermDriver.cpp → ...rs/relativePermeability/RelpermDriver.cpp
diff --git a/...ve/relativePermeability/RelpermDriver.hpp → ...rs/relativePermeability/RelpermDriver.hpp b/...ve/relativePermeability/RelpermDriver.hpp → ...rs/relativePermeability/RelpermDriver.hpp
diff --git a/.../RelpermDriverBrooksCoreyBakerRunTest.cpp → .../RelpermDriverBrooksCoreyBakerRunTest.cpp b/.../RelpermDriverBrooksCoreyBakerRunTest.cpp → .../RelpermDriverBrooksCoreyBakerRunTest.cpp
diff --git a/...ility/RelpermDriverBrooksCoreyRunTest.cpp → ...ility/RelpermDriverBrooksCoreyRunTest.cpp b/...ility/RelpermDriverBrooksCoreyRunTest.cpp → ...ility/RelpermDriverBrooksCoreyRunTest.cpp
diff --git a/...RelpermDriverBrooksCoreyStone2RunTest.cpp → ...RelpermDriverBrooksCoreyStone2RunTest.cpp b/...RelpermDriverBrooksCoreyStone2RunTest.cpp → ...RelpermDriverBrooksCoreyStone2RunTest.cpp
diff --git a/...tivePermeability/RelpermDriverRunTest.hpp → ...tivePermeability/RelpermDriverRunTest.hpp b/...tivePermeability/RelpermDriverRunTest.hpp → ...tivePermeability/RelpermDriverRunTest.hpp
diff --git a/...mDriverTableRelativeHysteresisRunTest.cpp → ...mDriverTableRelativeHysteresisRunTest.cpp b/...mDriverTableRelativeHysteresisRunTest.cpp → ...mDriverTableRelativeHysteresisRunTest.cpp
diff --git a/...ity/RelpermDriverTableRelativeRunTest.cpp → ...ity/RelpermDriverTableRelativeRunTest.cpp b/...ity/RelpermDriverTableRelativeRunTest.cpp → ...ity/RelpermDriverTableRelativeRunTest.cpp
diff --git a/...RelpermDriverVanGenuchtenBakerRunTest.cpp → ...RelpermDriverVanGenuchtenBakerRunTest.cpp b/...RelpermDriverVanGenuchtenBakerRunTest.cpp → ...RelpermDriverVanGenuchtenBakerRunTest.cpp
diff --git a/...elpermDriverVanGenuchtenStone2RunTest.cpp → ...elpermDriverVanGenuchtenStone2RunTest.cpp b/...elpermDriverVanGenuchtenStone2RunTest.cpp → ...elpermDriverVanGenuchtenStone2RunTest.cpp
diff --git a/...nts/constitutive/solid/TriaxialDriver.cpp → ...stitutiveDrivers/solid/TriaxialDriver.cpp b/...nts/constitutive/solid/TriaxialDriver.cpp → ...stitutiveDrivers/solid/TriaxialDriver.cpp
diff --git a/...nts/constitutive/solid/TriaxialDriver.hpp → ...stitutiveDrivers/solid/TriaxialDriver.hpp b/...nts/constitutive/solid/TriaxialDriver.hpp → ...stitutiveDrivers/solid/TriaxialDriver.hpp