From 90725dd0fe8cf2b922fd4e3f7096fe8ccaa65d23 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Tue, 29 Jan 2019 13:40:51 +0100
Subject: [PATCH] [nonisothermal] Fix model inheritance for non-isothermal
models
* ni models did not inherit from their non-ni base models,
thus the wrong local residual and fluxvars were used (navierstokes)
---
dumux/freeflow/rans/oneeq/model.hh | 2 +-
dumux/freeflow/rans/twoeq/kepsilon/model.hh | 2 +-
dumux/freeflow/rans/twoeq/komega/model.hh | 2 +-
dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dumux/freeflow/rans/oneeq/model.hh b/dumux/freeflow/rans/oneeq/model.hh
index 4b2844da7d..ef7186e9f6 100644
--- a/dumux/freeflow/rans/oneeq/model.hh
+++ b/dumux/freeflow/rans/oneeq/model.hh
@@ -192,7 +192,7 @@ struct IOFields<TypeTag, TTag::OneEq> { using type = OneEqIOFields; };
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, non-isothermal Spalart-Allmaras model
-struct OneEqNI { using InheritsFrom = std::tuple<RANSNI>; };
+struct OneEqNI { using InheritsFrom = std::tuple<OneEq, RANSNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/model.hh b/dumux/freeflow/rans/twoeq/kepsilon/model.hh
index eaeefee2e0..47cbf211a1 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/model.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/model.hh
@@ -179,7 +179,7 @@ struct IOFields<TypeTag, TTag::KEpsilon> { using type = KEpsilonIOFields; };
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, non-isothermal k-epsilon model
-struct KEpsilonNI { using InheritsFrom = std::tuple<RANSNI>; };
+struct KEpsilonNI { using InheritsFrom = std::tuple<KEpsilon, RANSNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
diff --git a/dumux/freeflow/rans/twoeq/komega/model.hh b/dumux/freeflow/rans/twoeq/komega/model.hh
index 0bb59d8525..dbaba44d15 100644
--- a/dumux/freeflow/rans/twoeq/komega/model.hh
+++ b/dumux/freeflow/rans/twoeq/komega/model.hh
@@ -185,7 +185,7 @@ struct IOFields<TypeTag, TTag::KOmega> { using type = KOmegaIOFields; };
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, non-isothermal k-omega 2-Eq. model
-struct KOmegaNI { using InheritsFrom = std::tuple<RANSNI>; };
+struct KOmegaNI { using InheritsFrom = std::tuple<KOmega, RANSNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
index 945c34664c..97ade27046 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
@@ -192,7 +192,7 @@ struct IOFields<TypeTag, TTag::LowReKEpsilon> { using type = LowReKEpsilonIOFiel
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, non-isothermal low-Reynolds k-epsilon model
-struct LowReKEpsilonNI { using InheritsFrom = std::tuple<RANSNI>; };
+struct LowReKEpsilonNI { using InheritsFrom = std::tuple<LowReKEpsilon, RANSNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
--
GitLab