From c15c61f3624d65f086e4a8c1c77a77d55b7484e6 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Wed, 29 Jan 2020 20:08:23 +0100
Subject: [PATCH] Revert "Fix issues in LatticeModel.tmpl.h" (commit by
mistake)
This reverts commit 46f49143ff50f558ff69c372a942d896304d7b8b.
---
lbmpy_walberla/templates/LatticeModel.tmpl.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lbmpy_walberla/templates/LatticeModel.tmpl.h b/lbmpy_walberla/templates/LatticeModel.tmpl.h
index 744eacc..4224136 100644
--- a/lbmpy_walberla/templates/LatticeModel.tmpl.h
+++ b/lbmpy_walberla/templates/LatticeModel.tmpl.h
@@ -48,14 +48,12 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wconversion"
#endif
#ifdef WALBERLA_CXX_COMPILER_IS_CLANG
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wconversion"
#endif
{% set lmIgnores = ('pdfs', 'pdfs_tmp') %}
@@ -125,7 +123,7 @@ public:
};
{{class_name}}( {{stream_collide_kernel|generate_constructor_parameters(lmIgnores+lmOffsets) }} )
- : {{ stream_collide_kernel|generate_constructor_initializer_list(lmIgnores+lmOffsets) }}{% if stream_collide_kernel|generate_constructor_initializer_list(lmIgnores+lmOffsets)|length %},{% endif %} currentLevel(0)
+ : {{ stream_collide_kernel|generate_constructor_initializer_list(lmIgnores+lmOffsets) }}, currentLevel(0)
{};
void configure( IBlock & block, StructuredBlockStorage & storage ) { configureBlock( &block, &storage ); }
--
GitLab