From 2d18484c1ad62ea3fa773766db0dbba12a132a5e Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Mon, 13 May 2019 15:02:07 +0200
Subject: [PATCH] [couplingdata] Minor changes
---
.../boundary/freeflowsolidenergy/couplingdata.hh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dumux/multidomain/boundary/freeflowsolidenergy/couplingdata.hh b/dumux/multidomain/boundary/freeflowsolidenergy/couplingdata.hh
index 7f0f994..39bec7a 100644
--- a/dumux/multidomain/boundary/freeflowsolidenergy/couplingdata.hh
+++ b/dumux/multidomain/boundary/freeflowsolidenergy/couplingdata.hh
@@ -39,7 +39,7 @@ namespace Dumux {
* \brief This structs holds a set of options which allow to modify the Stokes-Darcy
* coupling mechanism during runtime.
*/
-struct StokesDarcyCouplingOptions
+struct FreeFlowHeatCouplingOptions
{
/*!
* \brief Defines which kind of averanging of diffusion coefficiencients
@@ -55,7 +55,7 @@ struct StokesDarcyCouplingOptions
* \brief Convenience function to convert user input given as std::string to the corresponding enum class used for chosing the type
* of averaging of the diffusion/conduction parameter at the interface between the two domains.
*/
- static DiffusionCoefficientAveragingType stringToEnum(DiffusionCoefficientAveragingType, const std::string& diffusionCoefficientAveragingType)
+ static DiffusionCoefficientAveragingType stringToEnum(const std::string& diffusionCoefficientAveragingType)
{
if (diffusionCoefficientAveragingType == "Harmonic")
return DiffusionCoefficientAveragingType::harmonic;
@@ -63,7 +63,7 @@ struct StokesDarcyCouplingOptions
return DiffusionCoefficientAveragingType::arithmethic;
else if (diffusionCoefficientAveragingType == "FreeFlowOnly")
return DiffusionCoefficientAveragingType::ffOnly;
- else if (diffusionCoefficientAveragingType == "PorousMediumOnly")
+ else if (diffusionCoefficientAveragingType == "SolidOnly")
return DiffusionCoefficientAveragingType::pmOnly;
else
DUNE_THROW(Dune::IOError, "Unknown DiffusionCoefficientAveragingType");
@@ -103,9 +103,10 @@ class FreeFlowSolidEnergyCouplingData
"All submodels must both be either isothermal or non-isothermal");
- using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType;
public:
+ using DiffusionCoefficientAveragingType = typename FreeFlowHeatCouplingOptions::DiffusionCoefficientAveragingType;
+
FreeFlowSolidEnergyCouplingData(const CouplingManager& couplingmanager): couplingManager_(couplingmanager) {}
--
GitLab