Commit 90725dd0 authored by Kilian Weishaupt's avatar Kilian Weishaupt Committed by Ned Coltman
Browse files

[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)
parent 80a3e8d4
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment