Commit abba5e60 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

removed variable template and cleanup of gitlab-ci file

parent 6c90ecc0
...@@ -7,10 +7,10 @@ debian:10 clang-6-libcpp-17: ...@@ -7,10 +7,10 @@ debian:10 clang-6-libcpp-17:
image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17 image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17
script: duneci-standard-test script: duneci-standard-test
debian:9 gcc-6-14: #debian:9 gcc-6-14:
image: registry.dune-project.org/docker/ci/dune:2.6-debian-9-gcc-6-14 # image: registry.dune-project.org/docker/ci/dune:2.6-debian-9-gcc-6-14
script: duneci-standard-test # script: duneci-standard-test
ubuntu:18.04 clang-6-17: #ubuntu:18.04 clang-6-17:
image: registry.dune-project.org/docker/ci/dune:2.6-ubuntu-18.04-clang-6-17 # image: registry.dune-project.org/docker/ci/dune:2.6-ubuntu-18.04-clang-6-17
script: duneci-standard-test # script: duneci-standard-test
...@@ -7,5 +7,5 @@ Module: dune-vtk ...@@ -7,5 +7,5 @@ Module: dune-vtk
Version: 0.1 Version: 0.1
Maintainer: simon.praetorius@tu-dresden.de Maintainer: simon.praetorius@tu-dresden.de
#depending on #depending on
Depends: dune-grid Depends: dune-grid (>= 2.6)
Suggests: dune-functions dune-spgrid dune-polygongrid Suggests: dune-functions (>= 2.6) dune-spgrid dune-polygongrid
\ No newline at end of file \ No newline at end of file
...@@ -32,7 +32,7 @@ namespace Dune ...@@ -32,7 +32,7 @@ namespace Dune
} }
template <class T> template <class T>
constexpr int Size = Impl::SizeImpl<std::decay_t<T>>::value; constexpr int sizeOf () { return Impl::SizeImpl<std::decay_t<T>>::value; }
template <class GridView> template <class GridView>
...@@ -66,8 +66,8 @@ namespace Dune ...@@ -66,8 +66,8 @@ namespace Dune
{ {
using R = Range<decltype(localFunction(std::forward<F>(fct)))>; using R = Range<decltype(localFunction(std::forward<F>(fct)))>;
ncomps_ = ncomps ? *ncomps : Size<R>; ncomps_ = ncomps ? *ncomps : sizeOf<R>();
type_ = type ? *type : Vtk::Map::type<R>; type_ = type ? *type : Vtk::Map::type<R>();
} }
VtkFunction () = default; VtkFunction () = default;
......
...@@ -80,7 +80,7 @@ namespace Dune ...@@ -80,7 +80,7 @@ namespace Dune
static constexpr DataTypes typeImpl (Type<long double>) { return FLOAT64; } static constexpr DataTypes typeImpl (Type<long double>) { return FLOAT64; }
template <class T> template <class T>
static constexpr DataTypes type = typeImpl(Type<typename FieldTraits<T>::field_type>{}); static constexpr DataTypes type () { return typeImpl(Type<typename FieldTraits<T>::field_type>{}); }
}; };
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <dune/common/parallel/mpihelper.hh> // An initializer of MPI #include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
#include <dune/common/filledarray.hh> #include <dune/common/filledarray.hh>
#include <dune/common/timer.hh> #include <dune/common/timer.hh>
#include <dune/common/test/testsuite.hh>
#include <dune/grid/uggrid.hh> #include <dune/grid/uggrid.hh>
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
...@@ -76,12 +75,10 @@ int main (int argc, char** argv) ...@@ -76,12 +75,10 @@ int main (int argc, char** argv)
{ {
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
TestSuite test{};
#ifdef HAVE_UG #ifdef HAVE_UG
// Test VtkWriter for UGGrid // Test VtkWriter for UGGrid
std::cout << "UGGrid\n"; std::cout << "UGGrid\n";
Hybrid::forEach(std::make_tuple(int_<2>{}, int_<3>{}), [&test](auto dim) Hybrid::forEach(std::make_tuple(int_<2>{}, int_<3>{}), [](auto dim)
{ {
using GridType = UGGrid<dim.value>; using GridType = UGGrid<dim.value>;
FieldVector<double,dim.value> lowerLeft; lowerLeft = 0.0; FieldVector<double,dim.value> lowerLeft; lowerLeft = 0.0;
...@@ -109,5 +106,4 @@ int main (int argc, char** argv) ...@@ -109,5 +106,4 @@ int main (int argc, char** argv)
writer_new(grid.leafGridView()); writer_new(grid.leafGridView());
}); });
return test.exit();
} }
...@@ -11,13 +11,8 @@ ...@@ -11,13 +11,8 @@
#include <dune/common/parallel/mpihelper.hh> // An initializer of MPI #include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
#include <dune/common/exceptions.hh> // We use exceptions #include <dune/common/exceptions.hh> // We use exceptions
#include <dune/common/filledarray.hh> #include <dune/common/filledarray.hh>
#include <dune/functions/functionspacebases/defaultglobalbasis.hh>
#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/functions/gridfunctions/analyticgridviewfunction.hh> #include <dune/functions/gridfunctions/analyticgridviewfunction.hh>
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
#include <dune/vtk/pvdwriter.hh> #include <dune/vtk/pvdwriter.hh>
#include <dune/vtk/writers/vtkunstructuredgridwriter.hh> #include <dune/vtk/writers/vtkunstructuredgridwriter.hh>
...@@ -27,9 +22,6 @@ using namespace Dune::Functions; ...@@ -27,9 +22,6 @@ using namespace Dune::Functions;
template <class GridView> template <class GridView>
void write (std::string prefix, GridView const& gridView) void write (std::string prefix, GridView const& gridView)
{ {
using namespace BasisFactory;
auto basis = makeBasis(gridView, lagrange<1>());
FieldVector<double,GridView::dimensionworld> c; FieldVector<double,GridView::dimensionworld> c;
if (GridView::dimensionworld > 0) c[0] = 11.0; if (GridView::dimensionworld > 0) c[0] = 11.0;
if (GridView::dimensionworld > 1) c[1] = 7.0; if (GridView::dimensionworld > 1) c[1] = 7.0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment