From: Wolfgang Bangerth Date: Sun, 10 May 2015 14:18:14 +0000 (-0500) Subject: Change code so that it is also correct wherever we use generic scalar types. X-Git-Tag: v8.3.0-rc1~183^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F920%2Fhead;p=dealii.git Change code so that it is also correct wherever we use generic scalar types. --- diff --git a/include/deal.II/meshworker/vector_selector.h b/include/deal.II/meshworker/vector_selector.h index 311e10768e..3fe4390b5e 100644 --- a/include/deal.II/meshworker/vector_selector.h +++ b/include/deal.II/meshworker/vector_selector.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2009 - 2014 by the deal.II authors +// Copyright (C) 2009 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -172,7 +172,7 @@ namespace MeshWorker * @ingroup MeshWorker * @author Guido Kanschat, 2009 */ - template + template class VectorDataBase : public VectorSelector { @@ -200,6 +200,7 @@ namespace MeshWorker * Virtual, but empty destructor. */ virtual ~VectorDataBase(); + /** * The only function added to VectorSelector is an abstract virtual * function implemented in the derived class template and called by @@ -239,9 +240,9 @@ namespace MeshWorker * base element. */ virtual void fill( - std::vector > > &values, - std::vector > > > &gradients, - std::vector > > > &hessians, + std::vector > > &values, + std::vector > > > &gradients, + std::vector > > > &hessians, const FEValuesBase &fe, const std::vector &index, const unsigned int component, @@ -256,9 +257,9 @@ namespace MeshWorker * the active cells. */ virtual void mg_fill( - std::vector > > &values, - std::vector > > > &gradients, - std::vector > > > &hessians, + std::vector > > &values, + std::vector > > > &gradients, + std::vector > > > &hessians, const FEValuesBase &fe, const unsigned int level, const std::vector &index, @@ -286,7 +287,7 @@ namespace MeshWorker */ template class VectorData : - public VectorDataBase + public VectorDataBase { public: /** @@ -359,6 +360,7 @@ namespace MeshWorker * Constructor. */ MGVectorData(); + /** * Constructor using a prefilled VectorSelector */ diff --git a/include/deal.II/meshworker/vector_selector.templates.h b/include/deal.II/meshworker/vector_selector.templates.h index 925012279d..b3fed888c1 100644 --- a/include/deal.II/meshworker/vector_selector.templates.h +++ b/include/deal.II/meshworker/vector_selector.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2009 - 2014 by the deal.II authors +// Copyright (C) 2009 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -22,38 +22,38 @@ DEAL_II_NAMESPACE_OPEN namespace MeshWorker { - template - VectorDataBase::~VectorDataBase() + template + VectorDataBase::~VectorDataBase() {} - template - VectorDataBase::VectorDataBase(const VectorSelector &v) + template + VectorDataBase::VectorDataBase(const VectorSelector &v) : VectorSelector(v) {} - template - VectorDataBase::VectorDataBase() + template + VectorDataBase::VectorDataBase() {} - template + template void - VectorDataBase::initialize(const AnyData &d) + VectorDataBase::initialize(const AnyData &d) { this->data = d; VectorSelector::initialize(d); } - template + template void - VectorDataBase::fill( - std::vector > > &, - std::vector > > > &, - std::vector > > > &, + VectorDataBase::fill( + std::vector > > &, + std::vector > > > &, + std::vector > > > &, const FEValuesBase &, const std::vector &, const unsigned int, @@ -65,12 +65,12 @@ namespace MeshWorker } - template + template void - VectorDataBase::mg_fill( - std::vector > > &, - std::vector > > > &, - std::vector > > > &, + VectorDataBase::mg_fill( + std::vector > > &, + std::vector > > > &, + std::vector > > > &, const FEValuesBase &, const unsigned int, const std::vector &, @@ -93,7 +93,7 @@ namespace MeshWorker template VectorData::VectorData(const VectorSelector &s) : - VectorDataBase(s) + VectorDataBase(s) {}