From 2b580033bf0d8832c595a39987088395bb64cf29 Mon Sep 17 00:00:00 2001
From: Ivan Buntic <st116086@stud.uni-stuttgart.de>
Date: Fri, 17 Sep 2021 14:50:36 +0200
Subject: [PATCH] [discmethod] Use discretiztaion tags in compositional
---
dumux/freeflow/compositional/fluxvariables.hh | 4 ++--
dumux/freeflow/compositional/localresidual.hh | 4 ++--
dumux/freeflow/compositional/staggered/fluxvariables.hh | 4 ++--
dumux/freeflow/compositional/staggered/localresidual.hh | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dumux/freeflow/compositional/fluxvariables.hh b/dumux/freeflow/compositional/fluxvariables.hh
index 7d1fadbbd7..da91e4b381 100644
--- a/dumux/freeflow/compositional/fluxvariables.hh
+++ b/dumux/freeflow/compositional/fluxvariables.hh
@@ -30,7 +30,7 @@
namespace Dumux {
// forward declaration
-template<class TypeTag, DiscretizationMethod discMethod>
+template<class TypeTag, class DiscretizationMethod>
class FreeflowNCFluxVariablesImpl;
/*!
@@ -41,7 +41,7 @@ class FreeflowNCFluxVariablesImpl;
* \note Not all specializations are currently implemented
*/
template<class TypeTag>
-using FreeflowNCFluxVariables = FreeflowNCFluxVariablesImpl<TypeTag, GetPropType<TypeTag, Properties::GridGeometry>::discMethod>;
+using FreeflowNCFluxVariables = FreeflowNCFluxVariablesImpl<TypeTag, typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod>;
} // end namespace
diff --git a/dumux/freeflow/compositional/localresidual.hh b/dumux/freeflow/compositional/localresidual.hh
index 67dcf0b9e1..c8d18e593f 100644
--- a/dumux/freeflow/compositional/localresidual.hh
+++ b/dumux/freeflow/compositional/localresidual.hh
@@ -32,7 +32,7 @@
namespace Dumux {
// forward declaration
-template<class TypeTag, DiscretizationMethod discMethod>
+template<class TypeTag, class DiscretizationMethod>
class FreeflowNCResidualImpl;
/*!
@@ -43,7 +43,7 @@ class FreeflowNCResidualImpl;
* \note Not all specializations are currently implemented
*/
template<class TypeTag>
-using FreeflowNCResidual = FreeflowNCResidualImpl<TypeTag, GetPropType<TypeTag, Properties::GridGeometry>::discMethod>;
+using FreeflowNCResidual = FreeflowNCResidualImpl<TypeTag, typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod>;
}
diff --git a/dumux/freeflow/compositional/staggered/fluxvariables.hh b/dumux/freeflow/compositional/staggered/fluxvariables.hh
index 82e7bb90be..b6c3db8f51 100644
--- a/dumux/freeflow/compositional/staggered/fluxvariables.hh
+++ b/dumux/freeflow/compositional/staggered/fluxvariables.hh
@@ -39,11 +39,11 @@ namespace Dumux {
*/
// forward declaration
-template<class TypeTag, DiscretizationMethod discMethod>
+template<class TypeTag, class DiscretizationMethod>
class FreeflowNCFluxVariablesImpl;
template<class TypeTag>
-class FreeflowNCFluxVariablesImpl<TypeTag, DiscretizationMethod::staggered>
+class FreeflowNCFluxVariablesImpl<TypeTag, DiscretizationMethods::Staggered>
: public NavierStokesFluxVariables<TypeTag>
{
using ParentType = NavierStokesFluxVariables<TypeTag>;
diff --git a/dumux/freeflow/compositional/staggered/localresidual.hh b/dumux/freeflow/compositional/staggered/localresidual.hh
index 72422ed5ad..11036077c9 100644
--- a/dumux/freeflow/compositional/staggered/localresidual.hh
+++ b/dumux/freeflow/compositional/staggered/localresidual.hh
@@ -36,11 +36,11 @@ namespace Dumux {
*/
// forward declaration
-template<class TypeTag, DiscretizationMethod discMethod>
+template<class TypeTag, class DiscretizationMethod>
class FreeflowNCResidualImpl;
template<class TypeTag>
-class FreeflowNCResidualImpl<TypeTag, DiscretizationMethod::staggered>
+class FreeflowNCResidualImpl<TypeTag, DiscretizationMethods::Staggered>
: public NavierStokesResidual<TypeTag>
{
using ParentType = NavierStokesResidual<TypeTag>;
--
GitLab