From b0a873f9520a066273f1939fd9dd05863d1393e4 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 22 Feb 2018 12:13:03 +0100
Subject: [PATCH] [assembly] Use diffMethod for all DiffMethod template args
---
dumux/assembly/boxlocalassembler.hh | 2 +-
dumux/assembly/cclocalassembler.hh | 2 +-
dumux/assembly/staggeredlocalassembler.hh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh
index 2601c5d90a..bfe426f083 100644
--- a/dumux/assembly/boxlocalassembler.hh
+++ b/dumux/assembly/boxlocalassembler.hh
@@ -200,7 +200,7 @@ public:
* \tparam DM The differentiation method to residual compute derivatives
* \tparam implicit Specifies whether the time discretization is implicit or not not (i.e. explicit)
*/
-template<class TypeTag, class Assembler, DiffMethod DM = DiffMethod::numeric, bool implicit = true>
+template<class TypeTag, class Assembler, DiffMethod diffMethod = DiffMethod::numeric, bool implicit = true>
class BoxLocalAssembler;
/*!
diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index 13dcf1acf7..c2f3e4d623 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -116,7 +116,7 @@ public:
* \tparam DM The differentiation method to residual compute derivatives
* \tparam implicit Specifies whether the time discretization is implicit or not not (i.e. explicit)
*/
-template<class TypeTag, class Assembler, DiffMethod DM = DiffMethod::numeric, bool implicit = true>
+template<class TypeTag, class Assembler, DiffMethod diffMethod = DiffMethod::numeric, bool implicit = true>
class CCLocalAssembler;
/*!
diff --git a/dumux/assembly/staggeredlocalassembler.hh b/dumux/assembly/staggeredlocalassembler.hh
index 896de8a30d..2c5e81864a 100644
--- a/dumux/assembly/staggeredlocalassembler.hh
+++ b/dumux/assembly/staggeredlocalassembler.hh
@@ -53,7 +53,7 @@ namespace Dumux {
* \tparam implicit if to use an implicit or explicit time discretization
*/
template<class TypeTag,
- DiffMethod DM = DiffMethod::numeric,
+ DiffMethod diffMethod = DiffMethod::numeric,
bool implicit = true>
class StaggeredLocalAssembler;
--
GitLab