Merge branch 'develop' into feature/sytuan/temperatureDependentTEC

GEOS-DEV · Nov 11, 2024 · e3076ce · e3076ce
2 parents 2b6005b + 3b0d907
commit e3076ce
Show file tree

Hide file tree

Showing 118 changed files with 13,410 additions and 11,786 deletions.
diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml
@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3413-8558-9f4af7c
+  baseline: integratedTests/baseline_integratedTests-pr3374-8621-bbb3cb2
 
 allow_fail:
   all: ''

diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md
@@ -6,6 +6,18 @@ This file is designed to track changes to the integrated test baselines.
 Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
 These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).
 
+PR #3374 (2024-11-09)
+====================
+Bugfix for gravity treatment in flux for thermal.
+
+PR #3372 (2024-11-09)
+====================
+Fix a bug related to mass and energy updates for poromechanics.
+
+PR #3426 (2024-11-08)
+====================
+Bugfix: reset accumulation in fracture when time step cut occurs in hydrofrac solver.
+
 PR #3413 (2024-11-07)
 ====================
 Add tests for poro-thermo-plastic model.

diff --git a/inputFiles/hydraulicFracturing/kgdEdgeBased_C3D6_base.xml b/inputFiles/hydraulicFracturing/kgdEdgeBased_C3D6_base.xml
@@ -17,7 +17,7 @@
       <NonlinearSolverParameters
         newtonTol="1.0e-5"
         newtonMaxIter="50"
-        lineSearchMaxCuts="10"/>
+	lineSearchAction="None"/>
       <LinearSolverParameters
         directParallel="0"/>
     </Hydrofracture>

diff --git a/inputFiles/hydraulicFracturing/kgdNodeBased_C3D6_base.xml b/inputFiles/hydraulicFracturing/kgdNodeBased_C3D6_base.xml
@@ -18,7 +18,7 @@
       <NonlinearSolverParameters
         newtonTol="1.0e-5"
         newtonMaxIter="50"
-        lineSearchMaxCuts="10"/>
+	lineSearchAction="None"/>
       <LinearSolverParameters
         directParallel="0"/>
     </Hydrofracture>

diff --git a/src/coreComponents/constitutive/CMakeLists.txt b/src/coreComponents/constitutive/CMakeLists.txt
@@ -172,7 +172,6 @@ set( constitutive_headers
      thermalConductivity/MultiPhaseVolumeWeightedThermalConductivity.hpp
      thermalConductivity/SinglePhaseThermalConductivity.hpp
      thermalConductivity/SinglePhaseThermalConductivityBase.hpp
-     thermalConductivity/SinglePhaseThermalConductivityFields.hpp
      thermalConductivity/SinglePhaseThermalConductivitySelector.hpp
      thermalConductivity/ThermalConductivityFields.hpp
    )

diff --git a/src/coreComponents/constitutive/fluid/multifluid/MultiFluidSelector.hpp b/src/coreComponents/constitutive/fluid/multifluid/MultiFluidSelector.hpp
@@ -14,7 +14,7 @@
  */
 
 /**
- * @file multiFluidSelector.hpp
+ * @file MultiFluidSelector.hpp
  */
 #ifndef GEOS_CONSTITUTIVE_FLUID_MULTIFLUIDSELECTOR_HPP_
 #define GEOS_CONSTITUTIVE_FLUID_MULTIFLUIDSELECTOR_HPP_

diff --git a/src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivityBase.cpp b/src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivityBase.cpp
@@ -19,7 +19,6 @@
 
 #include "SinglePhaseThermalConductivityBase.hpp"
 #include "ThermalConductivityFields.hpp"
-#include "SinglePhaseThermalConductivityFields.hpp"
 
 namespace geos
 {

diff --git a/src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivityFields.hpp b/src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivityFields.hpp
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt b/src/coreComponents/physicsSolvers/fluidFlow/CMakeLists.txt
@@ -1,59 +1,106 @@
 # Specify solver headers
 set( physicsSolvers_headers
      ${physicsSolvers_headers}
+     fluidFlow/FlowSolverBase.hpp
+     fluidFlow/FlowSolverBaseFields.hpp
      fluidFlow/CompositionalMultiphaseBase.hpp
      fluidFlow/CompositionalMultiphaseBaseFields.hpp
      fluidFlow/CompositionalMultiphaseStatistics.hpp
-     fluidFlow/kernels/IsothermalCompositionalMultiphaseBaseKernels.hpp
-     fluidFlow/kernels/ThermalCompositionalMultiphaseBaseKernels.hpp
      fluidFlow/CompositionalMultiphaseFVM.hpp
-     fluidFlow/kernels/IsothermalCompositionalMultiphaseFVMKernels.hpp
-     fluidFlow/kernels/IsothermalCompositionalMultiphaseFVMKernelUtilities.hpp
-     fluidFlow/kernels/ThermalCompositionalMultiphaseFVMKernels.hpp
      fluidFlow/CompositionalMultiphaseHybridFVM.hpp
-     fluidFlow/kernels/CompositionalMultiphaseHybridFVMKernels.hpp
      fluidFlow/CompositionalMultiphaseUtilities.hpp
      fluidFlow/ReactiveCompositionalMultiphaseOBL.hpp
      fluidFlow/ReactiveCompositionalMultiphaseOBLFields.hpp
-     fluidFlow/kernels/ReactiveCompositionalMultiphaseOBLKernels.hpp
-     fluidFlow/FlowSolverBase.hpp
-     fluidFlow/FlowSolverBaseFields.hpp
-     fluidFlow/kernels/FlowSolverBaseKernels.hpp
-     fluidFlow/kernels/FluxKernelsHelper.hpp
-     fluidFlow/kernels/HybridFVMHelperKernels.hpp
      fluidFlow/SourceFluxStatistics.hpp
-     fluidFlow/proppantTransport/ProppantTransport.hpp
-     fluidFlow/proppantTransport/ProppantTransportFields.hpp
-     fluidFlow/proppantTransport/ProppantTransportKernels.hpp
      fluidFlow/SinglePhaseBase.hpp
      fluidFlow/SinglePhaseBaseFields.hpp
-     fluidFlow/kernels/SinglePhaseBaseKernels.hpp
      fluidFlow/SinglePhaseStatistics.hpp
      fluidFlow/SinglePhaseFVM.hpp
-     fluidFlow/kernels/SinglePhaseFVMKernels.hpp
      fluidFlow/SinglePhaseHybridFVM.hpp
-     fluidFlow/kernels/SinglePhaseHybridFVMKernels.hpp
      fluidFlow/SinglePhaseProppantBase.hpp
-     fluidFlow/kernels/SinglePhaseProppantBaseKernels.hpp
-     fluidFlow/kernels/SinglePhaseProppantFluxKernels.hpp
-     fluidFlow/kernels/StabilizedCompositionalMultiphaseFVMKernels.hpp
-     fluidFlow/kernels/StabilizedSinglePhaseFVMKernels.hpp
      fluidFlow/StencilAccessors.hpp
      fluidFlow/StencilDataCollection.hpp
-     fluidFlow/kernels/ThermalSinglePhaseBaseKernels.hpp
-     fluidFlow/kernels/ThermalSinglePhaseFVMKernels.hpp
      fluidFlow/LogLevelsInfo.hpp
+     fluidFlow/kernels/MinPoreVolumeMaxPorosityKernel.hpp
+     fluidFlow/kernels/StencilWeightsUpdateKernel.hpp
+     fluidFlow/kernels/HybridFVMHelperKernels.hpp
+     fluidFlow/kernels/singlePhase/AccumulationKernels.hpp
+     fluidFlow/kernels/singlePhase/AquiferBCKernel.hpp
+     fluidFlow/kernels/singlePhase/DirichletFluxComputeKernel.hpp
+     fluidFlow/kernels/singlePhase/FluidUpdateKernel.hpp
+     fluidFlow/kernels/singlePhase/FluxComputeKernel.hpp
+     fluidFlow/kernels/singlePhase/FluxComputeKernelBase.hpp
+     fluidFlow/kernels/singlePhase/FluxKernelsHelper.hpp
+     fluidFlow/kernels/singlePhase/HydrostaticPressureKernel.hpp
+     fluidFlow/kernels/singlePhase/MobilityKernel.hpp
+     fluidFlow/kernels/singlePhase/ResidualNormKernel.hpp
+     fluidFlow/kernels/singlePhase/SinglePhaseHybridFVMKernels.hpp
+     fluidFlow/kernels/singlePhase/SolidInternalEnergyUpdateKernel.hpp
+     fluidFlow/kernels/singlePhase/SolutionCheckKernel.hpp
+     fluidFlow/kernels/singlePhase/SolutionScalingKernel.hpp
+     fluidFlow/kernels/singlePhase/StabilizedFluxComputeKernel.hpp
+     fluidFlow/kernels/singlePhase/StatisticsKernel.hpp
+     fluidFlow/kernels/singlePhase/ThermalAccumulationKernels.hpp
+     fluidFlow/kernels/singlePhase/ThermalDirichletFluxComputeKernel.hpp
+     fluidFlow/kernels/singlePhase/ThermalFluxComputeKernel.hpp
+     fluidFlow/kernels/singlePhase/proppant/ProppantBaseKernels.hpp
+     fluidFlow/kernels/singlePhase/proppant/ProppantFluxKernels.hpp
+     fluidFlow/kernels/compositional/AccumulationKernel.hpp
+     fluidFlow/kernels/compositional/AquiferBCKernel.hpp
+     fluidFlow/kernels/compositional/PPUPhaseFlux.hpp
+     fluidFlow/kernels/compositional/C1PPUPhaseFlux.hpp
+     fluidFlow/kernels/compositional/CapillaryPressureUpdateKernel.hpp
+     fluidFlow/kernels/compositional/CFLKernel.hpp
+     fluidFlow/kernels/compositional/CompositionalMultiphaseHybridFVMKernels.hpp
+     fluidFlow/kernels/compositional/DiffusionDispersionFluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/DirichletFluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/DissipationFluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/FluidUpdateKernel.hpp
+     fluidFlow/kernels/compositional/FluidUpdateKernel.hpp
+     fluidFlow/kernels/compositional/FluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/FluxComputeKernelBase.hpp
+     fluidFlow/kernels/compositional/GlobalComponentFractionKernel.hpp
+     fluidFlow/kernels/compositional/HydrostaticPressureKernel.hpp
+     fluidFlow/kernels/compositional/IHUPhaseFlux.hpp
+     fluidFlow/kernels/compositional/KernelLaunchSelectors.hpp
+     fluidFlow/kernels/compositional/PhaseComponentFlux.hpp
+     fluidFlow/kernels/compositional/PhaseMobilityKernel.hpp
+     fluidFlow/kernels/compositional/PhaseVolumeFractionKernel.hpp
+     fluidFlow/kernels/compositional/PotGrad.hpp
+     fluidFlow/kernels/compositional/PPUPhaseFlux.hpp
+     fluidFlow/kernels/compositional/PropertyKernelBase.hpp
+     fluidFlow/kernels/compositional/ReactiveCompositionalMultiphaseOBLKernels.hpp
+     fluidFlow/kernels/compositional/RelativePermeabilityUpdateKernel.hpp
+     fluidFlow/kernels/compositional/ResidualNormKernel.hpp
+     fluidFlow/kernels/compositional/SolidInternalEnergyUpdateKernel.hpp
+     fluidFlow/kernels/compositional/SolutionScalingAndCheckingKernelBase.hpp
+     fluidFlow/kernels/compositional/SolutionCheckKernel.hpp
+     fluidFlow/kernels/compositional/SolutionScalingKernel.hpp
+     fluidFlow/kernels/compositional/StabilizedFluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/StatisticsKernel.hpp
+     fluidFlow/kernels/compositional/ThermalAccumulationKernel.hpp
+     fluidFlow/kernels/compositional/ThermalDiffusionDispersionFluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/ThermalDirichletFluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/ThermalFluxComputeKernel.hpp
+     fluidFlow/kernels/compositional/ThermalPhaseMobilityKernel.hpp
+     fluidFlow/kernels/compositional/ThermalPhaseVolumeFractionKernel.hpp
+     fluidFlow/kernels/compositional/ThermalResidualNormKernel.hpp
+     fluidFlow/kernels/compositional/ThermalSolutionCheckKernel.hpp
+     fluidFlow/kernels/compositional/ThermalSolutionScalingKernel.hpp
      fluidFlow/wells/CompositionalMultiphaseWell.hpp
      fluidFlow/wells/CompositionalMultiphaseWellFields.hpp
-     fluidFlow/wells/kernels/CompositionalMultiphaseWellKernels.hpp
      fluidFlow/wells/SinglePhaseWell.hpp
      fluidFlow/wells/SinglePhaseWellFields.hpp
-     fluidFlow/wells/kernels/SinglePhaseWellKernels.hpp
      fluidFlow/wells/WellConstants.hpp
      fluidFlow/wells/WellControls.hpp
      fluidFlow/wells/WellSolverBase.hpp
      fluidFlow/wells/WellSolverBaseFields.hpp
      fluidFlow/wells/LogLevelsInfo.hpp
+     fluidFlow/wells/kernels/SinglePhaseWellKernels.hpp
+     fluidFlow/wells/kernels/CompositionalMultiphaseWellKernels.hpp
+     fluidFlow/proppantTransport/ProppantTransport.hpp
+     fluidFlow/proppantTransport/ProppantTransportFields.hpp
+     fluidFlow/proppantTransport/ProppantTransportKernels.hpp
      PARENT_SCOPE )
 
 # Specify solver sources
@@ -62,27 +109,29 @@ set( physicsSolvers_sources
      fluidFlow/CompositionalMultiphaseBase.cpp
      fluidFlow/CompositionalMultiphaseFVM.cpp
      fluidFlow/CompositionalMultiphaseStatistics.cpp
-     fluidFlow/kernels/IsothermalCompositionalMultiphaseFVMKernels.cpp
      fluidFlow/CompositionalMultiphaseHybridFVM.cpp
-     fluidFlow/kernels/CompositionalMultiphaseHybridFVMKernels.cpp
      fluidFlow/ReactiveCompositionalMultiphaseOBL.cpp
      fluidFlow/FlowSolverBase.cpp
-     fluidFlow/proppantTransport/ProppantTransport.cpp
-     fluidFlow/proppantTransport/ProppantTransportKernels.cpp
      fluidFlow/SinglePhaseBase.cpp
      fluidFlow/SinglePhaseStatistics.cpp
      fluidFlow/SinglePhaseFVM.cpp
      fluidFlow/SinglePhaseHybridFVM.cpp
      fluidFlow/SinglePhaseProppantBase.cpp
-     fluidFlow/kernels/SinglePhaseProppantFluxKernels.cpp
      fluidFlow/SourceFluxStatistics.cpp
      fluidFlow/StencilDataCollection.cpp
+     fluidFlow/kernels/singlePhase/proppant/ProppantFluxKernels.cpp
+     fluidFlow/kernels/compositional/AquiferBCKernel.cpp
+     fluidFlow/kernels/compositional/CFLKernel.cpp
+     fluidFlow/kernels/compositional/FluxComputeKernelBase.cpp
+     fluidFlow/kernels/compositional/CompositionalMultiphaseHybridFVMKernels.cpp
      fluidFlow/wells/CompositionalMultiphaseWell.cpp
      fluidFlow/wells/kernels/CompositionalMultiphaseWellKernels.cpp
      fluidFlow/wells/SinglePhaseWell.cpp
      fluidFlow/wells/kernels/SinglePhaseWellKernels.cpp
      fluidFlow/wells/WellControls.cpp
      fluidFlow/wells/WellSolverBase.cpp 
+     fluidFlow/proppantTransport/ProppantTransport.cpp
+     fluidFlow/proppantTransport/ProppantTransportKernels.cpp
      PARENT_SCOPE )
 
 
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
@@ -36,14 +36,24 @@
 #include "fieldSpecification/AquiferBoundaryCondition.hpp"
 #include "fieldSpecification/EquilibriumInitialCondition.hpp"
 #include "fieldSpecification/SourceFluxBoundaryCondition.hpp"
-#include "physicsSolvers/fluidFlow/SourceFluxStatistics.hpp"
+#include "finiteVolume/FluxApproximationBase.hpp"
 #include "mesh/DomainPartition.hpp"
 #include "mesh/mpiCommunications/CommunicationTools.hpp"
 #include "physicsSolvers/fluidFlow/CompositionalMultiphaseBaseFields.hpp"
 #include "physicsSolvers/fluidFlow/FlowSolverBaseFields.hpp"
-#include "physicsSolvers/fluidFlow/kernels/IsothermalCompositionalMultiphaseBaseKernels.hpp"
-#include "physicsSolvers/fluidFlow/kernels/IsothermalCompositionalMultiphaseFVMKernels.hpp" // TODO this should not be here
-#include "physicsSolvers/fluidFlow/kernels/ThermalCompositionalMultiphaseBaseKernels.hpp"
+#include "physicsSolvers/fluidFlow/SourceFluxStatistics.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/AccumulationKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/ThermalAccumulationKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/GlobalComponentFractionKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/PhaseVolumeFractionKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/ThermalPhaseVolumeFractionKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/FluidUpdateKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/RelativePermeabilityUpdateKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/CapillaryPressureUpdateKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/SolidInternalEnergyUpdateKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/HydrostaticPressureKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/StatisticsKernel.hpp"
+#include "physicsSolvers/fluidFlow/kernels/compositional/CFLKernel.hpp"
 
 #if defined( __INTEL_COMPILER )
 #pragma GCC optimize "O0"
@@ -1410,7 +1420,7 @@ void CompositionalMultiphaseBase::assembleAccumulationAndVolumeBalanceTerms( Dom
       if( m_isThermal )
       {
         thermalCompositionalMultiphaseBaseKernels::
-          ElementBasedAssemblyKernelFactory::
+          AccumulationKernelFactory::
           createAndLaunch< parallelDevicePolicy<> >( m_numComponents,
                                                      m_numPhases,
                                                      dofManager.rankOffset(),
@@ -1425,7 +1435,7 @@ void CompositionalMultiphaseBase::assembleAccumulationAndVolumeBalanceTerms( Dom
       else
       {
         isothermalCompositionalMultiphaseBaseKernels::
-          ElementBasedAssemblyKernelFactory::
+          AccumulationKernelFactory::
           createAndLaunch< parallelDevicePolicy<> >( m_numComponents,
                                                      m_numPhases,
                                                      dofManager.rankOffset(),