Commit 2506e317 authored by Thomas Fetzer's avatar Thomas Fetzer
Browse files

[cleanup,2p2csubproblem] Apply changes for the boundary condition names to the 2p2c side.

parent 45de14f1
......@@ -25,22 +25,16 @@
*/
namespace Dumux
{
/*!
/**
* \ingroup BC
* @brief Define a class containing boundary condition flags
*/
/**
* @brief Define a class containing boundary condition flags
*
*/
//! base Class that defines boundary condition flags
struct BoundaryConditions
{
/** \brief These values are ordered according to precedence */
enum Flags {
mortarCoupling = -3, //!< An outflow boundary for coupled models using mortar elements
couplingOutflow = -2, //!< An outflow boundary for coupled models
couplingInflow = -1, //!< An inflow boundary for coupled models
outflow = 0, //!< An outflow boundary
neumann = 1, //!< Neumann boundary
process = 2, //!< Processor boundary
......
......@@ -323,8 +323,8 @@ class TwoCStokesTwoPTwoCLocalOperator :
* \brief Update the volume variables of the element and extract the unknowns from dune-pdelab vectors
* and bring them into a form which fits to dumux.
*
* \param lfsu_s local basis for the trial space of the Stokes domain
* \param lfsu_n local basis for the trial space of the Darcy domain
* \param lfsu_s local basis for the trial space of the Stokes domain TODO rename s to 1
* \param lfsu_n local basis for the trial space of the Darcy domain TODO rename n to 2
* \param unknowns1 the unknowns vector of the Stokes element (formatted according to PDELab)
* \param unknowns2 the unknowns vector of the Darcy element (formatted according to PDELab)
* \param sdElement1 the element in the Stokes domain
......@@ -376,8 +376,8 @@ class TwoCStokesTwoPTwoCLocalOperator :
/*!
* \brief Evaluation of the coupling from Stokes (1 or s) to Darcy (2 or n).
*
* \param lfsu_s local basis for the trial space of the Stokes domain
* \param lfsu_n local basis for the trial space of the Darcy domain
* \param lfsu_s local basis for the trial space of the Stokes domain TODO rename s to 1
* \param lfsu_n local basis for the trial space of the Darcy domain TODO rename n to 2
* \param vertInElem1 local vertex index in element1
* \param vertInElem2 local vertex index in element2
* \param sdElement1 the element in the Stokes domain
......@@ -403,7 +403,7 @@ class TwoCStokesTwoPTwoCLocalOperator :
cParams.elemVolVarsCur1[vertInElem1].density();
//rho*v*n as NEUMANN condition for porous medium (set, if B&J defined as NEUMANN condition)
if (cParams.boundaryTypes2.isCouplingInflow(massBalanceIdx2))
if (cParams.boundaryTypes2.isCouplingNeumann(massBalanceIdx2))
{
static_assert(!GET_PROP_VALUE(Stokes2cTypeTag, UseMoles),
"This coupling condition is only implemented for mass fraction formulation.");
......@@ -426,7 +426,7 @@ class TwoCStokesTwoPTwoCLocalOperator :
-cParams.elemVolVarsCur1[vertInElem1].pressure());
}
if (cParams.boundaryTypes2.isCouplingInflow(contiWEqIdx2))
if (cParams.boundaryTypes2.isCouplingNeumann(contiWEqIdx2))
{
// only enter here, if a BOUNDARY LAYER MODEL is used for the computation of the diffusive fluxes
if (blModel_)
......@@ -556,8 +556,8 @@ class TwoCStokesTwoPTwoCLocalOperator :
/*!
* \brief Evaluation of the coupling from Darcy (2 or n) to Stokes (1 or s).
*
* \param lfsu_s local basis for the trial space of the Stokes domain
* \param lfsu_n local basis for the trial space of the Darcy domain
* \param lfsu_s local basis for the trial space of the Stokes domain TODO rename s to 1
* \param lfsu_n local basis for the trial space of the Darcy domain TODO rename n to 2
* \param vertInElem1 local vertex index in element1
* \param vertInElem2 local vertex index in element2
* \param sdElement1 the element in the Stokes domain
......@@ -584,6 +584,7 @@ class TwoCStokesTwoPTwoCLocalOperator :
normalFlux2[phaseIdx] = -boundaryVars2.volumeFlux(phaseIdx)*
cParams.elemVolVarsCur2[vertInElem2].density(phaseIdx);
// TODO revise comment
//p*n as NEUMANN condition for free flow (set, if B&J defined as NEUMANN condition)
if (cParams.boundaryTypes1.isCouplingOutflow(momentumYIdx1))
{
......
......@@ -241,6 +241,7 @@ public:
/*!
* \brief Set the Dirichlet-like conditions for the coupling
* and replace the existing residual
* TODO move this function to evalBoundary_
*
* \param scvIdx Sub control vertex index for the coupling condition
*/
......@@ -252,7 +253,7 @@ public:
if (this->bcTypes_(scvIdx).isCouplingOutflow(massBalanceIdx))
this->residual_[scvIdx][massBalanceIdx] = volVars.pressure(nPhaseIdx);
// set mass fraction;
// set mass fraction TODO: add use of moles
if (this->bcTypes_(scvIdx).isCouplingOutflow(contiWEqIdx))
this->residual_[scvIdx][contiWEqIdx] = volVars.massFraction(nPhaseIdx, wCompIdx);
}
......@@ -260,7 +261,7 @@ public:
/*!
* \brief Check if one of the boundary conditions is coupling.
*/
DUNE_DEPRECATED_MSG("boundaryHasCoupling_() is unused in dumux and therefore deprecated")
DUNE_DEPRECATED_MSG("boundaryHasCoupling_() is deprecated")
bool boundaryHasCoupling_(const BoundaryTypes& bcTypes) const
{
for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
......@@ -272,7 +273,7 @@ public:
/*!
* \brief Check if one of the boundary conditions is mortar coupling.
*/
DUNE_DEPRECATED_MSG("boundaryHasMortarCoupling_() is unused in dumux and therefore deprecated")
DUNE_DEPRECATED_MSG("boundaryHasMortarCoupling_() is deprecated")
bool boundaryHasMortarCoupling_(const BoundaryTypes& bcTypes) const
{
for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
......
......@@ -175,7 +175,8 @@ public:
asImp_()->evalOutflowSegment_(&intersection, idx, boundaryFaceIdx, boundaryVars);
// Beavers-Joseph condition at the coupling boundary/interface
if(boundaryHasCoupling_(bcTypes) || bcTypes.hasCouplingMortar())
if((bcTypes.hasCouplingInflow() || bcTypes.hasCouplingOutflow())
|| bcTypes.hasCouplingMortar())
{
evalBeaversJoseph_(&intersection, idx, boundaryFaceIdx, boundaryVars);
asImp_()->evalCouplingVertex_(&intersection, idx, boundaryFaceIdx, boundaryVars);
......@@ -335,7 +336,7 @@ protected:
}
//! \brief Return true, if at least one equation on the boundary has a coupling condition
DUNE_DEPRECATED_MSG("boundaryHasCoupling_() is unused in dumux and therefore deprecated")
DUNE_DEPRECATED_MSG("boundaryHasCoupling_() is deprecated")
bool boundaryHasCoupling_(const BoundaryTypes& bcTypes) const
{
for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
......@@ -345,7 +346,7 @@ protected:
}
//! \brief Return true, if at least one equation on the boundary has a mortar coupling condition
DUNE_DEPRECATED_MSG("boundaryHasMortarCoupling_() is unused in dumux and therefore deprecated")
DUNE_DEPRECATED_MSG("boundaryHasMortarCoupling_() is deprecated")
bool boundaryHasMortarCoupling_(const BoundaryTypes& bcTypes) const
{
for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
......
......@@ -238,7 +238,7 @@ public:
if (time > initializationTime_)
{
if (globalPos[0] > runUpDistanceX_ - eps_)
values.setAllCouplingInflow();
values.setAllCouplingNeumann();
else
values.setAllNeumann();
}
......
Supports Markdown
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