Merge remote-tracking branch 'origin/develop' into pt/flow-init

GEOS-DEV · Dec 3, 2024 · 24177eb · 24177eb
2 parents a786f13 + 470921f
commit 24177eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseBase.cpp b/src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseBase.cpp
@@ -404,7 +404,11 @@ void SinglePhaseBase::initializePostInitialConditionsPreSubGroups()
 
   DomainPartition & domain = this->getGroupByPath< DomainPartition >( "/Problem/domain" );
 
-  FlowSolverBase::initializeState( domain );
+    << << <<< HEAD
+    FlowSolverBase::initializeState( domain );
+  =======
+    FlowSolverBase::initialize( domain );
+  >> >> >>> origin/develop
 }
 
 void SinglePhaseBase::computeHydrostaticEquilibrium( DomainPartition & domain )

diff --git a/src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseHybridFVM.cpp b/src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseHybridFVM.cpp
@@ -656,22 +656,5 @@ void SinglePhaseHybridFVM::resetStateToBeginningOfStep( DomainPartition & domain
   } );
 }
 
-void SinglePhaseHybridFVM::updatePressureGradient( DomainPartition & domain )
-{
-  forDiscretizationOnMeshTargets( domain.getMeshBodies(), [&] ( string const &,
-                                                                MeshLevel & mesh,
-                                                                arrayView1d< string const > const & regionNames )
-  {
-    FaceManager & faceManager = mesh.getFaceManager();
-
-    mesh.getElemManager().forElementSubRegions< CellElementSubRegion >( regionNames, [&]( localIndex const,
-                                                                                          auto & subRegion )
-    {
-      singlePhaseHybridFVMKernels::AveragePressureGradientKernelFactory::createAndLaunch< parallelHostPolicy >( subRegion,
-                                                                                                                faceManager );
-    } );
-  } );
-}
-
 REGISTER_CATALOG_ENTRY( PhysicsSolverBase, SinglePhaseHybridFVM, string const &, Group * const )
 } /* namespace geos */
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseHybridFVM.hpp b/src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseHybridFVM.hpp
@@ -164,8 +164,6 @@ class SinglePhaseHybridFVM : public SinglePhaseBase
                              real64 const & dt,
                              DomainPartition & domain ) override;
 
-  virtual void updatePressureGradient( DomainPartition & domain ) override final;
-
   /**
    * @brief Function to perform the application of Dirichlet BCs on faces
    * @param[in] time_n current time