From dcd77a2687913ad5fa024880532ed5326a041f0d Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 6 Sep 2018 11:01:29 +0200
Subject: [PATCH] Use Functions::LagrangeBasis instead of
Functions::PQkNodalBasis
The latter is deprecated as of dune-functions 2.6.
---
dune/gfe/mixedriemanniantrsolver.cc | 10 +++++-----
src/compute-disc-error.cc | 6 +++---
src/cosserat-continuum.cc | 6 +++---
src/gradient-flow.cc | 4 ++--
src/harmonicmaps.cc | 4 ++--
src/mixed-cosserat-continuum.cc | 10 +++++-----
test/adolctest.cc | 4 ++--
test/cosseratenergytest.cc | 8 ++++----
test/interillustration.cc | 4 ++--
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dune/gfe/mixedriemanniantrsolver.cc b/dune/gfe/mixedriemanniantrsolver.cc
index 198a79c5..0921d3af 100644
--- a/dune/gfe/mixedriemanniantrsolver.cc
+++ b/dune/gfe/mixedriemanniantrsolver.cc
@@ -6,7 +6,7 @@
#include <dune/istl/io.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
#include <dune/fufem/assemblers/operatorassembler.hh>
#include <dune/fufem/assemblers/localassemblers/laplaceassembler.hh>
@@ -200,11 +200,11 @@ setup(const GridType& grid,
{
if (numLevels>1) {
typedef typename TruncatedCompressedMGTransfer<CorrectionType0>::TransferOperatorType TransferOperatorType;
- DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> > p1Basis(grid_->leafGridView());
+ DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView,1> > p1Basis(grid_->leafGridView());
TransferOperatorType pkToP1TransferMatrix;
assembleBasisInterpolationMatrix<TransferOperatorType,
- DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> >,
+ DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView,1> >,
FufemBasis0>(pkToP1TransferMatrix,p1Basis,*basis0_);
mmgStep0->mgTransfer_.back() = std::make_shared<TruncatedCompressedMGTransfer<CorrectionType0>>();
@@ -240,11 +240,11 @@ setup(const GridType& grid,
{
if (numLevels>1) {
typedef typename TruncatedCompressedMGTransfer<CorrectionType1>::TransferOperatorType TransferOperatorType;
- DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> > p1Basis(grid_->leafGridView());
+ DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView,1> > p1Basis(grid_->leafGridView());
TransferOperatorType pkToP1TransferMatrix;
assembleBasisInterpolationMatrix<TransferOperatorType,
- DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> >,
+ DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView,1> >,
FufemBasis1>(pkToP1TransferMatrix,p1Basis,*basis1_);
mmgStep1->mgTransfer_.back() = std::make_shared<TruncatedCompressedMGTransfer<CorrectionType1>>();
diff --git a/src/compute-disc-error.cc b/src/compute-disc-error.cc
index 3e18efc2..68a76036 100644
--- a/src/compute-disc-error.cc
+++ b/src/compute-disc-error.cc
@@ -9,7 +9,7 @@
#include <dune/grid/io/file/gmshreader.hh>
#include <dune/grid/utility/structuredgridfactory.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/matrix-vector/genericvectortools.hh>
@@ -40,7 +40,7 @@ void measureDiscreteEOC(const GridView gridView,
// Construct the scalar function space bases corresponding to the GFE space
//////////////////////////////////////////////////////////////////////////////////
- typedef Dune::Functions::PQkNodalBasis<GridView, order> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<GridView, order> FEBasis;
FEBasis feBasis(gridView);
FEBasis referenceFEBasis(referenceGridView);
@@ -264,7 +264,7 @@ void measureAnalyticalEOC(const GridView gridView,
// Construct the scalar function space bases corresponding to the GFE space
//////////////////////////////////////////////////////////////////////////////////
- typedef Dune::Functions::PQkNodalBasis<GridView, order> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<GridView, order> FEBasis;
FEBasis feBasis(gridView);
//////////////////////////////////////////////////////////////////////////////////
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index e6a29062..c9c6bf34 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -25,7 +25,7 @@
#include <dune/foamgrid/foamgrid.hh>
#endif
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/boundarypatch.hh>
#include <dune/fufem/functiontools/boundarydofs.hh>
@@ -193,7 +193,7 @@ int main (int argc, char *argv[]) try
typedef GridType::LeafGridView GridView;
GridView gridView = grid->leafGridView();
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, order> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, order> FEBasis;
FEBasis feBasis(gridView);
typedef DuneFunctionsBasis<FEBasis> FufemFEBasis;
@@ -272,7 +272,7 @@ int main (int argc, char *argv[]) try
SolutionType initialIterate;
GFE::CosseratVTKReader::read(initialIterate, parameterSet.get<std::string>("initialIterateFilename"));
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 2> InitialBasis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 2> InitialBasis;
InitialBasis initialBasis(initialIterateGrid->leafGridView());
#ifdef PROJECTED_INTERPOLATION
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 01ae6d7b..39716267 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -24,7 +24,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/boundarypatch.hh>
#include <dune/fufem/functiontools/basisinterpolator.hh>
@@ -143,7 +143,7 @@ int main (int argc, char *argv[]) try
// Construct the scalar function space basis corresponding to the GFE space
//////////////////////////////////////////////////////////////////////////////////
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, order> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, order> FEBasis;
//typedef Dune::Functions::Periodic1DPQ1NodalBasis<typename GridType::LeafGridView> FEBasis;
FEBasis feBasis(grid->leafGridView());
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 0792f4ff..6964346a 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -28,7 +28,7 @@
#endif
#include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/functions/functionspacebases/bsplinebasis.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
@@ -165,7 +165,7 @@ int main (int argc, char *argv[])
using GridView = GridType::LeafGridView;
GridView gridView = grid->leafGridView();
#ifdef LAGRANGE
- typedef Dune::Functions::PQkNodalBasis<GridView, order> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<GridView, order> FEBasis;
FEBasis feBasis(gridView);
#else
typedef Dune::Functions::BSplineBasis<GridView> FEBasis;
diff --git a/src/mixed-cosserat-continuum.cc b/src/mixed-cosserat-continuum.cc
index 1a7e2e80..aecd926c 100644
--- a/src/mixed-cosserat-continuum.cc
+++ b/src/mixed-cosserat-continuum.cc
@@ -25,7 +25,7 @@
#include <dune/grid/io/file/gmshreader.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/functions/functionspacebases/compositebasis.hh>
#include <dune/fufem/boundarypatch.hh>
@@ -152,13 +152,13 @@ int main (int argc, char *argv[]) try
auto compositeBasis = makeBasis(
gridView,
composite(
- pq<2>(),
- pq<1>()
+ lagrange<2>(),
+ lagrange<1>()
)
);
- typedef Dune::Functions::PQkNodalBasis<GridView,2> DeformationFEBasis;
- typedef Dune::Functions::PQkNodalBasis<GridView,1> OrientationFEBasis;
+ typedef Dune::Functions::LagrangeBasis<GridView,2> DeformationFEBasis;
+ typedef Dune::Functions::LagrangeBasis<GridView,1> OrientationFEBasis;
DeformationFEBasis deformationFEBasis(gridView);
OrientationFEBasis orientationFEBasis(gridView);
diff --git a/test/adolctest.cc b/test/adolctest.cc
index 238e12b2..a97174af 100644
--- a/test/adolctest.cc
+++ b/test/adolctest.cc
@@ -44,7 +44,7 @@ namespace Dune {
#include <dune/istl/io.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
@@ -440,7 +440,7 @@ int main (int argc, char *argv[]) try
typedef GridType::LeafGridView GridView;
GridView gridView = grid.leafGridView();
- typedef Functions::PQkNodalBasis<GridView,2> FEBasis;
+ typedef Functions::LagrangeBasis<GridView,1> FEBasis;
FEBasis feBasis(gridView);
// /////////////////////////////////////////
diff --git a/test/cosseratenergytest.cc b/test/cosseratenergytest.cc
index 6881cb5d..d74cc9a4 100644
--- a/test/cosseratenergytest.cc
+++ b/test/cosseratenergytest.cc
@@ -6,7 +6,7 @@
#include <dune/geometry/type.hh>
#include <dune/geometry/quadraturerules.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/functions/constantfunction.hh>
@@ -119,7 +119,7 @@ void testDerivativeOfRotationMatrix(const std::vector<TargetSpace>& corners)
Dune::FieldMatrix<double, TargetSpace::EmbeddedTangentVector::dimension, domainDim> derivative = f.evaluateDerivative(quadPos);
Tensor3<double,3,3,domainDim> DR;
- typedef Dune::Functions::PQkNodalBasis<typename UGGrid<domainDim>::LeafGridView,1> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<typename UGGrid<domainDim>::LeafGridView,1> FEBasis;
CosseratEnergyLocalStiffness<FEBasis,3>::computeDR(f.evaluate(quadPos),derivative, DR);
// evaluate fd approximation of derivative
@@ -157,7 +157,7 @@ void testEnergy(const GridType* grid, const std::vector<TargetSpace>& coefficien
materialParameters["q"] = "2.5";
materialParameters["kappa"] = "0.1";
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LeafGridView,1> FEBasis;
FEBasis feBasis(grid->leafGridView());
CosseratEnergyLocalStiffness<FEBasis,3> assembler(materialParameters,
@@ -349,7 +349,7 @@ int main(int argc, char** argv)
// Create a local assembler object
////////////////////////////////////////////////////////////////////////////
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> Basis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LeafGridView,1> Basis;
Basis basis(grid->leafGridView());
std::cout << " --- Testing derivative of rotation matrix, domain dimension: " << domainDim << " ---" << std::endl;
diff --git a/test/interillustration.cc b/test/interillustration.cc
index 89a01645..fdddd9e0 100644
--- a/test/interillustration.cc
+++ b/test/interillustration.cc
@@ -7,7 +7,7 @@
#include <dune/localfunctions/lagrange/p1.hh>
#include <dune/localfunctions/lagrange/p2.hh>
-#include <dune/functions/functionspacebases/pq1nodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/functions/gridfunctions/discretescalarglobalbasisfunction.hh>
#include <dune/gfe/unitvector.hh>
@@ -143,7 +143,7 @@ void interpolate(const LocalFEFunctionType& localGeodesicFEFunction,
// stupid, can't instantiate deformedGrid with a const grid
DeformedGridType deformedGrid(const_cast<GridType&>(*grid), deformationFunction);
- typedef Functions::PQ1NodalBasis<typename DeformedGridType::LeafGridView > FEBasis;
+ typedef Functions::LagrangeBasis<typename DeformedGridType::LeafGridView, 1> FEBasis;
FEBasis feBasis(deformedGrid.leafGridView());
Functions::DiscreteScalarGlobalBasisFunction<decltype(feBasis),decltype(variation0)> variation0Function(feBasis,variation0);
--
GitLab