diff --git a/dune/vtk/utility/CMakeLists.txt b/dune/vtk/utility/CMakeLists.txt index cdc7dcec341e1e42d86eb8dd921d37cacee0f2a0..048e6f91ecc2a129debba3daa4503fb5c9de6b0b 100644 --- a/dune/vtk/utility/CMakeLists.txt +++ b/dune/vtk/utility/CMakeLists.txt @@ -5,7 +5,6 @@ dune_add_library("filesystem" OBJECT install(FILES enum.hh filesystem.hh - lagrangelfecache.hh lagrangepoints.hh string.hh uid.hh diff --git a/dune/vtk/utility/lagrangelfecache.hh b/dune/vtk/utility/lagrangelfecache.hh deleted file mode 100644 index ac2db6847bc12f3125e66ded9d5c5d44bf6dc13a..0000000000000000000000000000000000000000 --- a/dune/vtk/utility/lagrangelfecache.hh +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include <map> - -#include <dune/geometry/type.hh> -#include <dune/localfunctions/lagrange.hh> -#include <dune/vtk/utility/lagrangepoints.hh> - -namespace Dune -{ - // LocalFiniteElement for the lagrange pointset compatible with VTK - template <class Domain, class Range, int dim, int ORDER=-1> - class LagrangeLFECache - { - public: - using FiniteElementType = LagrangeLocalFiniteElement<VtkLagrangePointSet, dim, Domain, Range>; - - LagrangeLFECache (unsigned int order = ORDER) - : order_(order) - {} - - FiniteElementType const& get (GeometryType type) - { - auto it = data_.find(type); - if (it == data_.end()) - it = data_.emplace(type,FiniteElementType(type,order_)).first; - return it->second; - } - - private: - unsigned int order_; - std::map<GeometryType, FiniteElementType> data_; - }; - -} // end namespace Dune diff --git a/dune/vtk/utility/test/CMakeLists.txt b/dune/vtk/utility/test/CMakeLists.txt index f752b18f5261e4e7da90b1234ebccb5aa0d9ba2b..5a5adfe660d09f64776b6f2b07d1640f1da45d5d 100644 --- a/dune/vtk/utility/test/CMakeLists.txt +++ b/dune/vtk/utility/test/CMakeLists.txt @@ -9,5 +9,3 @@ dune_add_test(NAME test-lagrange2 dune_add_test(NAME test-lagrange3 SOURCES test-lagrange.cc COMPILE_DEFINITIONS "CHECKDIM=3") - -dune_add_test(SOURCES test-lfecache.cc) \ No newline at end of file diff --git a/dune/vtk/utility/test/test-lfecache.cc b/dune/vtk/utility/test/test-lfecache.cc deleted file mode 100644 index 2782090815bc5592514c4064702270c59a3df99e..0000000000000000000000000000000000000000 --- a/dune/vtk/utility/test/test-lfecache.cc +++ /dev/null @@ -1,56 +0,0 @@ -// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -// vi: set et ts=4 sw=2 sts=2: - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <dune/common/hybridutilities.hh> -#include <dune/common/rangeutilities.hh> -#include <dune/common/std/utility.hh> -#include <dune/common/test/testsuite.hh> - -#include <dune/geometry/type.hh> - -#include <dune/vtk/utility/lagrangelfecache.hh> - -template <class FiniteElementCache> -int test (FiniteElementCache& cache, Dune::GeometryType type) -{ - using FiniteElement = typename FiniteElementCache::FiniteElementType; - const FiniteElement& finiteElement = cache.get(type); - - if (!(finiteElement.type() == type)) - DUNE_THROW(Dune::Exception, "Wrong GeometryType in constructed local finite-element"); - - return finiteElement.localBasis().order(); -} - -int main() -{ - using namespace Dune; - const int max_dim = 3; - const unsigned int max_order = 4; - - TestSuite testSuite; - Hybrid::forEach(StaticIntegralRange<int,max_dim+1,1>{},[&](auto dim) - { - // template order parameter - Hybrid::forEach(StaticIntegralRange<int,max_order+1,1>{},[&](auto k) { - using FiniteElementCache = LagrangeLFECache<double, double, dim.value, k.value>; - FiniteElementCache cache{}; - testSuite.check(test(cache, Dune::GeometryTypes::simplex(dim)) == k); - testSuite.check(test(cache, Dune::GeometryTypes::cube(dim)) == k); - }); - - // runtime order parameter - for (unsigned int k = 1; k <= max_order; ++k) { - using FiniteElementCache = LagrangeLFECache<double, double, dim>; - FiniteElementCache cache{k}; - testSuite.check(test(cache, Dune::GeometryTypes::simplex(dim)) == k); - testSuite.check(test(cache, Dune::GeometryTypes::cube(dim)) == k); - } - }); - - return testSuite.exit(); -}