From 1959a01e4081fada76373747bffdafb1836d75d7 Mon Sep 17 00:00:00 2001
From: Martin Utz <martin.utz@baw.de>
Date: Fri, 28 Jun 2019 10:49:42 +0200
Subject: [PATCH] [swe][frictionlaws] Rename FrictionLaw.computeShearStress
to shearStress. Also in problem.hh computeBottomFrictionSource is
renamed to bottomFricitonSource.
---
.../fluidmatrixinteractions/frictionlaws/frictionlaw.hh | 2 +-
.../fluidmatrixinteractions/frictionlaws/manning.hh | 2 +-
.../fluidmatrixinteractions/frictionlaws/nikuradse.hh | 2 +-
test/freeflow/shallowwater/roughchannel/problem.hh | 6 +++---
test/freeflow/shallowwater/roughchannel/spatialparams.hh | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
index 11d9cd3dfe..2323b9e75a 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
@@ -49,7 +49,7 @@ public:
* \return shear stress [N/m^2]. First entry is the x-component, the second the y-component.
*/
- virtual Dune::FieldVector<Scalar, 2> computeShearStress(const VolumeVariables& VolVar) const = 0;
+ virtual Dune::FieldVector<Scalar, 2> shearStress(const VolumeVariables& VolVar) const = 0;
/*!
* \brief Limit the friction for small water depth.
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
index 2da6616a02..6ba2d6036c 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
@@ -60,7 +60,7 @@ public:
*
* \return shear stress [N/m^2]. First entry is the x-component, the second the y-component.
*/
- Dune::FieldVector<Scalar, 2> computeShearStress(const VolumeVariables& volVars) const final
+ Dune::FieldVector<Scalar, 2> shearStress(const VolumeVariables& volVars) const final
{
using std::pow;
using std::hypot;
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
index 859f902a77..4ea83423dc 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
@@ -59,7 +59,7 @@ public:
*
* \return shear stress [N/m^2]. First entry is the x-component, the second the y-component.
*/
- Dune::FieldVector<Scalar, 2> computeShearStress(const VolumeVariables& volVars) const final
+ Dune::FieldVector<Scalar, 2> shearStress(const VolumeVariables& volVars) const final
{
using std::pow;
using std::log;
diff --git a/test/freeflow/shallowwater/roughchannel/problem.hh b/test/freeflow/shallowwater/roughchannel/problem.hh
index 4706f06bbe..343e3abcb7 100644
--- a/test/freeflow/shallowwater/roughchannel/problem.hh
+++ b/test/freeflow/shallowwater/roughchannel/problem.hh
@@ -222,8 +222,8 @@ public:
const auto& volVars = elemVolVars[scv];
NumEqVector source (0.0);
- Dune::FieldVector<Scalar, 2> bottomShearStress = this->spatialParams().frictionLaw(element)->computeShearStress(volVars);
- source += computeBottomFrictionSource(bottomShearStress);
+ Dune::FieldVector<Scalar, 2> bottomShearStress = this->spatialParams().frictionLaw(element)->shearStress(volVars);
+ source += bottomFrictionSource(bottomShearStress);
return source;
}
@@ -235,7 +235,7 @@ public:
*
* \return source
*/
- NumEqVector computeBottomFrictionSource(const Dune::FieldVector<Scalar, 2> bottomShearStress) const
+ NumEqVector bottomFrictionSource(const Dune::FieldVector<Scalar, 2> bottomShearStress) const
{
NumEqVector bottomFrictionSource(0.0);
diff --git a/test/freeflow/shallowwater/roughchannel/spatialparams.hh b/test/freeflow/shallowwater/roughchannel/spatialparams.hh
index 4aeed291a7..da6f5e9be9 100644
--- a/test/freeflow/shallowwater/roughchannel/spatialparams.hh
+++ b/test/freeflow/shallowwater/roughchannel/spatialparams.hh
@@ -84,7 +84,7 @@ public:
}
else
{
- std::cout<<"The FrictionLaw in params.input is unknown. Valid entries are 'Manning' and 'Nikuradse'!";
+ std::cout<<"The FrictionLaw in params.input is unknown. Valid entries are 'Manning' and 'Nikuradse'!"<<std::endl;
}
}
--
GitLab