Commit 247513f0 authored by Kilian Weishaupt's avatar Kilian Weishaupt

Merge branch 'fix/cleanups-after-dumux-update' into 'master'

Fix/cleanups after dumux update

* Formulation pwsn unification
* 3pWaterOilTag
* SpatialParams for 3pWaterOil

See merge request !23
parents 1363b8df c3740d01
......@@ -117,7 +117,7 @@ public:
coarsePorosity_ = 0.1;
// heat conductivity of granite
//lambdaSolid_ = 2.8;
lambdaSolid_ = 2.8;
// specific heat capacities
fineHeatCap_ = 850.;
......@@ -143,9 +143,6 @@ public:
fineMaterialParams_.setKrRegardsSnr(false);
}
~SagdSpatialParams()
{}
/*!
* \brief Apply the intrinsic permeability tensor to a pressure
* potential gradient.
......@@ -154,9 +151,9 @@ public:
* \param fvElemGeom The current finite volume geometry of the element
* \param scvIdx The index of the sub-control volume
*/
const Scalar intrinsicPermeability(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
Scalar intrinsicPermeability(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
const GlobalPosition &pos = fvElemGeom.subContVol[scvIdx].global;
if (isFineMaterial_(pos))
......@@ -202,15 +199,14 @@ public:
return coarseMaterialParams_;
}
/*!
* \brief Returns the heat capacity \f$[J/m^3 K]\f$ of the rock matrix.
/*!
* \brief Returns the heat capacity \f$[J / (kg K)]\f$ of the rock matrix.
*
* This is only required for non-isothermal models.
*
* \param element The finite element
* \param fvGeometry The finite volume geometry
* \param scvIdx The local index of the sub-control volume where
* the heat capacity needs to be defined
* \param scvIdx The local index of the sub-control volume
*/
Scalar solidHeatCapacity(const Element &element,
const FVElementGeometry &fvGeometry,
......@@ -240,12 +236,13 @@ public:
}
/*!
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the porous material.
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the solid
*
* This is only required for non-isothermal models.
*
* \param element The finite element
* \param fvGeometry The finite volume geometry
* \param scvIdx The local index of the sub-control volume where
* the heat capacity needs to be defined
* \param fvGeometry The finite volume geometry of the element
* \param scvIdx The local index of the sub-control volume
*/
Scalar solidThermalConductivity(const Element &element,
const FVElementGeometry &fvGeometry,
......@@ -254,12 +251,11 @@ public:
return lambdaSolid_;
}
private:
bool isFineMaterial_(const GlobalPosition &pos) const
{
return pos[dim-1] > layerBottom_;
};
return pos[dim-1] > layerBottom_ - eps_;
}
Scalar layerBottom_;
Scalar lambdaSolid_;
......@@ -275,6 +271,8 @@ private:
MaterialLawParams fineMaterialParams_;
MaterialLawParams coarseMaterialParams_;
static constexpr Scalar eps_ = 1.5e-7;
};
}
......
......@@ -130,7 +130,7 @@ public:
coarsePorosity_ = 0.1;
// heat conductivity of granite
//lambdaSolid_ = 2.8;
lambdaSolid_ = 2.8;
// specific heat capacities
fineHeatCap_ = 850.;
......@@ -162,9 +162,6 @@ public:
fineMaterialParams_.setRhoBulk(0); */
}
~SagdCyclicSpatialParams()
{}
/*!
* \brief Apply the intrinsic permeability tensor to a pressure
* potential gradient.
......@@ -173,9 +170,9 @@ public:
* \param fvElemGeom The current finite volume geometry of the element
* \param scvIdx The index of the sub-control volume
*/
const Scalar intrinsicPermeability(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
Scalar intrinsicPermeability(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
const GlobalPosition &pos = fvElemGeom.subContVol[scvIdx].global;
if (isFineMaterial_(pos))
......@@ -222,14 +219,13 @@ public:
}
/*!
* \brief Returns the heat capacity \f$[J/m^3 K]\f$ of the rock matrix.
* \brief Returns the heat capacity \f$[J / (kg K)]\f$ of the rock matrix.
*
* This is only required for non-isothermal models.
*
* \param element The finite element
* \param fvGeometry The finite volume geometry
* \param scvIdx The local index of the sub-control volume where
* the heat capacity needs to be defined
* \param scvIdx The local index of the sub-control volume
*/
Scalar solidHeatCapacity(const Element &element,
const FVElementGeometry &fvGeometry,
......@@ -259,12 +255,13 @@ public:
}
/*!
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the porous material.
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the solid
*
* This is only required for non-isothermal models.
*
* \param element The finite element
* \param fvGeometry The finite volume geometry
* \param scvIdx The local index of the sub-control volume where
* the heat capacity needs to be defined
* \param fvGeometry The finite volume geometry of the element
* \param scvIdx The local index of the sub-control volume
*/
Scalar solidThermalConductivity(const Element &element,
const FVElementGeometry &fvGeometry,
......@@ -357,8 +354,8 @@ public:
private:
bool isFineMaterial_(const GlobalPosition &pos) const
{
return pos[dim-1] > layerBottom_;
};
return pos[dim-1] > layerBottom_ - eps_;
}
Scalar layerBottom_;
Scalar lambdaSolid_;
......@@ -381,6 +378,7 @@ private:
std::vector<trappedSaturations> trapSats_;
static constexpr Scalar eps_ = 1.5e-7;
};
} // end namespace dumux
......
......@@ -122,7 +122,7 @@ public:
finePorosity_ = 0.10;
coarsePorosity_ = 0.1;
// heat conductivity of granite
//lambdaSolid_ = 2.8;
lambdaSolid_ = 2.8;
// specific heat capacities
fineHeatCap_ = 850.;
coarseHeatCap_ = 850;
......@@ -145,8 +145,6 @@ public:
fineMaterialParams_.setKrRegardsSnr(false);
}
~SagdCyclicHystSpatialParams()
{}
/*!
* \brief Apply the intrinsic permeability tensor to a pressure
......@@ -156,9 +154,9 @@ public:
* \param fvElemGeom The current finite volume geometry of the element
* \param scvIdx The index of the sub-control volume
*/
const Scalar intrinsicPermeability(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
Scalar intrinsicPermeability(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
const GlobalPosition &pos = fvElemGeom.subContVol[scvIdx].global;
if (isFineMaterial_(pos))
......@@ -207,14 +205,13 @@ public:
}
/*!
* \brief Returns the heat capacity \f$[J/m^3 K]\f$ of the rock matrix.
* \brief Returns the heat capacity \f$[J / (kg K)]\f$ of the rock matrix.
*
* This is only required for non-isothermal models.
*
* \param element The finite element
* \param fvGeometry The finite volume geometry
* \param scvIdx The local index of the sub-control volume where
* the heat capacity needs to be defined
* \param scvIdx The local index of the sub-control volume
*/
Scalar solidHeatCapacity(const Element &element,
const FVElementGeometry &fvGeometry,
......@@ -244,12 +241,13 @@ public:
}
/*!
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the porous material.
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the solid
*
* This is only required for non-isothermal models.
*
* \param element The finite element
* \param fvGeometry The finite volume geometry
* \param scvIdx The local index of the sub-control volume where
* the heat capacity needs to be defined
* \param fvGeometry The finite volume geometry of the element
* \param scvIdx The local index of the sub-control volume
*/
Scalar solidThermalConductivity(const Element &element,
const FVElementGeometry &fvGeometry,
......@@ -337,8 +335,8 @@ public:
private:
bool isFineMaterial_(const GlobalPosition &pos) const
{
return pos[dim-1] > layerBottom_;
};
return pos[dim-1] > layerBottom_ - eps_;
}
std::vector<trappedSaturations> trapSats_;
......@@ -359,6 +357,8 @@ private:
std::vector<MaxSaturations> maxSats_;
MaterialLawHystParamsVector materialLawHystParams_;
static constexpr Scalar eps_ = 1.5e-7;
};
} // end namespace Dumux
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment