From 5eb0fdafd9c70aaa91a2315c9e09601ca1cf0493 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 7 Apr 2014 16:14:45 +0000 Subject: [PATCH] Change the signature of approximate_derivative_tensor in hopes of convincing MS Visual C++ that everything with it is alright... git-svn-id: https://svn.dealii.org/trunk@32724 0785d39b-7218-0410-832d-ea1e28bc413d --- .../numerics/derivative_approximation.h | 18 ++++++------ .../numerics/derivative_approximation.cc | 28 +++++++++---------- .../numerics/derivative_approximation.inst.in | 12 ++++---- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/deal.II/include/deal.II/numerics/derivative_approximation.h b/deal.II/include/deal.II/numerics/derivative_approximation.h index 660365f7b1..7b43be8151 100644 --- a/deal.II/include/deal.II/numerics/derivative_approximation.h +++ b/deal.II/include/deal.II/numerics/derivative_approximation.h @@ -270,24 +270,24 @@ namespace DerivativeApproximation * In a parallel computation the @p solution vector needs to contain the * locally relevant unknowns. */ - template class DH, class InputVector, int order, int spacedim> + template void - approximate_derivative_tensor (const Mapping &mapping, - const DH &dof, + approximate_derivative_tensor (const Mapping &mapping, + const DH &dof, const InputVector &solution, - const typename DH::active_cell_iterator &cell, - Tensor &derivative, + const typename DH::active_cell_iterator &cell, + Tensor &derivative, const unsigned int component = 0); /** * Same as above, with mapping=MappingQ1@(). */ - template class DH, class InputVector, int order, int spacedim> + template void - approximate_derivative_tensor (const DH &dof, + approximate_derivative_tensor (const DH &dof, const InputVector &solution, - const typename DH::active_cell_iterator &cell, - Tensor &derivative, + const typename DH::active_cell_iterator &cell, + Tensor &derivative, const unsigned int component = 0); /** diff --git a/deal.II/source/numerics/derivative_approximation.cc b/deal.II/source/numerics/derivative_approximation.cc index 4cf3e4bed6..65e9d3a10a 100644 --- a/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/source/numerics/derivative_approximation.cc @@ -1072,16 +1072,16 @@ namespace DerivativeApproximation } - template class DH, class InputVector, int order, int spacedim> + template void - approximate_derivative_tensor (const Mapping &mapping, - const DH &dof, + approximate_derivative_tensor (const Mapping &mapping, + const DH &dof, const InputVector &solution, - const typename DH::active_cell_iterator &cell, - Tensor &derivative, - const unsigned int component) + const typename DH::active_cell_iterator &cell, + Tensor &derivative, + const unsigned int component = 0) { - internal::approximate_cell::DerivDescr,dim,DH,InputVector> + internal::approximate_cell::DerivDescr> (mapping, dof, solution, @@ -1092,17 +1092,17 @@ namespace DerivativeApproximation - template class DH, class InputVector, int order, int spacedim> + template void - approximate_derivative_tensor (const DH &dof, + approximate_derivative_tensor (const DH &dof, const InputVector &solution, - const typename DH::active_cell_iterator &cell, - Tensor &derivative, - const unsigned int component) + const typename DH::active_cell_iterator &cell, + Tensor &derivative, + const unsigned int component = 0) { // just call the respective function with Q1 mapping - approximate_derivative_tensor - (StaticMappingQ1::mapping, + approximate_derivative_tensor + (StaticMappingQ1::mapping, dof, solution, cell, diff --git a/deal.II/source/numerics/derivative_approximation.inst.in b/deal.II/source/numerics/derivative_approximation.inst.in index 430c8a095f..10494f168b 100644 --- a/deal.II/source/numerics/derivative_approximation.inst.in +++ b/deal.II/source/numerics/derivative_approximation.inst.in @@ -55,7 +55,7 @@ approximate_second_derivative template void -approximate_derivative_tensor +approximate_derivative_tensor (const Mapping & mapping, const DH &dof_handler, const VEC &solution, @@ -65,7 +65,7 @@ approximate_derivative_tensor template void -approximate_derivative_tensor +approximate_derivative_tensor (const Mapping & mapping, const DH &dof_handler, const VEC &solution, @@ -75,7 +75,7 @@ approximate_derivative_tensor template void -approximate_derivative_tensor +approximate_derivative_tensor (const Mapping & mapping, const DH &dof_handler, const VEC &solution, @@ -85,7 +85,7 @@ approximate_derivative_tensor template void -approximate_derivative_tensor +approximate_derivative_tensor (const DH &dof_handler, const VEC &solution, const DH::active_cell_iterator &cell, @@ -94,7 +94,7 @@ approximate_derivative_tensor template void -approximate_derivative_tensor +approximate_derivative_tensor (const DH &dof_handler, const VEC &solution, const DH::active_cell_iterator &cell, @@ -103,7 +103,7 @@ approximate_derivative_tensor template void -approximate_derivative_tensor +approximate_derivative_tensor (const DH &dof_handler, const VEC &solution, const DH::active_cell_iterator &cell, -- 2.39.5