OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #458 from akva2/no_opm_in_opm

Browse Source 
fixed: do not use Opm:: prefix when inside namespace Opm
This commit is contained in:
Bård Skaflestad 2021-05-05 14:15:53 +02:00 committed by GitHub
commit 3e26468453
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/material/thermal/EclSolidEnergyLawMultiplexer.hpp
View File

@ -49,9 +49,9 @@ class EclSolidEnergyLawMultiplexer
{
enum { numPhases = FluidSystem::numPhases };
typedef Opm::EclHeatcrLaw<ScalarT, FluidSystem, typename ParamsT::HeatcrLawParams> HeatcrLaw;
typedef Opm::EclSpecrockLaw<ScalarT, typename ParamsT::SpecrockLawParams> SpecrockLaw;
typedef Opm::NullSolidEnergyLaw<ScalarT> NullLaw;
typedef EclHeatcrLaw<ScalarT, FluidSystem, typename ParamsT::HeatcrLawParams> HeatcrLaw;
typedef EclSpecrockLaw<ScalarT, typename ParamsT::SpecrockLawParams> SpecrockLaw;
typedef NullSolidEnergyLaw<ScalarT> NullLaw;
public:
typedef ParamsT Params;

4
opm/material/thermal/EclSolidEnergyLawMultiplexerParams.hpp
View File

@ -55,8 +55,8 @@ public:
nullApproach, // (no keywords)
};
typedef Opm::EclHeatcrLawParams<ScalarT> HeatcrLawParams;
typedef Opm::EclSpecrockLawParams<ScalarT> SpecrockLawParams;
typedef EclHeatcrLawParams<ScalarT> HeatcrLawParams;
typedef EclSpecrockLawParams<ScalarT> SpecrockLawParams;
EclSolidEnergyLawMultiplexerParams(const EclSolidEnergyLawMultiplexerParams&) = default;

2
opm/material/thermal/EclThconrLaw.hpp
View File

@ -60,7 +60,7 @@ public:
static constexpr int gasPhaseIdx = FluidSystem::gasPhaseIdx;
if (FluidSystem::phaseIsActive(gasPhaseIdx)) {
Scalar alpha = params.dTotalThermalConductivity_dSg();
const Evaluation& Sg = Opm::decay<Evaluation>(fluidState.saturation(gasPhaseIdx));
const Evaluation& Sg = decay<Evaluation>(fluidState.saturation(gasPhaseIdx));
return lambdaRef*(1.0 - alpha*Sg);
} else {
return lambdaRef;

6
opm/material/thermal/EclThermalConductionLawMultiplexer.hpp
View File

@ -49,9 +49,9 @@ class EclThermalConductionLawMultiplexer
{
enum { numPhases = FluidSystem::numPhases };
typedef Opm::EclThconrLaw<ScalarT, FluidSystem, typename ParamsT::ThconrLawParams> ThconrLaw;
typedef Opm::EclThcLaw<ScalarT, typename ParamsT::ThcLawParams> ThcLaw;
typedef Opm::NullThermalConductionLaw<ScalarT> NullLaw;
typedef EclThconrLaw<ScalarT, FluidSystem, typename ParamsT::ThconrLawParams> ThconrLaw;
typedef EclThcLaw<ScalarT, typename ParamsT::ThcLawParams> ThcLaw;
typedef NullThermalConductionLaw<ScalarT> NullLaw;
public:
typedef ParamsT Params;

4
opm/material/thermal/EclThermalConductionLawMultiplexerParams.hpp
View File

@ -55,8 +55,8 @@ public:
nullApproach, // (no keywords)
};
typedef Opm::EclThconrLawParams<ScalarT> ThconrLawParams;
typedef Opm::EclThcLawParams<ScalarT> ThcLawParams;
typedef EclThconrLawParams<ScalarT> ThconrLawParams;
typedef EclThcLawParams<ScalarT> ThcLawParams;
EclThermalConductionLawMultiplexerParams(const EclThermalConductionLawMultiplexerParams&) = default;

10
opm/material/thermal/EclThermalLawManager.hpp
View File

@ -67,7 +67,7 @@ public:
thermalConductivityApproach_ = ThermalConductionLawParams::undefinedApproach;
}
void initParamsForElements(const Opm::EclipseState& eclState, size_t numElems)
void initParamsForElements(const EclipseState& eclState, size_t numElems)
{
const auto& fp = eclState.fieldProps();
const auto& tableManager = eclState.getTableManager();
@ -135,7 +135,7 @@ private:
/*!
* \brief Initialize the parameters for the solid energy law using using HEATCR and friends.
*/
void initHeatcr_(const Opm::EclipseState& eclState,
void initHeatcr_(const EclipseState& eclState,
size_t numElems)
{
solidEnergyApproach_ = SolidEnergyLawParams::heatcrApproach;
@ -162,7 +162,7 @@ private:
/*!
* \brief Initialize the parameters for the solid energy law using using SPECROCK and friends.
*/
void initSpecrock_(const Opm::EclipseState& eclState,
void initSpecrock_(const EclipseState& eclState,
size_t numElems)
{
solidEnergyApproach_ = SolidEnergyLawParams::specrockApproach;
@ -211,7 +211,7 @@ private:
/*!
* \brief Initialize the parameters for the thermal conduction law using THCONR and friends.
*/
void initThconr_(const Opm::EclipseState& eclState,
void initThconr_(const EclipseState& eclState,
size_t numElems)
{
thermalConductivityApproach_ = ThermalConductionLawParams::thconrApproach;
@ -244,7 +244,7 @@ private:
/*!
* \brief Initialize the parameters for the thermal conduction law using THCROCK and friends.
*/
void initThc_(const Opm::EclipseState& eclState,
void initThc_(const EclipseState& eclState,
size_t numElems)
{
thermalConductivityApproach_ = ThermalConductionLawParams::thcApproach;