From 3bf7c41a9b061ab611cf6368c9251dc35592a298 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 27 Jun 2016 18:32:38 -0500 Subject: [PATCH] Systematize instantiations for MappingQEulerian and MappingQ1Eulerian. --- source/fe/mapping_q1_eulerian.cc | 6 +++++- source/fe/mapping_q1_eulerian.inst.in | 28 +++++---------------------- source/fe/mapping_q_eulerian.cc | 6 +++++- source/fe/mapping_q_eulerian.inst.in | 26 +++---------------------- 4 files changed, 18 insertions(+), 48 deletions(-) diff --git a/source/fe/mapping_q1_eulerian.cc b/source/fe/mapping_q1_eulerian.cc index 0b132b8baf..a17a9ba87f 100644 --- a/source/fe/mapping_q1_eulerian.cc +++ b/source/fe/mapping_q1_eulerian.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2001 - 2015 by the deal.II authors +// Copyright (C) 2001 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -16,7 +16,11 @@ #include #include #include +#include +#include +#include #include +#include #include #include #include diff --git a/source/fe/mapping_q1_eulerian.inst.in b/source/fe/mapping_q1_eulerian.inst.in index b8b860f5b2..f07fa43b80 100644 --- a/source/fe/mapping_q1_eulerian.inst.in +++ b/source/fe/mapping_q1_eulerian.inst.in @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 1998 - 2015 by the deal.II authors +// Copyright (C) 1998 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -14,29 +14,11 @@ // --------------------------------------------------------------------- - -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_SERIAL_VECTORS) { #if deal_II_dimension <= deal_II_space_dimension - template class MappingQ1Eulerian, deal_II_space_dimension>; - template class MappingQ1Eulerian, deal_II_space_dimension>; -# ifdef DEAL_II_WITH_PETSC -# ifndef PETSC_USE_COMPLEX - template class MappingQ1Eulerian; - template class MappingQ1Eulerian; -# endif -# endif -# ifdef DEAL_II_WITH_TRILINOS - template class MappingQ1Eulerian; - template class MappingQ1Eulerian; - template class MappingQ1Eulerian; - template class MappingQ1Eulerian; -# endif + template class MappingQ1Eulerian; #endif } + + diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc index 672328a5b3..d3500e72a8 100644 --- a/source/fe/mapping_q_eulerian.cc +++ b/source/fe/mapping_q_eulerian.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2001 - 2015 by the deal.II authors +// Copyright (C) 2001 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -16,7 +16,11 @@ #include #include #include +#include +#include +#include #include +#include #include #include #include diff --git a/source/fe/mapping_q_eulerian.inst.in b/source/fe/mapping_q_eulerian.inst.in index cd10db6e2e..9b52c89095 100644 --- a/source/fe/mapping_q_eulerian.inst.in +++ b/source/fe/mapping_q_eulerian.inst.in @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 1998 - 2015 by the deal.II authors +// Copyright (C) 1998 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -14,30 +14,10 @@ // --------------------------------------------------------------------- -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_SERIAL_VECTORS) { #if deal_II_dimension <= deal_II_space_dimension - template class MappingQEulerian, deal_II_space_dimension>; - template class MappingQEulerian, deal_II_space_dimension>; -# ifdef DEAL_II_WITH_PETSC -# ifndef PETSC_USE_COMPLEX - template class MappingQEulerian; - template class MappingQEulerian; -# endif -# endif -# ifdef DEAL_II_WITH_TRILINOS - template class MappingQEulerian; - template class MappingQEulerian; - template class MappingQEulerian; - template class MappingQEulerian; -# endif - + template class MappingQEulerian; #endif } -- 2.39.5