Skip to content

Commit

Permalink
refactor: Remove "using namespace" in header files (#3255)
Browse files Browse the repository at this point in the history
* remove using namespace dataRepository from headers files

* remove using namespace multifluid from NegativeTwoPhaseFlash.hpp

* removed using namespace constitutive from headers files

* removed using namespace fields from headers files

* removed using namespace stabilization from headers files

* removed using namespace fluxKernelsHelper from headers files

* remove using namespace surfaceGenerationKernelsHelpers from header files
  • Loading branch information
rrsettgast committed Sep 17, 2024
1 parent ecbc260 commit 8d01edf
Show file tree
Hide file tree
Showing 80 changed files with 785 additions and 842 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void BrineEnthalpyUpdate::compute( real64 const & pressure,
arraySlice1d< real64, USD3 > const & dValue,
bool useMass ) const
{
using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

real64 const input[2] = { pressure, temperature };
real64 brineEnthalpy_dTemperature = 0.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void CO2EnthalpyUpdate::compute( real64 const & pressure,
{
GEOS_UNUSED_VAR( phaseComposition, dPhaseComposition );

using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

real64 const input[2] = { pressure, temperature };
real64 CO2EnthalpyDeriv[2]{};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class CO2SolubilityUpdate final : public FlashModelBaseUpdate
{
public:

using PhaseProp = MultiFluidVar< real64, 3, multifluid::LAYOUT_PHASE, multifluid::LAYOUT_PHASE_DC >;
using PhaseComp = MultiFluidVar< real64, 4, multifluid::LAYOUT_PHASE_COMP, multifluid::LAYOUT_PHASE_COMP_DC >;
using PhaseProp = MultiFluidVar< real64, 3, constitutive::multifluid::LAYOUT_PHASE, constitutive::multifluid::LAYOUT_PHASE_DC >;
using PhaseComp = MultiFluidVar< real64, 4, constitutive::multifluid::LAYOUT_PHASE_COMP, constitutive::multifluid::LAYOUT_PHASE_COMP_DC >;

CO2SolubilityUpdate( arrayView1d< real64 const > const & componentMolarWeight,
TableFunction const & CO2SolubilityTable,
Expand Down Expand Up @@ -167,7 +167,7 @@ CO2SolubilityUpdate::compute( real64 const & pressure,
PhaseProp::SliceType const phaseFraction,
PhaseComp::SliceType const phaseCompFraction ) const
{
using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

// Solubility of CO2 is read from the tables in the form of moles of CO2 per kg of water
// Solubility of water is read from the tables in the form of moles of water per kg of CO2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void EzrokhiBrineDensityUpdate::compute( real64 const & pressure,
bool useMass ) const
{
constexpr integer numDof = 4;
using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

real64 waterSatDensity_dTemperature = 0.0;
real64 waterSatPressure_dTemperature = 0.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void EzrokhiBrineViscosityUpdate::compute( real64 const & pressure,
{
GEOS_UNUSED_VAR( pressure, useMass );

using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

real64 waterVisc_dTemperature = 0.0;
real64 const waterVisc = m_waterViscosityTable.compute( &temperature, &waterVisc_dTemperature );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void FenghourCO2ViscosityUpdate::compute( real64 const & pressure,
dPhaseComposition,
useMass );

using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

real64 const input[2] = { pressure, temperature };
real64 densityDeriv[2]{};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void PhillipsBrineDensityUpdate::compute( real64 const & pressure,
arraySlice1d< real64, USD3 > const & dValue,
bool useMass ) const
{
using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

// this method implements the method proposed by E. Garcia (2001)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void PhillipsBrineViscosityUpdate::compute( real64 const & pressure,
dPhaseComposition,
useMass );

using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

// compute the viscosity of pure water as a function of temperature
real64 dPureWaterVisc_dTemperature;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void SpanWagnerCO2DensityUpdate::compute( real64 const & pressure,
{
GEOS_UNUSED_VAR( phaseComposition, dPhaseComposition );

using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

real64 const input[2] = { pressure, temperature };
real64 densityDeriv[2]{};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void WaterDensityUpdate::compute( real64 const & pressure,
{
GEOS_UNUSED_VAR( phaseComposition, dPhaseComposition, useMass );

using Deriv = multifluid::DerivativeOffset;
using Deriv = constitutive::multifluid::DerivativeOffset;

real64 const input[2] = { pressure, temperature };
real64 densityDeriv[2]{};
Expand Down
Loading

0 comments on commit 8d01edf

Please sign in to comment.