From f8ef47d2ed3b66fce8194ffb5ea7e53a47123736 Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Tue, 4 Apr 2023 09:18:41 +0200
Subject: [PATCH] [ex][ffpm] Make exercise solutions consistent
---
exercises/exercise-coupling-ff-pm/README.md | 6 +-
.../exercise-coupling-ff-pm/interface/main.cc | 3 +-
.../models/porousmediumsubproblem.hh | 3 +-
.../models/properties.hh | 4 +-
.../turbulence/freeflowsubproblem.hh | 45 ++++++-------
.../turbulence/properties.hh | 3 +-
.../1pspatialparams.hh | 3 +-
.../2pspatialparams.hh | 2 +-
.../interface/freeflowsubproblem.hh | 37 +++++-----
.../exercise-coupling-ff-pm/interface/main.cc | 10 ++-
.../interface/params.input | 5 +-
.../interface/porousmediumsubproblem.hh | 17 +++--
.../interface/properties.hh | 60 ++++++++---------
.../models/freeflowsubproblem.hh | 67 ++++++++++---------
.../exercise-coupling-ff-pm/models/main.cc | 5 +-
.../models/params.input | 7 +-
.../models/porousmediumsubproblem.hh | 2 +-
.../models/properties.hh | 58 ++++++++--------
.../turbulence/freeflowsubproblem.hh | 4 +-
.../turbulence/main.cc | 5 +-
.../turbulence/params.input | 2 +-
.../turbulence/porousmediumsubproblem.hh | 12 ++--
.../turbulence/properties.hh | 46 ++++++-------
23 files changed, 207 insertions(+), 199 deletions(-)
diff --git a/exercises/exercise-coupling-ff-pm/README.md b/exercises/exercise-coupling-ff-pm/README.md
index df8ac17e..7a9e88cc 100644
--- a/exercises/exercise-coupling-ff-pm/README.md
+++ b/exercises/exercise-coupling-ff-pm/README.md
@@ -232,9 +232,9 @@ In the first task, the porous-medium model will be changed from a 1p2c system to
Although a 2p2c system is plugged in, we still want to simulate the same situation as before, i.e., air with water vapor in both domains.
The following changes have to be made in the porous-medium model (`models/properties.hh`):
* Include the 2pnc model: include the respective headers and inherit from the new model `TwoPNC`
-* Exchange the spatial parameters for the 1-phase system by those for a 2-phase system (hint: two occurrences).
-* Since two phases are involved now, we do not need to use the `OnePAdapter` anymore. Change to property of the `FluidSystem` such that `H2OAir` is used directly.
- Afterwards, set the `transportCompIdx` to `Indices::switchIdx`.
+* Exchange the spatial parameters for the 1-phase system by those for a 2-phase system.
+* Since two phases are involved now, we do not need to use the `OnePAdapter` anymore. Change the property of the `FluidSystem` such that `H2OAir` is used directly.
+ Afterwards, set the `transportCompIdx` to `Indices::switchIdx` in `porousmediumsubproblem.hh`.
One big difference between the 1p and 2p model is, that the primary variables for which
the problem is solved, are not fixed.
diff --git a/exercises/exercise-coupling-ff-pm/interface/main.cc b/exercises/exercise-coupling-ff-pm/interface/main.cc
index c7cce2fd..b869b4b9 100644
--- a/exercises/exercise-coupling-ff-pm/interface/main.cc
+++ b/exercises/exercise-coupling-ff-pm/interface/main.cc
@@ -86,7 +86,7 @@ int main(int argc, char** argv)
// ******************** uncomment this section for the last exercise ****************** //
-// // use dune-subgrid to create the individual grids
+// // use dune-subgrid to create the individual grids
// static constexpr int dim = 2;
// using HostGrid = Dune::YaspGrid<2, Dune::TensorProductCoordinates<double, dim> >;
// using HostGridManager = Dumux::GridManager<HostGrid>;
@@ -180,7 +180,6 @@ int main(int argc, char** argv)
const auto freeflowName = getParam<std::string>("Problem.Name") + "_" + freeflowProblem->name();
const auto porousMediumName = getParam<std::string>("Problem.Name") + "_" + porousMediumProblem->name();
-
StaggeredVtkOutputModule<FreeflowGridVariables, decltype(freeflowSol)> freeflowVtkWriter(*freeflowGridVariables, freeflowSol, freeflowName);
GetPropType<FreeflowTypeTag, Properties::IOFields>::initOutputModule(freeflowVtkWriter);
diff --git a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index b05d0733..08c97a2f 100644
--- a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -97,7 +97,7 @@ public:
exportFluxes_ = getParamFromGroup<bool>(this->paramGroup(), "Problem.ExportFluxes", false);
if (exportFluxes_)
{
- fluxFileName_ = "flux" + getParam<std::string>("Problem.Name");
+ fluxFileName_ = "flux_" + getParam<std::string>("Problem.Name");
simulationKey_ = getParam<std::string>("Problem.Name", "case1");
initializeFluxOutput();
}
@@ -127,7 +127,6 @@ public:
{
// TODO: dumux-course-task 2.B
// Initialize `initialWaterContent_` and assign that to `lastWaterMass_`.
-
}
void startFluxEvaluation()
diff --git a/exercises/exercise-coupling-ff-pm/models/properties.hh b/exercises/exercise-coupling-ff-pm/models/properties.hh
index d3313c73..8c3faf3b 100644
--- a/exercises/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/models/properties.hh
@@ -56,7 +56,7 @@ namespace Dumux::Properties {
// Create new type tags
namespace TTag {
// TODO: dumux-course-task 2.A
-// Change to property of the `FluidSystem` such that `H2OAir` is used directly.
+// Change the inheritance such that the correct model is used.
struct PorousMediumOnePNC { using InheritsFrom = std::tuple<OnePNC, CCTpfaModel>; };
struct FreeflowNC { using InheritsFrom = std::tuple<NavierStokesNC, StaggeredFreeFlowModel>; };
} // end namespace TTag
@@ -82,6 +82,8 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::FreeflowNC> { using type = Dumux::FreeFlowSubProblem<TypeTag> ; };
// The fluid system
+// TODO: dumux-course-task 2.A
+// Change to property of the `FluidSystem` such that `H2OAir` is used directly.
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::PorousMediumOnePNC>
{
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index d0147907..a55d5505 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -91,20 +91,20 @@ public:
getParamFromGroup<std::string>(this->paramGroup(),
"Problem.InterfaceDiffusionCoefficientAvg"));
-// TODO: // ******************** uncomment this section for the first task 3.A ****************** //
-// FluidSystem::init();
-// Dumux::TurbulenceProperties<Scalar, dimWorld, true> turbulenceProperties;
-// FluidState fluidState;
-// const auto phaseIdx = 0;
-// fluidState.setPressure(phaseIdx, refPressure_);
-// fluidState.setTemperature(this->spatialParams().temperatureAtPos({}));
-// fluidState.setMassFraction(phaseIdx, phaseIdx, 1.0);
-// Scalar density = FluidSystem::density(fluidState, phaseIdx);
-// Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, phaseIdx) / density;
-// Scalar diameter = this->gridGeometry().bBoxMax()[1] - this->gridGeometry().bBoxMin()[1];
-// turbulentKineticEnergy_ = turbulenceProperties.turbulentKineticEnergy(refVelocity_, diameter, kinematicViscosity);
-// dissipation_ = turbulenceProperties.dissipationRate(refVelocity_, diameter, kinematicViscosity);
-// // ************************************************************************************* //
+ // TODO: // ******************** uncomment this section for the first task 3.A ****************** //
+ // FluidSystem::init();
+ // Dumux::TurbulenceProperties<Scalar, dimWorld, true> turbulenceProperties;
+ // FluidState fluidState;
+ // const auto phaseIdx = 0;
+ // fluidState.setPressure(phaseIdx, refPressure_);
+ // fluidState.setTemperature(this->spatialParams().temperatureAtPos({}));
+ // fluidState.setMassFraction(phaseIdx, phaseIdx, 1.0);
+ // Scalar density = FluidSystem::density(fluidState, phaseIdx);
+ // Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, phaseIdx) / density;
+ // Scalar diameter = this->gridGeometry().bBoxMax()[1] - this->gridGeometry().bBoxMin()[1];
+ // turbulentKineticEnergy_ = turbulenceProperties.turbulentKineticEnergy(refVelocity_, diameter, kinematicViscosity);
+ // dissipation_ = turbulenceProperties.dissipationRate(refVelocity_, diameter, kinematicViscosity);
+ // // ************************************************************************************* //
}
/*!
@@ -129,9 +129,9 @@ public:
values.setDirichlet(Indices::energyEqIdx);
}
-// TODO: dumux-course-task 3.A
-// set wall conditions for the turbulence model at the wall (values.setWall()) at the upper and lower boundary
-// set boundary conditions for the turbulence model primary variables everywhere (outflow on right boundary, otherwise dirichlet)
+ // TODO: dumux-course-task 3.A
+ // set wall conditions for the turbulence model at the wall (values.setWall()) at the upper and lower boundary
+ // set boundary conditions for the turbulence model primary variables everywhere (outflow on right boundary, otherwise dirichlet)
if (onLowerBoundary_(globalPos))
{
values.setDirichlet(Indices::velocityXIdx);
@@ -289,15 +289,8 @@ public:
// TODO: dumux-course-task 3.A
// Set initial conditions for the TKE and the Dissipation. Values calculated in the constructor
-// values[Indices::turbulentKineticEnergyIdx] = TODO??;
-// values[Indices::dissipationIdx] = TODO??;
-// // TODO: dumux-course-task 3.B
-// // Remove the condition `onUpperBoundary_(globalPos)` here.
-// if(onUpperBoundary_(globalPos) || onLowerBoundary_(globalPos))
-// {
-// values[Indices::turbulentKineticEnergyIdx] = 0.0;
-// values[Indices::dissipationIdx] = 0.0;
-// }
+ // values[Indices::turbulentKineticEnergyIdx] = TODO??;
+ // values[Indices::dissipationIdx] = TODO??;
// TODO: dumux-course-task 3.B
// Remove the condition `onUpperBoundary_(globalPos)` here.
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
index 14bc29ff..decd6cc8 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -18,13 +18,12 @@
*****************************************************************************/
/*!
* \file
-
* \brief The coupled exercise properties file or the turbulent case.
*/
#ifndef DUMUX_EXERCISE_COUPLED_TURBULENCE_PROPERTIES_HH
#define DUMUX_EXERCISE_COUPLED_TURBULENCE_PROPERTIES_HH
-// Both domain
+// Both domains
#include <dune/grid/yaspgrid.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/1pspatialparams.hh b/exercises/solution/exercise-coupling-ff-pm/1pspatialparams.hh
index b8b230fb..fc7f7093 100644
--- a/exercises/solution/exercise-coupling-ff-pm/1pspatialparams.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/1pspatialparams.hh
@@ -54,7 +54,7 @@ public:
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
porosity_ = getParam<Scalar>("SpatialParams.Porosity");
alphaBJ_ = getParam<Scalar>("SpatialParams.AlphaBeaversJoseph");
- temperature_ = getParam<Scalar>("SpatialParams.PorousMediumTemperature");
+ temperature_ = getParam<Scalar>("SpatialParams.Temperature");
}
/*!
@@ -88,7 +88,6 @@ public:
{ return temperature_; }
-
private:
Scalar permeability_;
Scalar porosity_;
diff --git a/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh b/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh
index 1b6cc619..f1a4938b 100644
--- a/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh
@@ -59,7 +59,7 @@ public:
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
porosity_ = getParam<Scalar>("SpatialParams.Porosity");
alphaBJ_ = getParam<Scalar>("SpatialParams.AlphaBeaversJoseph");
- temperature_ = getParam<Scalar>("SpatialParams.PorousMediumTemperature");
+ temperature_ = getParam<Scalar>("SpatialParams.Temperature");
}
/*!
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index e083d38a..25606fdb 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -20,18 +20,17 @@
* \file
* \brief The free flow sub problem
*/
-#ifndef DUMUX_FREEFLOW_INTERFACE_SUBPROBLEM_HH
-#define DUMUX_FREEFLOW_INTERFACE_SUBPROBLEM_HH
+#ifndef DUMUX_FREEFLOW_SUBPROBLEM_HH
+#define DUMUX_FREEFLOW_SUBPROBLEM_HH
+#include <dumux/freeflow/navierstokes/staggered/problem.hh>
+#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
-#include <dumux/common/timeloop.hh>
#include <dumux/common/numeqvector.hh>
-#include <dumux/freeflow/navierstokes/staggered/problem.hh>
-#include <dumux/freeflow/navierstokes/boundarytypes.hh>
-
namespace Dumux {
+
/*!
* \brief The free flow sub problem
*/
@@ -61,8 +60,11 @@ class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- FreeFlowSubProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Freeflow"), eps_(1e-6), couplingManager_(couplingManager)
+ FreeFlowSubProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(fvGridGeometry, "Freeflow"),
+ eps_(1e-6),
+ couplingManager_(couplingManager)
{
deltaP_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.PressureDifference");
}
@@ -88,6 +90,7 @@ public:
values.setDirichlet(Indices::velocityYIdx);
}
+ // left/right wall
if (onRightBoundary_(globalPos) || (onLeftBoundary_(globalPos)))
{
values.setDirichlet(Indices::velocityXIdx);
@@ -111,6 +114,7 @@ public:
}
#endif
+ // coupling interface
if(couplingManager().isCoupledEntity(CouplingManager::stokesIdx, scvf))
{
values.setCouplingNeumann(Indices::conti0EqIdx);
@@ -180,15 +184,6 @@ public:
return values;
}
-
- //! Set the coupling manager
- void setCouplingManager(std::shared_ptr<CouplingManager> cm)
- { couplingManager_ = cm; }
-
- //! Get the coupling manager
- const CouplingManager& couplingManager() const
- { return *couplingManager_; }
-
/*!
* \brief Return the sources within the domain.
*
@@ -269,6 +264,14 @@ public:
return analyticalVelocityX_;
}
+ //! Set the coupling manager
+ void setCouplingManager(std::shared_ptr<CouplingManager> cm)
+ { couplingManager_ = cm; }
+
+ //! Get the coupling manager
+ const CouplingManager& couplingManager() const
+ { return *couplingManager_; }
+
// \}
private:
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/main.cc b/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
index b4db7eb1..94536d74 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
@@ -28,6 +28,7 @@
#include <dumux/common/initialize.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+
#include <dumux/common/partial.hh>
#include <dumux/linear/istlsolvers.hh>
@@ -61,7 +62,7 @@ int main(int argc, char** argv)
// Define the sub problem type tags
using FreeflowTypeTag = Properties::TTag::FreeflowOneP;
- using PorousMediumTypeTag = Properties::TTag::PorousMediumOneP;
+ using PorousMediumTypeTag = Properties::TTag::PorousMediumFlowOneP;
#if EXNUMBER < 3
// try to create a grid (from the given grid file or the input file)
@@ -167,7 +168,6 @@ int main(int argc, char** argv)
auto porousMediumGridVariables = std::make_shared<PorousMediumGridVariables>(porousMediumProblem, porousMediumFvGridGeometry);
porousMediumGridVariables->init(sol[porousMediumIdx]);
-
// intialize the vtk output module
const auto freeflowName = getParam<std::string>("Problem.Name") + "_" + freeflowProblem->name();
const auto porousMediumName = getParam<std::string>("Problem.Name") + "_" + porousMediumProblem->name();
@@ -181,7 +181,11 @@ int main(int argc, char** argv)
freeflowVtkWriter.write(0.0);
- VtkOutputModule<PorousMediumGridVariables, GetPropType<PorousMediumTypeTag, Properties::SolutionVector>> porousMediumVtkWriter(*porousMediumGridVariables, sol[porousMediumIdx], porousMediumName);
+ using PorousMediumSolutionVector = GetPropType<PorousMediumTypeTag, Properties::SolutionVector>;
+ VtkOutputModule<PorousMediumGridVariables, PorousMediumSolutionVector> porousMediumVtkWriter(*porousMediumGridVariables,
+ sol[porousMediumIdx],
+ porousMediumName);
+
using PorousMediumVelocityOutput = GetPropType<PorousMediumTypeTag, Properties::VelocityOutput>;
porousMediumVtkWriter.addVelocityOutput(std::make_shared<PorousMediumVelocityOutput>(*porousMediumGridVariables));
GetPropType<PorousMediumTypeTag, Properties::IOFields>::initOutputModule(porousMediumVtkWriter);
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/params.input b/exercises/solution/exercise-coupling-ff-pm/interface/params.input
index 2f1dc08b..eab4c116 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/params.input
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/params.input
@@ -26,18 +26,17 @@ Cells1 = 20
Grading1 = 1
[Freeflow.Problem]
-Name = stokes
+Name = freeflow
PressureDifference = 1e-9
EnableInertiaTerms = false
[PorousMedium.Problem]
-Name = darcy
+Name = porousmedium
[SpatialParams]
Permeability = 1e-6 # m^2
Porosity = 0.4
AlphaBeaversJoseph = 1.0
-PorousMediumTemperature = 283.15
Temperature = 283.15
[Problem]
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 85e1978c..e7aa0ba3 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -21,8 +21,8 @@
*
* \brief The porous medium flow sub problem
*/
-#ifndef DUMUX_POROUSMEDIUMFLOW_INTERFACE_SUBPROBLEM_HH
-#define DUMUX_POROUSMEDIUMFLOW_INTERFACE_SUBPROBLEM_HH
+#ifndef DUMUX_POROUSMEDIUMFLOW_SUBPROBLEM_HH
+#define DUMUX_POROUSMEDIUMFLOW_SUBPROBLEM_HH
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
@@ -60,8 +60,10 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
public:
PorousMediumSubProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
- std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "PorousMedium"), eps_(1e-7), couplingManager_(couplingManager)
+ std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(fvGridGeometry, "PorousMedium"),
+ eps_(1e-7),
+ couplingManager_(couplingManager)
{}
/*!
@@ -74,6 +76,8 @@ public:
BoundaryTypes boundaryTypes(const Element &element, const SubControlVolumeFace &scvf) const
{
BoundaryTypes values;
+
+ // set Neumann BCs to all boundaries first
values.setAllNeumann();
#if EXNUMBER == 0 // flow from top to bottom
@@ -97,6 +101,7 @@ public:
*/
PrimaryVariables dirichlet(const Element &element, const SubControlVolumeFace &scvf) const
{
+ // set p = 0 at the bottom
PrimaryVariables values(0.0);
values = initial(element);
@@ -120,8 +125,10 @@ public:
const ElementFluxVariablesCache& elemFluxVarsCache,
const SubControlVolumeFace& scvf) const
{
+ // no-flow everywhere ...
NumEqVector values(0.0);
+ // ... except at the coupling interface
if (couplingManager().isCoupledEntity(CouplingManager::darcyIdx, scvf))
values[Indices::conti0EqIdx] = couplingManager().couplingData().massCouplingCondition(element, fvGeometry, elemVolVars, scvf);
@@ -153,7 +160,7 @@ public:
* variables.
*/
PrimaryVariables initial(const Element &element) const
- { return PrimaryVariables(0.0);}
+ { return PrimaryVariables(0.0); }
//! Set the coupling manager
void setCouplingManager(std::shared_ptr<CouplingManager> cm)
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
index f8a8587c..36da2f0d 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
@@ -18,13 +18,12 @@
*****************************************************************************/
/*!
* \file
- *
* \brief The coupled exercise properties file or the interface case.
*/
#ifndef DUMUX_EXERCISE_COUPLED_INTERFACE_PROPERTIES_HH
#define DUMUX_EXERCISE_COUPLED_INTERFACE_PROPERTIES_HH
-// Both domains
+// Both Domains
#include <dune/grid/yaspgrid.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
@@ -32,8 +31,15 @@
#if EXNUMBER >= 3
#include <dumux/io/grid/gridmanager_sub.hh>
#endif
-#include <dumux/material/components/simpleh2o.hh>
+
#include <dumux/material/fluidsystems/1pliquid.hh>
+#include <dumux/material/components/simpleh2o.hh>
+
+// Free-flow domain
+#include <dumux/discretization/staggered/freeflow/properties.hh>
+#include <dumux/freeflow/navierstokes/model.hh>
+
+#include "freeflowsubproblem.hh"
// Porous medium flow domain
#include <dumux/discretization/cctpfa.hh>
@@ -42,29 +48,23 @@
#include "../1pspatialparams.hh"
#include "porousmediumsubproblem.hh"
-// Free-flow domain
-#include <dumux/discretization/staggered/freeflow/properties.hh>
-#include <dumux/freeflow/navierstokes/model.hh>
-
-#include "freeflowsubproblem.hh"
-
namespace Dumux::Properties {
// Create new type tags
namespace TTag {
struct FreeflowOneP { using InheritsFrom = std::tuple<NavierStokes, StaggeredFreeFlowModel>; };
-struct PorousMediumOneP { using InheritsFrom = std::tuple<OneP, CCTpfaModel>; };
+struct PorousMediumFlowOneP { using InheritsFrom = std::tuple<OneP, CCTpfaModel>; };
} // end namespace TTag
// Set the coupling manager
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::FreeflowOneP>
{
- using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::PorousMediumOneP>;
+ using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::PorousMediumFlowOneP>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
};
template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::PorousMediumOneP>
+struct CouplingManager<TypeTag, TTag::PorousMediumFlowOneP>
{
using Traits = StaggeredMultiDomainTraits<Properties::TTag::FreeflowOneP, Properties::TTag::FreeflowOneP, TypeTag>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
@@ -72,13 +72,27 @@ struct CouplingManager<TypeTag, TTag::PorousMediumOneP>
// Set the problem property
template<class TypeTag>
-struct Problem<TypeTag, TTag::PorousMediumOneP> { using type = Dumux::PorousMediumSubProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::PorousMediumFlowOneP> { using type = Dumux::PorousMediumSubProblem<TypeTag>; };
template<class TypeTag>
struct Problem<TypeTag, TTag::FreeflowOneP> { using type = Dumux::FreeFlowSubProblem<TypeTag> ; };
+// the fluid system
+template<class TypeTag>
+struct FluidSystem<TypeTag, TTag::PorousMediumFlowOneP>
+{
+ using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+ using type = FluidSystems::OnePLiquid<Scalar, Dumux::Components::SimpleH2O<Scalar> > ;
+};
+template<class TypeTag>
+struct FluidSystem<TypeTag, TTag::FreeflowOneP>
+{
+ using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+ using type = FluidSystems::OnePLiquid<Scalar, Dumux::Components::SimpleH2O<Scalar> > ;
+};
+
// Set the grid type
template<class TypeTag>
-struct Grid<TypeTag, TTag::PorousMediumOneP>
+struct Grid<TypeTag, TTag::PorousMediumFlowOneP>
{
static constexpr auto dim = 2;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -106,22 +120,8 @@ struct Grid<TypeTag, TTag::FreeflowOneP>
#endif
};
-// the fluid system
-template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::PorousMediumOneP>
-{
- using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using type = FluidSystems::OnePLiquid<Scalar, Dumux::Components::SimpleH2O<Scalar> > ;
-};
-template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::FreeflowOneP>
-{
- using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using type = FluidSystems::OnePLiquid<Scalar, Dumux::Components::SimpleH2O<Scalar> > ;
-};
-
template<class TypeTag>
-struct SpatialParams<TypeTag, TTag::PorousMediumOneP> {
+struct SpatialParams<TypeTag, TTag::PorousMediumFlowOneP> {
using type = OnePSpatialParams<GetPropType<TypeTag, GridGeometry>, GetPropType<TypeTag, Scalar>>;
};
@@ -132,6 +132,6 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::FreeflowOneP> { static conste
template<class TypeTag>
struct EnableGridVolumeVariablesCache<TypeTag, TTag::FreeflowOneP> { static constexpr bool value = true; };
-} // end namespace Dumux::Properties
+} //end namespace Dumux::Properties
#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index d8ae90cd..227e276a 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -21,8 +21,8 @@
* \ingroup NavierStokesTests
* \brief A simple Stokes test problem for the staggered grid (Navier-)Stokes model.
*/
-#ifndef DUMUX_FREEFLOW_MODEL_SUBPROBLEM_HH
-#define DUMUX_FREEFLOW_MODEL_SUBPROBLEM_HH
+#ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
+#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
@@ -68,12 +68,12 @@ class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
static constexpr bool useMoles = GetPropType<TypeTag, Properties::ModelTraits>::useMoles();
- static constexpr auto dim = GetPropType<TypeTag, Properties::ModelTraits>::dim();
- static constexpr auto transportCompIdx = 1;
-
public:
- FreeFlowSubProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Freeflow"), eps_(1e-6), couplingManager_(couplingManager)
+ FreeFlowSubProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(fvGridGeometry, "Freeflow"),
+ eps_(1e-6),
+ couplingManager_(couplingManager)
{
velocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
@@ -171,29 +171,29 @@ public:
*
* \param globalPos The global position
*/
- PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const
- {
- PrimaryVariables values(0.0);
-
- // This is only an approximation of the actual hydorostatic pressure gradient.
- // Air is compressible (the density depends on pressure), thus the actual
- // vertical pressure profile is non-linear.
- // This discrepancy can lead to spurious flows at the outlet if the inlet
- // velocity is chosen too small.
- FluidState fluidState;
- updateFluidStateForBC_(fluidState, pressure_);
- const Scalar density = FluidSystem::density(fluidState, 0);
- values[Indices::pressureIdx] = pressure_ - density*this->gravity()[1]*(this->gridGeometry().bBoxMax()[1] - globalPos[1]);
-
-
- // gravity has negative sign
- values[Indices::conti0EqIdx + 1] = moleFraction_;
- values[Indices::velocityXIdx] = 4.0 * velocity_ * (globalPos[1] - this->gridGeometry().bBoxMin()[1])
- * (this->gridGeometry().bBoxMax()[1] - globalPos[1])
- / (height_() * height_());
-
- return values;
- }
+ PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const
+ {
+ PrimaryVariables values(0.0);
+
+ // This is only an approximation of the actual hydorostatic pressure gradient.
+ // Air is compressible (the density depends on pressure), thus the actual
+ // vertical pressure profile is non-linear.
+ // This discrepancy can lead to spurious flows at the outlet if the inlet
+ // velocity is chosen too small.
+ FluidState fluidState;
+ updateFluidStateForBC_(fluidState, pressure_);
+ const Scalar density = FluidSystem::density(fluidState, 0);
+ values[Indices::pressureIdx] = pressure_ - density*this->gravity()[1]*(this->gridGeometry().bBoxMax()[1] - globalPos[1]);
+
+
+ // gravity has negative sign
+ values[Indices::conti0EqIdx + 1] = moleFraction_;
+ values[Indices::velocityXIdx] = 4.0 * velocity_ * (globalPos[1] - this->gridGeometry().bBoxMin()[1])
+ * (this->gridGeometry().bBoxMax()[1] - globalPos[1])
+ / (height_() * height_());
+
+ return values;
+ }
/*!
* \brief Return the sources within the domain.
@@ -203,9 +203,6 @@ public:
NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{ return NumEqVector(0.0); }
- void setTimeLoop(TimeLoopPtr timeLoop)
- { timeLoop_ = timeLoop; }
-
/*!
* \brief Returns the intrinsic permeability of required as input parameter for the Beavers-Joseph-Saffman boundary condition
*/
@@ -230,6 +227,9 @@ public:
const CouplingManager& couplingManager() const
{ return *couplingManager_; }
+ void setTimeLoop(TimeLoopPtr timeLoop)
+ { timeLoop_ = timeLoop; }
+
private:
bool onLeftBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[0] < this->gridGeometry().bBoxMin()[0] + eps_; }
@@ -264,6 +264,7 @@ private:
const Scalar enthalpy = FluidSystem::enthalpy(fluidState, paramCache, 0);
fluidState.setEnthalpy(0, enthalpy);
}
+
// the height of the free-flow domain
const Scalar height_() const
{ return this->gridGeometry().bBoxMax()[1] - this->gridGeometry().bBoxMin()[1]; }
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/main.cc b/exercises/solution/exercise-coupling-ff-pm/models/main.cc
index 6416f2b7..759563c7 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/models/main.cc
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief A test problem for the coupled Stokes/Darcy problem (1p)
+ * \brief A test problem for the coupled Freeflow/PorousMedium problem (1p)
*/
#include <config.h>
@@ -153,7 +153,8 @@ int main(int argc, char** argv)
GetPropType<FreeflowTypeTag, Properties::IOFields>::initOutputModule(freeflowVtkWriter);
freeflowVtkWriter.write(0.0);
- VtkOutputModule<PorousMediumGridVariables, GetPropType<PorousMediumTypeTag, Properties::SolutionVector>> porousMediumVtkWriter(*porousMediumGridVariables, sol[porousMediumIdx], porousMediumName);
+ VtkOutputModule<PorousMediumGridVariables, GetPropType<PorousMediumTypeTag, Properties::SolutionVector>> porousMediumVtkWriter(*porousMediumGridVariables,
+ sol[porousMediumIdx], porousMediumName);
using PorousMediumVelocityOutput = GetPropType<PorousMediumTypeTag, Properties::VelocityOutput>;
porousMediumVtkWriter.addVelocityOutput(std::make_shared<PorousMediumVelocityOutput>(*porousMediumGridVariables));
GetPropType<PorousMediumTypeTag, Properties::IOFields>::initOutputModule(porousMediumVtkWriter);
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/params.input b/exercises/solution/exercise-coupling-ff-pm/models/params.input
index dc2a6131..54e20321 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/params.input
+++ b/exercises/solution/exercise-coupling-ff-pm/models/params.input
@@ -38,7 +38,6 @@ Swr = 0.005
Snr = 0.01
PcLowSw = Swr * 5.0
PcHighSw = 1.0 - Snr * 5.0
-PorousMediumTemperature = 293.15
Temperature = 293.15
[Problem]
@@ -49,7 +48,11 @@ ExportFluxes = true
[Newton]
MaxSteps = 12
-MaxRelativeShift = 1e-5
+MaxRelativeShift = 1e-7
+TargetSteps = 5
[Vtk]
AddVelocity = 1
+
+[Assembly]
+NumericDifference.BaseEpsilon = 1e-8
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 5f1b26ab..458c9db9 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -34,6 +34,7 @@
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
+
/*!
* \brief The porous medium flow sub problem
*/
@@ -56,7 +57,6 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
-
// grid and world dimension
static constexpr int dim = GridView::dimension;
static constexpr int dimworld = GridView::dimensionworld;
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
index ca809580..5416e764 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
@@ -19,19 +19,19 @@
/*!
* \file
*
- * \brief The coupled exercise properties file or the models case.
+ * \brief Properties file for coupled models example.
*/
#ifndef DUMUX_EXERCISE_COUPLED_MODELS_PROPERTIES_HH
#define DUMUX_EXERCISE_COUPLED_MODELS_PROPERTIES_HH
-// Both domains
+// Both Domains
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
-#include <dumux/multidomain/staggeredtraits.hh>
-#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// Porous medium flow domain
#include <dumux/discretization/cctpfa.hh>
@@ -47,7 +47,7 @@
#include "porousmediumsubproblem.hh"
-// Free flow domain
+// Free-flow
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/freeflow/compositional/navierstokesncmodel.hh>
@@ -81,24 +81,12 @@ struct CouplingManager<TypeTag, TTag::PorousMediumOnePNC>
// Set the problem property
template<class TypeTag>
-struct Problem<TypeTag, TTag::FreeflowNC> { using type = Dumux::FreeFlowSubProblem<TypeTag> ; };
-template<class TypeTag>
struct Problem<TypeTag, TTag::PorousMediumOnePNC> { using type = Dumux::PorousMediumSubProblem<TypeTag>; };
-
-// Set the grid type
-template<class TypeTag>
-struct Grid<TypeTag, TTag::FreeflowNC> { using type = Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
template<class TypeTag>
-struct Grid<TypeTag, TTag::PorousMediumOnePNC> { using type = Dune::YaspGrid<2>; };
+struct Problem<TypeTag, TTag::FreeflowNC> { using type = Dumux::FreeFlowSubProblem<TypeTag> ; };
// The fluid system
template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::FreeflowNC>
-{
- using H2OAir = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>;
- using type = FluidSystems::OnePAdapter<H2OAir, H2OAir::gasPhaseIdx>;
-};
-template<class TypeTag>
struct FluidSystem<TypeTag, TTag::PorousMediumOnePNC>
{
using H2OAir = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>;
@@ -108,18 +96,35 @@ struct FluidSystem<TypeTag, TTag::PorousMediumOnePNC>
using type = H2OAir;
#endif
};
+template<class TypeTag>
+struct FluidSystem<TypeTag, TTag::FreeflowNC>
+{
+ using H2OAir = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>;
+ using type = FluidSystems::OnePAdapter<H2OAir, H2OAir::gasPhaseIdx>;
+};
-// Do not replace one equation with a total mass balance
+// Use moles
template<class TypeTag>
-struct ReplaceCompEqIdx<TypeTag, TTag::FreeflowNC> { static constexpr int value = 3; };
+struct UseMoles<TypeTag, TTag::PorousMediumOnePNC> { static constexpr bool value = true; };
+template<class TypeTag>
+struct UseMoles<TypeTag, TTag::FreeflowNC> { static constexpr bool value = true; };
+
+// Do not replace one equation with a total mass balance
template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::PorousMediumOnePNC> { static constexpr int value = 3; };
+template<class TypeTag>
+struct ReplaceCompEqIdx<TypeTag, TTag::FreeflowNC> { static constexpr int value = 3; };
-// Use formulation based on mass fractions
+// Set the grid type
template<class TypeTag>
-struct UseMoles<TypeTag, TTag::FreeflowNC> { static constexpr bool value = true; };
+struct Grid<TypeTag, TTag::PorousMediumOnePNC> { using type = Dune::YaspGrid<2>; };
template<class TypeTag>
-struct UseMoles<TypeTag, TTag::PorousMediumOnePNC> { static constexpr bool value = true; };
+struct Grid<TypeTag, TTag::FreeflowNC> { using type = Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
+
+//! Use a model with constant tortuosity for the effective diffusivity
+template<class TypeTag>
+struct EffectiveDiffusivityModel<TypeTag, TTag::PorousMediumOnePNC>
+{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
#if EXNUMBER >= 1
//! Set the default formulation to pw-Sn: This can be over written in the problem.
@@ -141,11 +146,6 @@ struct SpatialParams<TypeTag, TTag::PorousMediumOnePNC> {
};
#endif
-//! Use a model with constant tortuosity for the effective diffusivity
-template<class TypeTag>
-struct EffectiveDiffusivityModel<TypeTag, TTag::PorousMediumOnePNC>
-{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
-
template<class TypeTag>
struct EnableGridGeometryCache<TypeTag, TTag::FreeflowNC> { static constexpr bool value = true; };
template<class TypeTag>
@@ -153,6 +153,6 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::FreeflowNC> { static constexp
template<class TypeTag>
struct EnableGridVolumeVariablesCache<TypeTag, TTag::FreeflowNC> { static constexpr bool value = true; };
-} //end namespace Dumux::Properties
+} // end namespace Dumux::Properties
#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 51032a71..daf89074 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -41,7 +41,6 @@
#endif
namespace Dumux {
-
/*!
* \brief The free-flow sub problem
*/
@@ -110,7 +109,7 @@ public:
const auto phaseIdx = 0;
fluidState.setPressure(phaseIdx, refPressure_);
fluidState.setTemperature(this->spatialParams().temperatureAtPos({}));
- fluidState.setMassFraction(phaseIdx, phaseIdx, refMoleFrac_);
+ fluidState.setMassFraction(phaseIdx, phaseIdx, 1.0);
Scalar density = FluidSystem::density(fluidState, phaseIdx);
Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, phaseIdx) / density;
Scalar diameter = this->gridGeometry().bBoxMax()[1] - this->gridGeometry().bBoxMin()[1];
@@ -203,7 +202,6 @@ public:
values.setCouplingNeumann(Indices::momentumYBalanceIdx);
values.setBeaversJoseph(Indices::momentumXBalanceIdx);
}
-
return values;
}
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc b/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
index ad0470ad..15009b12 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
// Define the sub problem type tags
using FreeflowTypeTag = Properties::TTag::FreeflowModel;
- using PorousMediumTypeTag = Properties::TTag::PorousMediumModel;
+ using PorousMediumTypeTag = Properties::TTag::PorousMediumFlowModel;
// try to create a grid (from the given grid file or the input file)
// for both sub-domains
@@ -156,7 +156,8 @@ int main(int argc, char** argv)
GetPropType<FreeflowTypeTag, Properties::IOFields>::initOutputModule(freeflowVtkWriter);
freeflowVtkWriter.write(0.0);
- VtkOutputModule<PorousMediumGridVariables, GetPropType<PorousMediumTypeTag, Properties::SolutionVector>> porousMediumVtkWriter(*porousMediumGridVariables, sol[porousMediumIdx], porousMediumName);
+ using PorousMediumSolutionVector = GetPropType<PorousMediumTypeTag, Properties::SolutionVector>;
+ VtkOutputModule<PorousMediumGridVariables, PorousMediumSolutionVector> porousMediumVtkWriter(*porousMediumGridVariables, sol[porousMediumIdx], porousMediumName);
using PorousMediumVelocityOutput = GetPropType<PorousMediumTypeTag, Properties::VelocityOutput>;
porousMediumVtkWriter.addVelocityOutput(std::make_shared<PorousMediumVelocityOutput>(*porousMediumGridVariables));
GetPropType<PorousMediumTypeTag, Properties::IOFields>::initOutputModule(porousMediumVtkWriter);
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/params.input b/exercises/solution/exercise-coupling-ff-pm/turbulence/params.input
index 0769cc10..a4d7be6e 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/params.input
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/params.input
@@ -46,7 +46,7 @@ Swr = 0.005
Snr = 0.01
PcLowSw = Swr * 5.0
PcHighSw = 1.0 - Snr * 5.0
-PorousMediumTemperature = 298.15 # [K]
+Temperature = 298.15 # [K]
[Problem]
Name = ex_coupling_turbulence_ff-pm
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index f7fd1fd8..bc2bd75a 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -24,15 +24,15 @@
#ifndef DUMUX_POROUSMEDIUMFLOW2P2C_SUBPROBLEM_HH
#define DUMUX_POROUSMEDIUMFLOW2P2C_SUBPROBLEM_HH
-#include <dumux/common/properties.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/common/numeqvector.hh>
-
-#include <dumux/porousmediumflow/problem.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
namespace Dumux {
+
/*!
* \brief The porous medium sub problem
*/
@@ -91,7 +91,6 @@ public:
getParamFromGroup<std::string>(this->paramGroup(), "Problem.InterfaceDiffusionCoefficientAvg"));
}
-
template<class SolutionVector, class GridVariables>
void postTimeStep(const SolutionVector& curSol,
const GridVariables& gridVariables,
@@ -172,7 +171,7 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const ElementFluxVariablesCache& elemFluxVarsCache,
- const SubControlVolumeFace& scvf) const
+ const SubControlVolumeFace& scvf) const
{
NumEqVector values(0.0);
@@ -267,6 +266,7 @@ private:
std::shared_ptr<CouplingManager> couplingManager_;
DiffusionCoefficientAveragingType diffCoeffAvgType_;
};
-} //end namespace Dumux
+
+} //end namespace dUMUX
#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
index 3b6b962a..2b9e6518 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -18,7 +18,6 @@
*****************************************************************************/
/*!
* \file
- *
* \brief The coupled exercise properties file or the turbulent case.
*/
#ifndef DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_HH
@@ -26,18 +25,18 @@
// Both domains
#include <dune/grid/yaspgrid.hh>
-
-#include <dumux/material/fluidsystems/1padapter.hh>
-#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/material/fluidsystems/h2oair.hh>
+#include <dumux/material/fluidsystems/1padapter.hh>
+
// Porous medium flow domain
#include <dumux/porousmediumflow/2p2c/model.hh>
#include <dumux/discretization/cctpfa.hh>
-#include "../2pspatialparams.hh"
#include"porousmediumsubproblem.hh"
+#include "../2pspatialparams.hh"
// Free-flow domain
#include <dumux/discretization/staggered/freeflow/properties.hh>
@@ -54,7 +53,7 @@ namespace Dumux::Properties {
// Create new type tags
namespace TTag {
-struct PorousMediumModel { using InheritsFrom = std::tuple<TwoPTwoCNI, CCTpfaModel>; };
+struct PorousMediumFlowModel { using InheritsFrom = std::tuple<TwoPTwoCNI, CCTpfaModel>; };
#if EXNUMBER >= 1
struct FreeflowModel { using InheritsFrom = std::tuple<SSTNCNI, StaggeredFreeFlowModel>; };
#else
@@ -66,11 +65,11 @@ struct FreeflowModel { using InheritsFrom = std::tuple<NavierStokesNCNI, Stagger
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::FreeflowModel>
{
- using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::PorousMediumModel>;
+ using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::PorousMediumFlowModel>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
};
template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::PorousMediumModel>
+struct CouplingManager<TypeTag, TTag::PorousMediumFlowModel>
{
using Traits = StaggeredMultiDomainTraits<Properties::TTag::FreeflowModel, Properties::TTag::FreeflowModel, TypeTag>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
@@ -78,17 +77,19 @@ struct CouplingManager<TypeTag, TTag::PorousMediumModel>
// Set the problem property
template<class TypeTag>
-struct Problem<TypeTag, TTag::FreeflowModel> { using type = Dumux::FreeFlowSubProblem<TypeTag> ; };
+struct Problem<TypeTag, TTag::PorousMediumFlowModel> { using type = Dumux::PorousMediumSubProblem<TypeTag>; };
template<class TypeTag>
-struct Problem<TypeTag, TTag::PorousMediumModel> { using type = Dumux::PorousMediumSubProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::FreeflowModel> { using type = Dumux::FreeFlowSubProblem<TypeTag> ; };
// Set the grid type
template<class TypeTag>
-struct Grid<TypeTag, TTag::FreeflowModel> { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
+struct Grid<TypeTag, TTag::PorousMediumFlowModel> { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
template<class TypeTag>
-struct Grid<TypeTag, TTag::PorousMediumModel> { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
+struct Grid<TypeTag, TTag::FreeflowModel> { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
-// The fluid system
+// the fluid system
+template<class TypeTag>
+struct FluidSystem<TypeTag, TTag::PorousMediumFlowModel> { using type = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>; };
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::FreeflowModel>
{
@@ -96,28 +97,27 @@ struct FluidSystem<TypeTag, TTag::FreeflowModel>
static constexpr auto phaseIdx = H2OAir::gasPhaseIdx; // simulate the air phase
using type = FluidSystems::OnePAdapter<H2OAir, phaseIdx>;
};
+
+// Use formulation based on mole fractions
+template<class TypeTag>
+struct UseMoles<TypeTag, TTag::PorousMediumFlowModel> { static constexpr bool value = true; };
template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::PorousMediumModel> { using type = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>; };
+struct UseMoles<TypeTag, TTag::FreeflowModel> { static constexpr bool value = true; };
// The gas component balance (air) is replaced by the total mass balance
template<class TypeTag>
-struct ReplaceCompEqIdx<TypeTag, TTag::PorousMediumModel> { static constexpr int value = 3; };
+struct ReplaceCompEqIdx<TypeTag, TTag::PorousMediumFlowModel> { static constexpr int value = 3; };
template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::FreeflowModel> { static constexpr int value = 3; };
-// Use formulation based on mass fractions
-template<class TypeTag>
-struct UseMoles<TypeTag, TTag::FreeflowModel> { static constexpr bool value = true; };
-template<class TypeTag>
-struct UseMoles<TypeTag, TTag::PorousMediumModel> { static constexpr bool value = true; };
//! Set the default formulation to pw-Sn: This can be over written in the problem.
template<class TypeTag>
-struct Formulation<TypeTag, TTag::PorousMediumModel>
+struct Formulation<TypeTag, TTag::PorousMediumFlowModel>
{ static constexpr auto value = TwoPFormulation::p1s0; };
template<class TypeTag>
-struct SpatialParams<TypeTag, TTag::PorousMediumModel>
+struct SpatialParams<TypeTag, TTag::PorousMediumFlowModel>
{ using type = TwoPSpatialParams<GetPropType<TypeTag, GridGeometry>, GetPropType<TypeTag, Scalar>>; };
template<class TypeTag>
@@ -127,6 +127,6 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::FreeflowModel> { static const
template<class TypeTag>
struct EnableGridVolumeVariablesCache<TypeTag, TTag::FreeflowModel> { static constexpr bool value = true; };
-} //end namespace Dumux::Properties
+} // end namespace Dumux::Properties
#endif
--
GitLab