From 9a374f2708ba056d8572d0c77a8e9907b2cbf43a Mon Sep 17 00:00:00 2001
From: Sina Ackermann <sina.ackermann@iws.uni-stuttgart.de>
Date: Mon, 28 Mar 2022 09:33:52 +0000
Subject: [PATCH] Examples for Dumux 3.5
---
examples/1ptracer/doc/tracer.md | 11 -----------
examples/README.md | 2 +-
examples/freeflowchannel/README.md | 10 ----------
examples/liddrivencavity/doc/problem.md | 10 ----------
examples/porenetwork_upscaling/doc/problem.md | 16 ++++------------
examples/shallowwaterfriction/doc/swe.md | 14 +++++++-------
6 files changed, 12 insertions(+), 51 deletions(-)
diff --git a/examples/1ptracer/doc/tracer.md b/examples/1ptracer/doc/tracer.md
index 48e4c60791..f84f006438 100644
--- a/examples/1ptracer/doc/tracer.md
+++ b/examples/1ptracer/doc/tracer.md
@@ -455,17 +455,6 @@ We define the same porosity for the whole domain as in the 1p spatialparams.
{ return 0.2; }
```
-We do not consider dispersivity for the tracer transport. Thus, we set the
-dispersivity coefficient to zero.
-
-```cpp
- template<class ElementSolution>
- Scalar dispersivity(const Element &element,
- const SubControlVolume& scv,
- const ElementSolution& elemSol) const
- { return 0; }
-```
-
#### Properties of the fluid phase
In the following, we define fluid phase properties that are spatial parameters
in the tracer model.
diff --git a/examples/README.md b/examples/README.md
index 42caf22dae..87887f998f 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -130,7 +130,7 @@ You learn how to
</a></td>
</tr></table>
-### [:open_file_folder: Example 7: Permeability estimation using a pore-network model](porenetwork_upscaling/README.md)
+### [:open_file_folder: Example 8: Permeability estimation using a pore-network model](porenetwork_upscaling/README.md)
<table><tr><td>
diff --git a/examples/freeflowchannel/README.md b/examples/freeflowchannel/README.md
index 8cff6b94eb..00c7fce898 100644
--- a/examples/freeflowchannel/README.md
+++ b/examples/freeflowchannel/README.md
@@ -323,16 +323,6 @@ The following function defines the initial conditions.
}
```
-#### Temperature distribution
-We need to specify a constant temperature for our isothermal problem.
-Fluid properties that depend on temperature will be calculated with this value.
-This would be important if another fluidsystem was used.
-
-```cpp
- Scalar temperature() const
- { return 273.15 + 10; }
-```
-
The inlet is on the left side of the physical domain.
```cpp
diff --git a/examples/liddrivencavity/doc/problem.md b/examples/liddrivencavity/doc/problem.md
index 1ded07fd90..d8f4725da4 100644
--- a/examples/liddrivencavity/doc/problem.md
+++ b/examples/liddrivencavity/doc/problem.md
@@ -209,16 +209,6 @@ public:
}
```
-#### Temperature distribution
-We need to specify a constant temperature for our isothermal problem.
-Fluid properties that depend on temperature will be calculated with this value.
-This would be important if another fluidsystem was used.
-
-```cpp
- Scalar temperature() const
- { return 273.15 + 10; } // 10°C
-```
-
#### Boundary conditions
With the following function we define the __type of boundary conditions__ depending on the location.
Three types of boundary conditions can be specified: Dirichlet or Neumann boundary conditions. On
diff --git a/examples/porenetwork_upscaling/doc/problem.md b/examples/porenetwork_upscaling/doc/problem.md
index 34683607da..1c4289a2de 100644
--- a/examples/porenetwork_upscaling/doc/problem.md
+++ b/examples/porenetwork_upscaling/doc/problem.md
@@ -97,7 +97,7 @@ private:
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
- using type = Dumux::PoreNetwork::UpscalingSpatialParams<GridGeometry, Scalar>;
+ using type = PoreNetwork::UpscalingSpatialParams<GridGeometry, Scalar>;
};
//! The advection type.
@@ -106,9 +106,9 @@ struct AdvectionType<TypeTag, TTag::PNMUpscaling>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using TransmissibilityLaw = Dumux::PoreNetwork::TransmissibilityPatzekSilin<Scalar, true/*considerPoreBodyResistance*/>;
+ using TransmissibilityLaw = PoreNetwork::TransmissibilityPatzekSilin<Scalar, true/*considerPoreBodyResistance*/>;
public:
- using type = Dumux::PoreNetwork::CreepingFlow<Scalar, TransmissibilityLaw>;
+ using type = PoreNetwork::CreepingFlow<Scalar, TransmissibilityLaw>;
};
// We use a single liquid phase consisting of a component with constant fluid properties.
@@ -183,6 +183,7 @@ class UpscalingProblem : public PorousMediumFlowProblem<TypeTag>
```
</details>
+
### The constructor of our problem.
```cpp
@@ -204,15 +205,6 @@ public:
}
```
-#### Temperature
-We need to specify a constant temperature for our isothermal problem.
-Fluid properties that depend on temperature will be calculated with this value.
-
-```cpp
- Scalar temperature() const
- { return 283.15; }
-```
-
#### Boundary conditions
This function is used to define the __type of boundary conditions__ used depending on the location.
Here, we use Dirichlet boundary conditions (fixed pressures) at the inlet and outlet and Neumann
diff --git a/examples/shallowwaterfriction/doc/swe.md b/examples/shallowwaterfriction/doc/swe.md
index a38ee34474..afa83a5b14 100644
--- a/examples/shallowwaterfriction/doc/swe.md
+++ b/examples/shallowwaterfriction/doc/swe.md
@@ -461,10 +461,11 @@ surface has a non constant distribution.
### Include files
-We include the basic spatial parameters file for finite volumes, from which we will inherit.
+We include the basic spatial parameters file for free flow, from which we will inherit.
```cpp
-#include <dumux/material/spatialparams/fv.hh>
+#include <dumux/freeflow/spatialparams.hh>
+
```
We include all friction laws.
@@ -480,21 +481,20 @@ We include all friction laws.
In the `RoughChannelSpatialParams` class, we define all functions needed to describe
the rough channel for the shallow water problem.
-We inherit from the `FVSpatialParams` class, which is the base class
-for spatial parameters in the context of
-applications using finite volume discretization schemes.
+We inherit from the `FreeFlowSpatialParams` class, which is the base class
+for spatial parameters in the context of free-flow applications.
```cpp
namespace Dumux {
template<class GridGeometry, class Scalar, class VolumeVariables>
class RoughChannelSpatialParams
-: public FVSpatialParams<GridGeometry, Scalar,
+: public FreeFlowSpatialParams<GridGeometry, Scalar,
RoughChannelSpatialParams<GridGeometry, Scalar, VolumeVariables>>
{
// This convenience aliases will be used throughout this class
using ThisType = RoughChannelSpatialParams<GridGeometry, Scalar, VolumeVariables>;
- using ParentType = FVSpatialParams<GridGeometry, Scalar, ThisType>;
+ using ParentType = FreeFlowSpatialParams<GridGeometry, Scalar, ThisType>;
using GridView = typename GridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
--
GitLab