From 2347c6cfffcfcae42472f6b34940dfde22b90c20 Mon Sep 17 00:00:00 2001
From: Melanie Lipp <melanie.lipp@iws.uni-stuttgart.de>
Date: Mon, 3 May 2021 15:48:26 +0200
Subject: [PATCH] Change input parameter group name from SpatialParameters to
SpatialParams as SpatialParams already exists while SpatialParameters would
be lonely.
---
doc/doxygen/extradoc/parameterlist.txt | 2 +-
dumux/material/spatialparams/porenetwork/porenetwork2p.hh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/doxygen/extradoc/parameterlist.txt b/doc/doxygen/extradoc/parameterlist.txt
index efc8c21e23..f93377a300 100644
--- a/doc/doxygen/extradoc/parameterlist.txt
+++ b/doc/doxygen/extradoc/parameterlist.txt
@@ -347,8 +347,8 @@
* | ShallowWater | UseMixingLengthTurbulenceModel | bool | false | Whether the mixing-length turbulence model is used. |
* | ShallowWater | VerticalCoefficientOfMixingLengthModel | Scalar | 1.0 | For the turbulence model base on the mixing length: The Elder-like vertical turbulence coefficient. |
* | \b SimpleH2O | ReferenceTemperature | Scalar | 293.15 | The reference temperature in \f$\mathrm{[K]}\f$ for calculating the (liquid or gas) enthalpy of simple H2O. |
- * | \b SpatialParameters | ContactAngle | Scalar | 0.0 | This contact angle \f$[rad]\f$ is set both as the contact angle within a pore throat and the one within a pore body. It can be overloaded for solution-dependent values. |
* | \b SpatialParams | ComputeAwsFromAnsAndPcMax | bool | true | Compute volume-specific interfacial area between the wetting and solid phase from interfacial area between nonwetting and solid phase and maximum capillary pressure. |
+ * | SpatialParams | ContactAngle | Scalar | 0.0 | This contact angle \f$[rad]\f$ is set both as the contact angle within a pore throat and the one within a pore body. It can be overloaded for solution-dependent values. |
* | SpatialParams | ForchCoeff | Scalar | 0.55 | The Forchheimer coefficient |
* | SpatialParams | MinBoundaryPermeability | Scalar | - | The minimum permeability |
* | SpatialParams | Permeability | Scalar | - | The permeability |
diff --git a/dumux/material/spatialparams/porenetwork/porenetwork2p.hh b/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
index 7876af25c6..dfa9788623 100644
--- a/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
+++ b/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
@@ -103,7 +103,7 @@ public:
Scalar contactAngle(const Element& element,
const ElementVolumeVariables& elemVolVars) const
{
- static const Scalar theta = getParam<Scalar>("SpatialParameters.ContactAngle", 0.0);
+ static const Scalar theta = getParam<Scalar>("SpatialParams.ContactAngle", 0.0);
return theta;
}
@@ -120,7 +120,7 @@ public:
const SubControlVolume& scv,
const ElementSolutionVector& elemSol) const
{
- static const Scalar theta = getParam<Scalar>("SpatialParameters.ContactAngle", 0.0);
+ static const Scalar theta = getParam<Scalar>("SpatialParams.ContactAngle", 0.0);
return theta;
}
--
GitLab