From 26710c093eaa001a6765f59a6d37a41d8e53bb06 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Thu, 15 Aug 2024 22:25:41 -0700 Subject: [PATCH] move constitutive drivers outside of constitutive to resolve circular dependencies --- src/CMakeLists.txt | 2 +- src/coreComponents/CMakeLists.txt | 3 ++- .../constitutive/CMakeLists.txt | 25 ------------------- .../TableRelativePermeabilityHysteresis.cpp | 1 - .../docs/PVTDriver.rst | 0 .../docs/solid/TriaxialDriver.rst | 0 .../docs/solid/TriaxialDriver.svg | 0 .../PVTDriverRunTestCO2BrineEzrokhiFluid.cpp | 0 ...iverRunTestCO2BrineEzrokhiThermalFluid.cpp | 0 .../PVTDriverRunTestCO2BrinePhillipsFluid.cpp | 0 ...verRunTestCO2BrinePhillipsThermalFluid.cpp | 0 .../fluid/multiFluid}/PVTDriver.cpp | 0 .../fluid/multiFluid}/PVTDriver.hpp | 0 .../fluid/multiFluid}/PVTDriverRunTest.hpp | 0 .../blackOil/PVTDriverRunTestDeadOilFluid.cpp | 0 ...verRunTestCompositionalMultiphaseFluid.cpp | 0 ...CompositionalTwoPhaseConstantViscosity.cpp | 0 ...ionalTwoPhaseLohrenzBrayClarkViscosity.cpp | 0 .../reactive/ReactiveFluidDriver.cpp | 0 .../reactive/ReactiveFluidDriver.hpp | 0 .../relativePermeability/RelpermDriver.cpp | 0 .../relativePermeability/RelpermDriver.hpp | 0 .../RelpermDriverBrooksCoreyBakerRunTest.cpp | 0 .../RelpermDriverBrooksCoreyRunTest.cpp | 0 .../RelpermDriverBrooksCoreyStone2RunTest.cpp | 0 .../RelpermDriverRunTest.hpp | 0 ...rmDriverTableRelativeHysteresisRunTest.cpp | 0 .../RelpermDriverTableRelativeRunTest.cpp | 0 .../RelpermDriverVanGenuchtenBakerRunTest.cpp | 0 ...RelpermDriverVanGenuchtenStone2RunTest.cpp | 0 .../solid/TriaxialDriver.cpp | 0 .../solid/TriaxialDriver.hpp | 0 32 files changed, 3 insertions(+), 28 deletions(-) rename src/coreComponents/{constitutive => constitutiveDrivers}/docs/PVTDriver.rst (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/docs/solid/TriaxialDriver.rst (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/docs/solid/TriaxialDriver.svg (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiFluid.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiThermalFluid.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/CO2Brine/PVTDriverRunTestCO2BrinePhillipsFluid.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/CO2Brine/PVTDriverRunTestCO2BrinePhillipsThermalFluid.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/PVTDriver.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/PVTDriver.hpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/PVTDriverRunTest.hpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/blackOil/PVTDriverRunTestDeadOilFluid.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/compositional/PVTDriverRunTestCompositionalTwoPhaseConstantViscosity.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/compositional/PVTDriverRunTestCompositionalTwoPhaseLohrenzBrayClarkViscosity.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/reactive/ReactiveFluidDriver.cpp (100%) rename src/coreComponents/{constitutive/fluid/multifluid => constitutiveDrivers/fluid/multiFluid}/reactive/ReactiveFluidDriver.hpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriver.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriver.hpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverBrooksCoreyBakerRunTest.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverBrooksCoreyRunTest.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverBrooksCoreyStone2RunTest.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverRunTest.hpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverTableRelativeRunTest.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverVanGenuchtenBakerRunTest.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/solid/TriaxialDriver.cpp (100%) rename src/coreComponents/{constitutive => constitutiveDrivers}/solid/TriaxialDriver.hpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb34514c77..a75f7b10ce 100644 --- 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 index 536769096a..72fc13c0e0 100644 --- 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 index 8296a95d96..bbbc2e7ce8 100644 --- 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 index e55d788602..f537f73722 100644 --- 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/src/coreComponents/constitutive/docs/PVTDriver.rst b/src/coreComponents/constitutiveDrivers/docs/PVTDriver.rst similarity index 100% rename from src/coreComponents/constitutive/docs/PVTDriver.rst rename to src/coreComponents/constitutiveDrivers/docs/PVTDriver.rst diff --git a/src/coreComponents/constitutive/docs/solid/TriaxialDriver.rst b/src/coreComponents/constitutiveDrivers/docs/solid/TriaxialDriver.rst similarity index 100% rename from src/coreComponents/constitutive/docs/solid/TriaxialDriver.rst rename to src/coreComponents/constitutiveDrivers/docs/solid/TriaxialDriver.rst diff --git a/src/coreComponents/constitutive/docs/solid/TriaxialDriver.svg b/src/coreComponents/constitutiveDrivers/docs/solid/TriaxialDriver.svg similarity index 100% rename from src/coreComponents/constitutive/docs/solid/TriaxialDriver.svg rename to src/coreComponents/constitutiveDrivers/docs/solid/TriaxialDriver.svg diff --git a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiFluid.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiFluid.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiFluid.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiFluid.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiThermalFluid.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiThermalFluid.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiThermalFluid.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrineEzrokhiThermalFluid.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsFluid.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsFluid.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsFluid.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsFluid.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsThermalFluid.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsThermalFluid.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsThermalFluid.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/CO2Brine/PVTDriverRunTestCO2BrinePhillipsThermalFluid.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/PVTDriver.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriver.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/PVTDriver.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriver.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/PVTDriver.hpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriver.hpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/PVTDriver.hpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriver.hpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/PVTDriverRunTest.hpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriverRunTest.hpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/PVTDriverRunTest.hpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriverRunTest.hpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/blackOil/PVTDriverRunTestDeadOilFluid.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/blackOil/PVTDriverRunTestDeadOilFluid.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/blackOil/PVTDriverRunTestDeadOilFluid.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/blackOil/PVTDriverRunTestDeadOilFluid.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/compositional/PVTDriverRunTestCompositionalMultiphaseFluid.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseConstantViscosity.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/compositional/PVTDriverRunTestCompositionalTwoPhaseConstantViscosity.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseConstantViscosity.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/compositional/PVTDriverRunTestCompositionalTwoPhaseConstantViscosity.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseLohrenzBrayClarkViscosity.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/compositional/PVTDriverRunTestCompositionalTwoPhaseLohrenzBrayClarkViscosity.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/compositional/PVTDriverRunTestCompositionalTwoPhaseLohrenzBrayClarkViscosity.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/compositional/PVTDriverRunTestCompositionalTwoPhaseLohrenzBrayClarkViscosity.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveFluidDriver.cpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/reactive/ReactiveFluidDriver.cpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveFluidDriver.cpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/reactive/ReactiveFluidDriver.cpp diff --git a/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveFluidDriver.hpp b/src/coreComponents/constitutiveDrivers/fluid/multiFluid/reactive/ReactiveFluidDriver.hpp similarity index 100% rename from src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveFluidDriver.hpp rename to src/coreComponents/constitutiveDrivers/fluid/multiFluid/reactive/ReactiveFluidDriver.hpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriver.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriver.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriver.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriver.cpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriver.hpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriver.hpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriver.hpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriver.hpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverBrooksCoreyBakerRunTest.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverBrooksCoreyBakerRunTest.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverBrooksCoreyBakerRunTest.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverBrooksCoreyBakerRunTest.cpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverBrooksCoreyRunTest.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverBrooksCoreyRunTest.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverBrooksCoreyRunTest.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverBrooksCoreyRunTest.cpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverBrooksCoreyStone2RunTest.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverBrooksCoreyStone2RunTest.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverBrooksCoreyStone2RunTest.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverBrooksCoreyStone2RunTest.cpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverRunTest.hpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverRunTest.hpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverRunTest.hpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverRunTest.hpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverTableRelativeRunTest.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverTableRelativeRunTest.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverTableRelativeRunTest.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverTableRelativeRunTest.cpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverVanGenuchtenBakerRunTest.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverVanGenuchtenBakerRunTest.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverVanGenuchtenBakerRunTest.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverVanGenuchtenBakerRunTest.cpp diff --git a/src/coreComponents/constitutive/relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp b/src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp similarity index 100% rename from src/coreComponents/constitutive/relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp rename to src/coreComponents/constitutiveDrivers/relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp diff --git a/src/coreComponents/constitutive/solid/TriaxialDriver.cpp b/src/coreComponents/constitutiveDrivers/solid/TriaxialDriver.cpp similarity index 100% rename from src/coreComponents/constitutive/solid/TriaxialDriver.cpp rename to src/coreComponents/constitutiveDrivers/solid/TriaxialDriver.cpp diff --git a/src/coreComponents/constitutive/solid/TriaxialDriver.hpp b/src/coreComponents/constitutiveDrivers/solid/TriaxialDriver.hpp similarity index 100% rename from src/coreComponents/constitutive/solid/TriaxialDriver.hpp rename to src/coreComponents/constitutiveDrivers/solid/TriaxialDriver.hpp