Skip to content

Commit

Permalink
remove using namespace testing from headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@rrsettgast
rrsettgast committed Aug 10, 2024
1 parent fc274fc commit b9ac080
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 114 deletions.
3 changes: 2 additions & 1 deletion src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveFluidDriver.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ class ReactiveFluidDriver : public TaskBase

enum columnKeys { TIME, PRES, TEMP }; ///< Enumeration of "input" column keys for readability

static constexpr real64 m_baselineTol = constitutive::MultiFluidConstants::baselineTolerance; ///< Comparison tolerance for baseline results
static constexpr real64 m_baselineTol = constitutive::MultiFluidConstants::baselineTolerance; ///< Comparison tolerance for baseline
///< results
};

} /* namespace geos */
Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/constitutive/relativePermeability/RelpermDriverRunTest.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace geos

//specific to Hysteresis
template< typename RELPERM_TYPE >
std::enable_if_t< std::is_same< constitutive::TableRelativePermeabilityHysteresis,
std::enable_if_t< std::is_same< constitutive::TableRelativePermeabilityHysteresis,
RELPERM_TYPE >::value, void >
RelpermDriver::runTest( RELPERM_TYPE & relperm,
const arrayView2d< real64 > & table )
Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/fileIO/timeHistory/HistoryCollection.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

namespace geos
{

/**
* @class HistoryCollection
*
Expand Down
66 changes: 33 additions & 33 deletions src/coreComponents/physicsSolvers/fluidFlow/IsothermalCompositionalMultiphaseBaseKernels.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2155,17 +2155,17 @@ struct HydrostaticPressureKernel
// Step 3: compute the mass density at this elevation using the guess, and update pressure

constitutive::MultiFluidBase::KernelWrapper::computeValues( fluidWrapper,
pres0,
temp,
compFrac[0],
phaseFrac[0][0],
phaseDens[0][0],
phaseMassDens[0][0],
phaseVisc[0][0],
phaseEnthalpy[0][0],
phaseInternalEnergy[0][0],
phaseCompFrac[0][0],
totalDens );
pres0,
temp,
compFrac[0],
phaseFrac[0][0],
phaseDens[0][0],
phaseMassDens[0][0],
phaseVisc[0][0],
phaseEnthalpy[0][0],
phaseInternalEnergy[0][0],
phaseCompFrac[0][0],
totalDens );
pres1 = refPres - 0.5 * ( refPhaseMassDens[ipInit] + phaseMassDens[0][0][ipInit] ) * gravCoef;

// Step 4: fixed-point iteration until convergence
Expand Down Expand Up @@ -2201,17 +2201,17 @@ struct HydrostaticPressureKernel

// compute the mass density at this elevation using the previous pressure, and compute the new pressure
constitutive::MultiFluidBase::KernelWrapper::computeValues( fluidWrapper,
pres0,
temp,
compFrac[0],
phaseFrac[0][0],
phaseDens[0][0],
phaseMassDens[0][0],
phaseVisc[0][0],
phaseEnthalpy[0][0],
phaseInternalEnergy[0][0],
phaseCompFrac[0][0],
totalDens );
pres0,
temp,
compFrac[0],
phaseFrac[0][0],
phaseDens[0][0],
phaseMassDens[0][0],
phaseVisc[0][0],
phaseEnthalpy[0][0],
phaseInternalEnergy[0][0],
phaseCompFrac[0][0],
totalDens );
pres1 = refPres - 0.5 * ( refPhaseMassDens[ipInit] + phaseMassDens[0][0][ipInit] ) * gravCoef;
}

Expand Down Expand Up @@ -2278,17 +2278,17 @@ struct HydrostaticPressureKernel
datumCompFrac[0][ic] = compFracTableWrappers[ic].compute( &datumElevation );
}
constitutive::MultiFluidBase::KernelWrapper::computeValues( fluidWrapper,
datumPres,
datumTemp,
datumCompFrac[0],
datumPhaseFrac[0][0],
datumPhaseDens[0][0],
datumPhaseMassDens[0][0],
datumPhaseVisc[0][0],
datumPhaseEnthalpy[0][0],
datumPhaseInternalEnergy[0][0],
datumPhaseCompFrac[0][0],
datumTotalDens );
datumPres,
datumTemp,
datumCompFrac[0],
datumPhaseFrac[0][0],
datumPhaseDens[0][0],
datumPhaseMassDens[0][0],
datumPhaseVisc[0][0],
datumPhaseEnthalpy[0][0],
datumPhaseInternalEnergy[0][0],
datumPhaseCompFrac[0][0],
datumTotalDens );

// Step 2: find the closest elevation to datumElevation

Expand Down
22 changes: 11 additions & 11 deletions src/coreComponents/physicsSolvers/fluidFlow/IsothermalCompositionalMultiphaseFVMKernels.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1861,17 +1861,17 @@ class DirichletFaceBasedAssemblyKernel : public FaceBasedAssemblyKernel< NUM_COM
real64 faceTotalDens = 0.0;

constitutive::MultiFluidBase::KernelWrapper::computeValues( m_fluidWrapper,
m_facePres[kf],
m_faceTemp[kf],
m_faceCompFrac[kf],
facePhaseFrac[0][0],
facePhaseDens[0][0],
facePhaseMassDens[0][0],
facePhaseVisc[0][0],
facePhaseEnthalpy[0][0],
facePhaseInternalEnergy[0][0],
facePhaseCompFrac[0][0],
faceTotalDens );
m_facePres[kf],
m_faceTemp[kf],
m_faceCompFrac[kf],
facePhaseFrac[0][0],
facePhaseDens[0][0],
facePhaseMassDens[0][0],
facePhaseVisc[0][0],
facePhaseEnthalpy[0][0],
facePhaseInternalEnergy[0][0],
facePhaseCompFrac[0][0],
faceTotalDens );

// Step 3: loop over phases, compute and upwind phase flux and sum contributions to each component's flux

Expand Down
4 changes: 2 additions & 2 deletions src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseFVMKernels.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace geos

namespace singlePhaseFVMKernels
{

/******************************** FaceBasedAssemblyKernelBase ********************************/

/**
Expand Down Expand Up @@ -79,7 +79,7 @@ class FaceBasedAssemblyKernelBase
fields::singlefluid::dDensity_dPressure >;

using SlurryFluidAccessors =
StencilMaterialAccessors< constitutive::SlurryFluidBase,
StencilMaterialAccessors< constitutive::SlurryFluidBase,
fields::singlefluid::density,
fields::singlefluid::dDensity_dPressure >;

Expand Down
30 changes: 15 additions & 15 deletions ...Solvers/multiphysics/poromechanicsKernels/SinglePhasePoromechanicsConformingFractures.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace geos

namespace singlePhasePoromechanicsConformingFracturesKernels
{

template< integer NUM_EQN, integer NUM_DOF >
class ConnectorBasedAssemblyKernel : public singlePhaseFVMKernels::FaceBasedAssemblyKernel< NUM_EQN, NUM_DOF, SurfaceElementStencilWrapper >
{
Expand Down Expand Up @@ -191,20 +191,20 @@ class ConnectorBasedAssemblyKernel : public singlePhaseFVMKernels::FaceBasedAsse
localIndex const elementIndex[2] = {m_sei[iconn][k[0]], m_sei[iconn][k[1]]};

fluxKernelsHelper::computeSinglePhaseFlux( regionIndex, subRegionIndex, elementIndex,
trans,
dTrans,
m_pres,
m_gravCoef,
m_dens,
m_dDens_dPres,
m_mob,
m_dMob_dPres,
alpha,
mobility,
potGrad,
fluxVal,
dFlux_dP,
dFlux_dTrans );
trans,
dTrans,
m_pres,
m_gravCoef,
m_dens,
m_dDens_dPres,
m_mob,
m_dMob_dPres,
alpha,
mobility,
potGrad,
fluxVal,
dFlux_dP,
dFlux_dTrans );

// populate local flux vector and derivatives
stack.localFlux[k[0]* numDof] += m_dt * fluxVal;
Expand Down
28 changes: 14 additions & 14 deletions ...csSolvers/multiphysics/poromechanicsKernels/SinglePhasePoromechanicsEmbeddedFractures.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,20 +181,20 @@ class ConnectorBasedAssemblyKernel : public singlePhaseFVMKernels::FaceBasedAsse
real64 potGrad = 0.0;

fluxKernelsHelper::computeSinglePhaseFlux( regionIndex, subRegionIndex, elementIndex,
trans,
dTrans,
m_pres,
m_gravCoef,
m_dens,
m_dDens_dPres,
m_mob,
m_dMob_dPres,
alpha,
mobility,
potGrad,
fluxVal,
dFlux_dP,
dFlux_dTrans );
trans,
dTrans,
m_pres,
m_gravCoef,
m_dens,
m_dDens_dPres,
m_mob,
m_dMob_dPres,
alpha,
mobility,
potGrad,
fluxVal,
dFlux_dP,
dFlux_dTrans );



Expand Down
36 changes: 18 additions & 18 deletions .../multiphysics/poromechanicsKernels/ThermalSinglePhasePoromechanicsConformingFractures.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,24 +206,24 @@ class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsConformingFr
real64 dMassFlux_dT[2]{};

fluxKernelsHelper::computeEnthalpyFlux( seri, sesri, sei,
trans,
m_enthalpy,
m_dEnthalpy_dPres,
m_dEnthalpy_dTemp,
m_gravCoef,
m_dDens_dTemp,
m_dMob_dTemp,
alpha,
mobility,
potGrad,
massFlux,
dMassFlux_dTrans,
dMassFlux_dP,
dMassFlux_dT,
stack.energyFlux,
stack.dEnergyFlux_dTrans,
stack.dEnergyFlux_dP,
stack.dEnergyFlux_dT );
trans,
m_enthalpy,
m_dEnthalpy_dPres,
m_dEnthalpy_dTemp,
m_gravCoef,
m_dDens_dTemp,
m_dMob_dTemp,
alpha,
mobility,
potGrad,
massFlux,
dMassFlux_dTrans,
dMassFlux_dP,
dMassFlux_dT,
stack.energyFlux,
stack.dEnergyFlux_dTrans,
stack.dEnergyFlux_dP,
stack.dEnergyFlux_dT );

// add dMassFlux_dT to localFluxJacobian
for( integer ke = 0; ke < 2; ++ke )
Expand Down
36 changes: 18 additions & 18 deletions ...rs/multiphysics/poromechanicsKernels/ThermalSinglePhasePoromechanicsEmbeddedFractures.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,24 +205,24 @@ class ConnectorBasedAssemblyKernel : public singlePhasePoromechanicsEmbeddedFrac
real64 dMassFlux_dT[2]{};

fluxKernelsHelper::computeEnthalpyFlux( seri, sesri, sei,
trans,
m_enthalpy,
m_dEnthalpy_dPres,
m_dEnthalpy_dTemp,
m_gravCoef,
m_dDens_dTemp,
m_dMob_dTemp,
alpha,
mobility,
potGrad,
massFlux,
dMassFlux_dTrans,
dMassFlux_dP,
dMassFlux_dT,
stack.energyFlux,
stack.dEnergyFlux_dTrans,
stack.dEnergyFlux_dP,
stack.dEnergyFlux_dT );
trans,
m_enthalpy,
m_dEnthalpy_dPres,
m_dEnthalpy_dTemp,
m_gravCoef,
m_dDens_dTemp,
m_dMob_dTemp,
alpha,
mobility,
potGrad,
massFlux,
dMassFlux_dTrans,
dMassFlux_dP,
dMassFlux_dT,
stack.energyFlux,
stack.dEnergyFlux_dTrans,
stack.dEnergyFlux_dP,
stack.dEnergyFlux_dT );

for( localIndex i=0; i < 3; i++ )
{
Expand Down

0 comments on commit b9ac080

Please sign in to comment.