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

Merge branch 'fix/shallowwater-roughchannel-test' into 'master'

[test][shallowwater] Fix boundary conditions in rough channel test

Closes #791

See merge request !1811
parents d14e1487 74c101e0
......@@ -81,7 +81,7 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::RoughChannel>
* \ingroup ShallowWaterTests
* \brief A simple flow in a rough channel with friction law after Manning.
*
* The domain is 1000 meters long and 10 meters wide. At the left border a discharge
* The domain is 500 meters long and 5 meters wide. At the left border a discharge
* boundary condition is applied and at the right border a water depth boundary condition.
* All other boundaries are set to no-flow. Normal flow is assumed, therefor the water depth
* at the right border can be calculated with the formular of Gaukler-Manning-Strickler.
......@@ -301,7 +301,7 @@ public:
std::array<Scalar, 3> boundaryStateVariables;
// impose discharge at the left side
if (scvf.center()[0] < 0.0 + eps_)
if (scvf.center()[0] < this->gridGeometry().bBoxMin()[0] + eps_)
{
boundaryStateVariables = ShallowWater::fixedDischargeBoundary(discharge_,
insideVolVars.waterDepth(),
......@@ -311,7 +311,7 @@ public:
nxy);
}
// impose water depth at the right side
else if (scvf.center()[0] > 100.0 - eps_)
else if (scvf.center()[0] > this->gridGeometry().bBoxMax()[0] - eps_)
{
boundaryStateVariables = ShallowWater::fixedWaterDepthBoundary(hBoundary_,
insideVolVars.waterDepth(),
......
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