[dune-pdelab] Patches
Steffen Müthing
steffen.muething at iwr.uni-heidelberg.de
Fri Apr 17 10:20:29 CEST 2015
Hi Christian,
> Am 16.04.2015 um 17:53 schrieb Christian Engwer <christian.engwer at uni-muenster.de>:
>
> Hi Oli,
>
> thanks for the patches.
>
> A) the first patch seems OK, I'll merge it later
>
> B) the inside()/outside() cleanup: I'm again not going to apply until
> we have a solution for alugrid, as our examples codes don't work
> anymore. Besides I have these patches (and some more) already on my
> harddisk, these are just waiting for a workaround in dune-grid. There
> are a bunch of other deprecations as well.
do you really want to stay compatible with ALUGrid 1.52 for the next PDELab
release? I think we should just tell people to install the new dune-alugrid module
and be done with it…
>
> C) the stored entitypointer. I'm unsure what we want to do, as it
> requires auto.
>
> A question to the other pdelab people, especially Steffen... what
> exactly was our minimal requirement for the C++ compiler? Can we
> assume auto for the 2.4-compatible release?
Yes, that’s even true for the core modules, as regular auto is available in
GCC 4.4. In PDELab, we can do whatever we want, because we decided to
require 4.7 for the next release.
Oh, by the way: I would suggest calling the next PDELab release 2.4. It looks
like we are moving to a release schedule that is in sync with the core modules,
and by having the same release numbers it becomes a lot easier for people to
pick the correct version of PDELab.
Steffen
>
> Ciao
> Christian
>
>
> On Thu, Apr 16, 2015 at 03:09:07PM +0200, Oliver Sander wrote:
>> Dear pdelab-team,
>> the attached patches fix more deprecation warnings.
>> Thanks for considering.
>> --
>> Oliver
>
>> From 5328fb7cbf905af608c520ea4d9b32bb36d3aa36 Mon Sep 17 00:00:00 2001
>> From: Oliver Sander <sander at igpm.rwth-aachen.de>
>> Date: Thu, 16 Apr 2015 15:07:29 +0200
>> Subject: [PATCH 1/2] Use new header monomial.hh instead of deprecated monom.hh
>>
>> ---
>> dune/pdelab/finiteelementmap/monomfem.hh | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/dune/pdelab/finiteelementmap/monomfem.hh b/dune/pdelab/finiteelementmap/monomfem.hh
>> index 2115205..890c88a 100644
>> --- a/dune/pdelab/finiteelementmap/monomfem.hh
>> +++ b/dune/pdelab/finiteelementmap/monomfem.hh
>> @@ -8,7 +8,7 @@
>>
>> #include <dune/geometry/type.hh>
>>
>> -#include<dune/localfunctions/monom.hh>
>> +#include<dune/localfunctions/monomial.hh>
>>
>> #include"finiteelementmap.hh"
>> #include <dune/pdelab/finiteelementmap/global.hh>
>> @@ -20,12 +20,12 @@ namespace Dune {
>> //! \ingroup FiniteElementMap
>> template<class D, class R, int d, int p>
>> class MonomLocalFiniteElementMap
>> - : public SimpleLocalFiniteElementMap< Dune::MonomLocalFiniteElement<D,R,d,p> >
>> + : public SimpleLocalFiniteElementMap< Dune::MonomialLocalFiniteElement<D,R,d,p> >
>> {
>> public:
>>
>> MonomLocalFiniteElementMap (const Dune::GeometryType& type)
>> - : SimpleLocalFiniteElementMap< Dune::MonomLocalFiniteElement<D,R,d,p> >(Dune::MonomLocalFiniteElement<D,R,d,p>(type)), _gt(type)
>> + : SimpleLocalFiniteElementMap< Dune::MonomialLocalFiniteElement<D,R,d,p> >(Dune::MonomialLocalFiniteElement<D,R,d,p>(type)), _gt(type)
>> {
>> }
>>
>> @@ -60,10 +60,10 @@ namespace Dune {
>> template<class Geometry, class RF, std::size_t p>
>> class MonomFiniteElementMap
>> : public GeometryFiniteElementMap<
>> - MonomFiniteElementFactory<Geometry, RF, p>
>> + MonomialFiniteElementFactory<Geometry, RF, p>
>>>
>> {
>> - typedef MonomFiniteElementFactory<Geometry, RF, p> FEFactory;
>> + typedef MonomialFiniteElementFactory<Geometry, RF, p> FEFactory;
>> typedef GeometryFiniteElementMap<FEFactory> Base;
>>
>> static FEFactory feFactory;
>> --
>> 2.1.4
>>
>
>> From f8dc0cf7f3d7d1dc0212b93db2ea0c1946f19d05 Mon Sep 17 00:00:00 2001
>> From: Oliver Sander <sander at igpm.rwth-aachen.de>
>> Date: Thu, 16 Apr 2015 15:08:12 +0200
>> Subject: [PATCH 2/2] Remove various warnings related to the upcoming removal
>> of EntityPointer
>>
>> ---
>> dune/pdelab/localoperator/stokesdg.hh | 8 ++++----
>> dune/pdelab/localoperator/stokesparameter.hh | 8 ++++----
>> 2 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/dune/pdelab/localoperator/stokesdg.hh b/dune/pdelab/localoperator/stokesdg.hh
>> index 2ba141d..0ef34f7 100644
>> --- a/dune/pdelab/localoperator/stokesdg.hh
>> +++ b/dune/pdelab/localoperator/stokesdg.hh
>> @@ -240,7 +240,7 @@ namespace Dune {
>>
>> std::vector<Dune::FieldMatrix<RF,1,dim> > grad_phi_v(vsize);
>> BasisSwitch_V::gradient(FESwitch_V::basis(lfsv_v.finiteElement()),
>> - ig.inside()->geometry(), local, grad_phi_v);
>> + ig.inside().geometry(), local, grad_phi_v);
>>
>> const Dune::FieldVector<DF,dim> normal = ig.unitOuterNormal(it->position());
>> const RF weight = it->weight()*ig.geometry().integrationElement(it->position());
>> @@ -508,11 +508,11 @@ namespace Dune {
>> // compute gradients
>> std::vector<Dune::FieldMatrix<RF,1,dim> > grad_phi_v_s(vsize_s);
>> BasisSwitch_V::gradient(FESwitch_V::basis(lfsv_s_v.finiteElement()),
>> - ig.inside()->geometry(), local_s, grad_phi_v_s);
>> + ig.inside().geometry(), local_s, grad_phi_v_s);
>>
>> std::vector<Dune::FieldMatrix<RF,1,dim> > grad_phi_v_n(vsize_n);
>> BasisSwitch_V::gradient(FESwitch_V::basis(lfsv_n_v.finiteElement()),
>> - ig.outside()->geometry(), local_n, grad_phi_v_n);
>> + ig.outside().geometry(), local_n, grad_phi_v_n);
>>
>> const Dune::FieldVector<DF,dimw> normal = ig.unitOuterNormal(it->position());
>> const RF weight = it->weight()*ig.geometry().integrationElement(it->position());
>> @@ -792,7 +792,7 @@ namespace Dune {
>>
>> std::vector<Dune::FieldMatrix<RF,1,dim> > grad_phi_v(vsize);
>> BasisSwitch_V::gradient(FESwitch_V::basis(lfsv_v.finiteElement()),
>> - ig.inside()->geometry(), local, grad_phi_v);
>> + ig.inside().geometry(), local, grad_phi_v);
>>
>> const Dune::FieldVector<DF,dimw> normal = ig.unitOuterNormal(it->position());
>> const RF weight = it->weight()*ig.geometry().integrationElement(it->position());
>> diff --git a/dune/pdelab/localoperator/stokesparameter.hh b/dune/pdelab/localoperator/stokesparameter.hh
>> index 3b004a7..9407b53 100644
>> --- a/dune/pdelab/localoperator/stokesparameter.hh
>> +++ b/dune/pdelab/localoperator/stokesparameter.hh
>> @@ -246,9 +246,9 @@ namespace Dune {
>> typename Traits::VelocityRange
>> g(const IG& ig, const typename Traits::IntersectionDomain& x) const
>> {
>> - typename IG::EntityPointer ep = ig.inside();
>> + auto ep = ig.inside();
>> typename V::Traits::RangeType y;
>> - _v.evaluate(*ep,ig.geometryInInside().global(x),y);
>> + _v.evaluate(ep,ig.geometryInInside().global(x),y);
>> return y;
>> }
>>
>> @@ -284,8 +284,8 @@ namespace Dune {
>> typename Traits::Domain normal) const
>> {
>> typename J::Traits::RangeType r;
>> - typename IG::EntityPointer ep = ig.inside();
>> - _j.evaluate(*ep,ig.geometryInInside().global(x),r);
>> + auto ep = ig.inside();
>> + _j.evaluate(ep,ig.geometryInInside().global(x),r);
>> normal *= r;
>> return normal;
>> }
>> --
>> 2.1.4
>>
>
>
>
>
>> _______________________________________________
>> dune-pdelab mailing list
>> dune-pdelab at dune-project.org
>> http://lists.dune-project.org/mailman/listinfo/dune-pdelab
>
>
> --
> Prof. Dr. Christian Engwer
> Institut für Numerische und Angewandte Mathematik
> Fachbereich Mathematik und Informatik der Universität Münster
> Einsteinstrasse 62
> 48149 Münster
>
> E-Mail christian.engwer at uni-muenster.de
> Telefon +49 251 83-35067
> FAX +49 251 83-32729
>
> _______________________________________________
> dune-pdelab mailing list
> dune-pdelab at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-pdelab
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <https://lists.dune-project.org/pipermail/dune-pdelab/attachments/20150417/df3f7179/attachment.sig>
More information about the dune-pdelab
mailing list