consistently rename "heat conduction" to "thermal conduction" and use "solid energy" laws

according to wikipedia the term "heat" is the energy transferred due
to a temperature gradient, i.e., it only makes sense if such a
gradient is present and this is not necessary for the storage term.

this means that technically the term "heat conductivity" is
meaningful, but "thermal conductivity" is IMO more consistent.

this has partially already been done in opm-material and eWoms it was
pretty inconsistent, so it also requires a patch in opm-material.
This commit is contained in:
Andreas Lauser
2018-01-04 15:26:07 +01:00
parent f5cfd8f768
commit 4f92ec5865
6 changed files with 143 additions and 163 deletions

View File

@@ -45,7 +45,7 @@
#include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/thermal/SomertonHeatConductionLaw.hpp>
#include <opm/material/thermal/SomertonThermalConductionLaw.hpp>
#include <opm/material/thermal/ConstantSolidHeatCapLaw.hpp>
#include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/components/SimpleH2O.hpp>
@@ -127,8 +127,8 @@ public:
// Enable the energy equation
SET_BOOL_PROP(FractureProblem, EnableEnergy, true);
// Set the heat conduction law
SET_PROP(FractureProblem, HeatConductionLaw)
// Set the thermal conduction law
SET_PROP(FractureProblem, ThermalConductionLaw)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -136,10 +136,10 @@ private:
public:
// define the material law parameterized by absolute saturations
typedef Opm::SomertonHeatConductionLaw<FluidSystem, Scalar> type;
typedef Opm::SomertonThermalConductionLaw<FluidSystem, Scalar> type;
};
// set the heat law for the solid phase
// set the energy storage law for the solid phase
SET_TYPE_PROP(FractureProblem, SolidEnergyLaw,
Opm::ConstantSolidHeatCapLaw<typename GET_PROP_TYPE(TypeTag, Scalar)>);
@@ -190,7 +190,7 @@ class FractureProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, HeatConductionLawParams) HeatConductionLawParams;
typedef typename GET_PROP_TYPE(TypeTag, ThermalConductionLawParams) ThermalConductionLawParams;
typedef typename GET_PROP_TYPE(TypeTag, SolidEnergyLawParams) SolidEnergyLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
@@ -278,8 +278,8 @@ public:
fracturePorosity_ = 0.25;
fractureWidth_ = 1e-3; // [m]
// parameters for the somerton law of heat conduction
initThermalParams_(heatCondParams_, matrixPorosity_);
// initialize the energy-related parameters
initEnergyParams_(thermalConductionParams_, matrixPorosity_);
}
/*!
@@ -420,26 +420,26 @@ public:
{ return fractureWidth_; }
/*!
* \brief Return the parameters for the heat storage law of the rock
* \copydoc FvBaseMultiPhaseProblem::thermalConductionParams
*/
template <class Context>
const ThermalConductionLawParams&
thermalConductionLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
{ return thermalConductionParams_; }
/*!
* \brief Return the parameters for the energy storage law of the rock
*
* In this case, we assume the rock-matrix to be granite.
*/
template <class Context>
const SolidEnergyLawParams&
solidHeatLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
{ return solidHeatLawParams_; }
/*!
* \copydoc FvBaseMultiPhaseProblem::heatConductionParams
*/
template <class Context>
const HeatConductionLawParams &
heatConductionLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
{ return heatCondParams_; }
solidEnergyLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
{ return solidEnergyParams_; }
// \}
@@ -581,12 +581,12 @@ private:
bool onUpperBoundary_(const GlobalPosition& pos) const
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
void initThermalParams_(HeatConductionLawParams& params, Scalar poro)
void initEnergyParams_(ThermalConductionLawParams& params, Scalar poro)
{
// assume the volumetric heat capacity of granite
solidHeatLawParams_.setSolidHeatCapacity(790.0 // specific heat capacity of granite [J / (kg K)]
* 2700.0); // density of granite [kg/m^3]
solidHeatLawParams_.finalize();
solidEnergyParams_.setSolidHeatCapacity(790.0 // specific heat capacity of granite [J / (kg K)]
* 2700.0); // density of granite [kg/m^3]
solidEnergyParams_.finalize();
Scalar lambdaGranite = 2.8; // [W / (K m)]
@@ -633,8 +633,8 @@ private:
MaterialLawParams fractureMaterialParams_;
MaterialLawParams matrixMaterialParams_;
HeatConductionLawParams heatCondParams_;
SolidEnergyLawParams solidHeatLawParams_;
ThermalConductionLawParams thermalConductionParams_;
SolidEnergyLawParams solidEnergyParams_;
Scalar temperature_;
Scalar eps_;