Commit e3b47865 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'fix/shallowwawter-frcitionlaw-interface-requirements' into 'master'

[test][swe] Actually use new viscous flux in the test

See merge request !2490
parents b525c8c8 f2176595
......@@ -79,12 +79,6 @@ public:
* \f[
* \int_{S_f} \nu_t h \mathbf{\nabla} \mathbf{u} \cdot \mathbf{n_f} dS
* \f]
*
* \todo The implementation now is the simplest one involving
* only direct neighbours. This implementation is not complete/
* correct on non-orthogonal meshes. A more complete implementation
* with a more elaborate stencil that also takes into account
* the non-orthogonal contributions can be considered at a later stage.
*/
template<class Problem, class FVElementGeometry, class ElementVolumeVariables>
static NumEqVector flux(const Problem& problem,
......
......@@ -4,12 +4,15 @@ BedSlope = 0.00005 # [-] slope of the bed in m/m (positive downwards)
Gravity = 9.81 # [m/s^2] gravitational acceleration
Discharge = -4.0875 # [m^2/s] discharge per meter at the inflow boundary
HBoundary = 10.0 # [m] water depth at the ouflow boundary
EnableViscousFlux = true
TurbulentViscosity = 0.1 # [m^2/s] turbulent viscosity
WallFrictionLaw = noslip # Type of wall friction law: "noslip" or "nikuradse"
AlphaWall = 1.0 # [-] wall roughness parameter; alphaWall=0 : full slip, 0<alphaWall<1 : partial slip, alphaWall=1 : no slip
KsWall = 50.0 # [m] wall roughness height (Nikuradse equivalent)
[ShallowWater]
EnableViscousFlux = true
UseMixingLengthTurbulenceModel = false
TurbulentViscosity = 0.1 # [m^2/s] turbulent viscosity
[TimeLoop]
TEnd = 2880.0 # [s]
MaxTimeStepSize = 120.0 # [s]
......
......@@ -121,9 +121,8 @@ public:
bedSlope_ = getParam<Scalar>("Problem.BedSlope");
discharge_ = getParam<Scalar>("Problem.Discharge");
hBoundary_ = getParam<Scalar>("Problem.HBoundary");
enableViscousFlux_ = getParam<bool>("Problem.EnableViscousFlux", false);
turbViscosity_ = getParam<Scalar>("Problem.TurbulentViscosity");
alphaWall_ = getParam<Scalar>("Problem.AlphaWall");
turbViscosity_ = getParam<Scalar>("ShallowWater.TurbulentViscosity");
ksWall_ = getParam<Scalar>("Problem.KsWall");
wallFrictionLawType_ = getParam<std::string>("Problem.WallFrictionLaw");
// Make the wallFrictionLawType_ lower case
......@@ -362,7 +361,6 @@ private:
Scalar discharge_; // discharge at the inflow boundary
Scalar alphaWall_; // wall roughness coefficient for no-slip type wall roughness
Scalar ksWall_; // Nikuradse wall roughness height for Nikuradse type wall roughness
bool enableViscousFlux_; // switch for enabling viscous (turbulent) momentum flux computation
Scalar turbViscosity_; // turbulent viscosity
std::string wallFrictionLawType_; // wall friction law type
......
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