removed using namespace fluxKernelsHelper from headers

GEOS-DEV · Aug 10, 2024 · fb9e629 · fb9e629
1 parent dc9aed3
commit fb9e629
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 25 deletions.
diff --git a/src/coreComponents/physicsSolvers/multiphysics/PoromechanicsSolver.hpp b/src/coreComponents/physicsSolvers/multiphysics/PoromechanicsSolver.hpp
@@ -50,9 +50,6 @@ ENUM_STRINGS( StabilizationType,
               "Local" );
 }
 
-//using namespace stabilization;
-;
-
 
 template< typename FLOW_SOLVER, typename MECHANICS_SOLVER = SolidMechanicsLagrangianFEM >
 class PoromechanicsSolver : public CoupledSolver< FLOW_SOLVER, MECHANICS_SOLVER >
@@ -128,12 +125,12 @@ class PoromechanicsSolver : public CoupledSolver< FLOW_SOLVER, MECHANICS_SOLVER
     if( dynamic_cast< SurfaceElementSubRegion * >( &subRegion ) )
     {
       subRegion.registerWrapper< string >( viewKeyStruct::hydraulicApertureRelationNameString() ).
-        setPlotLevel( PlotLevel::NOPLOT ).
-        setRestartFlags( RestartFlags::NO_WRITE ).
+        setPlotLevel( dataRepository::PlotLevel::NOPLOT ).
+        setRestartFlags( dataRepository::RestartFlags::NO_WRITE ).
         setSizedFromParent( 0 );
 
       string & hydraulicApertureModelName = subRegion.getReference< string >( viewKeyStruct::hydraulicApertureRelationNameString() );
-      hydraulicApertureModelName = SolverBase::getConstitutiveName< HydraulicApertureBase >( subRegion );
+      hydraulicApertureModelName = SolverBase::getConstitutiveName< constitutive::HydraulicApertureBase >( subRegion );
       GEOS_ERROR_IF( hydraulicApertureModelName.empty(), GEOS_FMT( "{}: HydraulicApertureBase model not found on subregion {}",
                                                                    this->getDataContext(), subRegion.getDataContext() ) );
     }

diff --git a/...Solvers/multiphysics/poromechanicsKernels/SinglePhasePoromechanicsConformingFractures.hpp b/...Solvers/multiphysics/poromechanicsKernels/SinglePhasePoromechanicsConformingFractures.hpp
@@ -28,10 +28,7 @@ namespace geos
 
 namespace singlePhasePoromechanicsConformingFracturesKernels
 {
-
-using namespace fluxKernelsHelper;
-;
-
+
 template< integer NUM_EQN, integer NUM_DOF >
 class ConnectorBasedAssemblyKernel : public singlePhaseFVMKernels::FaceBasedAssemblyKernel< NUM_EQN, NUM_DOF, SurfaceElementStencilWrapper >
 {
@@ -193,7 +190,7 @@ class ConnectorBasedAssemblyKernel : public singlePhaseFVMKernels::FaceBasedAsse
         localIndex const subRegionIndex[2] = {m_sesri[iconn][k[0]], m_sesri[iconn][k[1]]};
         localIndex const elementIndex[2]   = {m_sei[iconn][k[0]], m_sei[iconn][k[1]]};
 
-        computeSinglePhaseFlux( regionIndex, subRegionIndex, elementIndex,
+        fluxKernelsHelper::computeSinglePhaseFlux( regionIndex, subRegionIndex, elementIndex,
                                 trans,
                                 dTrans,
                                 m_pres,

diff --git a/...csSolvers/multiphysics/poromechanicsKernels/SinglePhasePoromechanicsEmbeddedFractures.hpp b/...csSolvers/multiphysics/poromechanicsKernels/SinglePhasePoromechanicsEmbeddedFractures.hpp
@@ -29,9 +29,6 @@ namespace geos
 namespace singlePhasePoromechanicsEmbeddedFracturesKernels
 {
 
-using namespace fluxKernelsHelper;
-;
-
 template< integer NUM_EQN, integer NUM_DOF >
 class ConnectorBasedAssemblyKernel : public singlePhaseFVMKernels::FaceBasedAssemblyKernel< NUM_EQN, NUM_DOF, SurfaceElementStencilWrapper >
 {
@@ -183,7 +180,7 @@ class ConnectorBasedAssemblyKernel : public singlePhaseFVMKernels::FaceBasedAsse
     real64 mobility = 0.0;
     real64 potGrad = 0.0;
 
-    computeSinglePhaseFlux( regionIndex, subRegionIndex, elementIndex,
+    fluxKernelsHelper::computeSinglePhaseFlux( regionIndex, subRegionIndex, elementIndex,
                             trans,
                             dTrans,
                             m_pres,

diff --git a/.../multiphysics/poromechanicsKernels/ThermalSinglePhasePoromechanicsConformingFractures.hpp b/.../multiphysics/poromechanicsKernels/ThermalSinglePhasePoromechanicsConformingFractures.hpp
@@ -28,9 +28,6 @@ namespace geos
 namespace thermalSinglePhasePoromechanicsConformingFracturesKernels
 {
 
-using namespace fluxKernelsHelper;
-;
-
 template< integer NUM_EQN, integer NUM_DOF >
 class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsConformingFracturesKernels::ConnectorBasedAssemblyKernel< NUM_EQN, NUM_DOF >
 {
@@ -208,7 +205,7 @@ class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsConformingFr
       real64 trans[2] = {stack.transmissibility[0][0], stack.transmissibility[0][1]};
       real64 dMassFlux_dT[2]{};
 
-      computeEnthalpyFlux( seri, sesri, sei,
+      fluxKernelsHelper::computeEnthalpyFlux( seri, sesri, sei,
                            trans,
                            m_enthalpy,
                            m_dEnthalpy_dPres,
@@ -263,7 +260,7 @@ class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsConformingFr
         localIndex const sei[2]   = {m_sei( iconn, k[0] ), m_sei( iconn, k[1] )};
 
         // Step 2: compute temperature difference at the interface
-        computeConductiveFlux( seri, sesri, sei, m_temp, thermalTrans, stack.energyFlux, stack.dEnergyFlux_dT );
+        fluxKernelsHelper::computeConductiveFlux( seri, sesri, sei, m_temp, thermalTrans, stack.energyFlux, stack.dEnergyFlux_dT );
 
         // add energyFlux and its derivatives to localFlux and localFluxJacobian
         stack.localFlux[k[0]*numEqn + numEqn - 1] += m_dt * stack.energyFlux;

diff --git a/...rs/multiphysics/poromechanicsKernels/ThermalSinglePhasePoromechanicsEmbeddedFractures.hpp b/...rs/multiphysics/poromechanicsKernels/ThermalSinglePhasePoromechanicsEmbeddedFractures.hpp
@@ -28,9 +28,6 @@ namespace geos
 namespace thermalSinglePhasePoromechanicsEmbeddedFracturesKernels
 {
 
-using namespace fluxKernelsHelper;
-;
-
 template< integer NUM_EQN, integer NUM_DOF >
 class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsEmbeddedFracturesKernels::ConnectorBasedAssemblyKernel< NUM_EQN, NUM_DOF >
 {
@@ -207,7 +204,7 @@ class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsEmbeddedFrac
       real64 trans[2] = {stack.transmissibility[0][0], stack.transmissibility[0][1]};
       real64 dMassFlux_dT[2]{};
 
-      computeEnthalpyFlux( seri, sesri, sei,
+      fluxKernelsHelper::computeEnthalpyFlux( seri, sesri, sei,
                            trans,
                            m_enthalpy,
                            m_dEnthalpy_dPres,
@@ -274,7 +271,7 @@ class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsEmbeddedFrac
         localIndex const sei[2]   = {m_sei( iconn, k[0] ), m_sei( iconn, k[1] )};
 
         // Step 2: compute temperature difference at the interface
-        computeConductiveFlux( seri, sesri, sei, m_temp, thermalTrans, stack.energyFlux, stack.dEnergyFlux_dT );
+        fluxKernelsHelper::computeConductiveFlux( seri, sesri, sei, m_temp, thermalTrans, stack.energyFlux, stack.dEnergyFlux_dT );
 
         // add energyFlux and its derivatives to localFlux and localFluxJacobian
         stack.localFlux[k[0]*numEqn + numEqn - 1] += m_dt * stack.energyFlux;