From eb8a06a429dc53c938e093e50704386c72c128d6 Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Wed, 28 Feb 2024 20:19:15 +0100
Subject: [PATCH] [tmp][flux] Directly use velocity helper instead of tag
---
.../navierstokes/momentum/fluxhelper.hh | 23 ++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/dumux/freeflow/navierstokes/momentum/fluxhelper.hh b/dumux/freeflow/navierstokes/momentum/fluxhelper.hh
index 69117810f4..44ea7a5ea0 100644
--- a/dumux/freeflow/navierstokes/momentum/fluxhelper.hh
+++ b/dumux/freeflow/navierstokes/momentum/fluxhelper.hh
@@ -21,15 +21,15 @@
namespace Dumux {
-template<class DiscretizationMethod, class SlipCondition = void>
+template<class DiscretizationMethod, class SlipVelocityHelper = void>
struct NavierStokesMomentumBoundaryFlux;
/*!
* \ingroup NavierStokesModel
* \brief Struct containing flux helper functions to be used in the momentum problem's Neumann function.
*/
-template<class SlipCondition>
-struct NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, SlipCondition>
+template<class SlipVelocityHelper>
+struct NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, SlipVelocityHelper>
{
/*!
* \brief Returns the momentum flux a fixed-pressure boundary.
@@ -243,10 +243,8 @@ struct NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, Slip
*
*/
- if constexpr (!std::is_void_v<SlipCondition>)
+ if constexpr (!std::is_void_v<SlipVelocityHelper>)
{
- using SlipVelocityHelper = SlipVelocityHelper<typename FVElementGeometry::GridGeometry, SlipCondition>;
-
const Scalar velI = elemVolVars[scvf.insideScvIdx()].velocity();
// viscous terms
@@ -304,7 +302,7 @@ struct NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, Slip
}
}
else
- DUNE_THROW(Dune::InvalidStateException, "SlipCondition needs to be specified as template argument");
+ DUNE_THROW(Dune::InvalidStateException, "SlipVelocityHelper needs to be specified as template argument");
}
else if (scv.boundary() && problem.onSlipBoundary(fvGeometry, fvGeometry.frontalScvfOnBoundary(scv)))
{
@@ -329,10 +327,8 @@ struct NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, Slip
*
*/
- if constexpr (!std::is_void_v<SlipCondition>)
+ if constexpr (!std::is_void_v<SlipVelocityHelper>)
{
- using SlipVelocityHelper = SlipVelocityHelper<typename FVElementGeometry::GridGeometry, SlipCondition>;
-
const Scalar velJ = elemVolVars[orthogonalScvf.insideScvIdx()].velocity();
// viscous terms
@@ -390,7 +386,7 @@ struct NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, Slip
}
}
else
- DUNE_THROW(Dune::InvalidStateException, "SlipCondition needs to be specified as template argument");
+ DUNE_THROW(Dune::InvalidStateException, "SlipVelocityHelper needs to be specified as template argument");
}
return flux;
@@ -398,8 +394,9 @@ struct NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, Slip
};
using NavierStokesMomentumBoundaryFluxHelper
- [[deprecated("Replace with implementation class `NavierStokesMomentumBoundaryFlux`with template arguments `SlipCondition` and `DiscretizationMethod`. This will be removed after 3.9.")]]
- = NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered, SlipConditions::BJ>;
+ [[deprecated("Replace with implementation class `NavierStokesMomentumBoundaryFlux`with template arguments `DiscretizationMethod` and `SlipVelocityHelper`. This will be removed after 3.9.")]]
+ = NavierStokesMomentumBoundaryFlux<DiscretizationMethods::FCStaggered,
+ SlipVelocityHelper<DiscretizationMethods::FCStaggered, SlipConditions::BJ>>;
} // end namespace Dumux
--
GitLab