4 files changed, 77 insertions, 65 deletions

diff --git a/math/dune-fem/Makefile b/math/dune-fem/Makefile
index bd5424d65570..08672e4996aa 100644
--- a/math/dune-fem/Makefile
+++ b/math/dune-fem/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dune-fem
-DISTVERSION=	2.6.0rc3
+DISTVERSION=	2.8.0rc1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,15 +14,28 @@ BUILD_DEPENDS=	arpack++>0:math/arpack++ \
 		dune-spgrid>0:math/dune-spgrid \
 		vc>0:devel/vc \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
-LIB_DEPENDS=	libarpack.so:math/arpack-ng \
+LIB_DEPENDS=	libpsurface.so:math/psurface \
+		libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
 		libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
-		libugS2.so:math/dune-uggrid \
+		libdunepolygongrid.so:math/dune-polygongrid \
+		libduneuggrid.so:math/dune-uggrid \
+		libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
-		libtbb.so:devel/tbb
+		libsuitesparseconfig.so:math/suitesparse-config \
+		libsuperlu.so:math/superlu \
+		libamd.so:math/suitesparse-amd \
+		libcamd.so:math/suitesparse-camd \
+		libccolamd.so:math/suitesparse-ccolamd \
+		libcholmod.so:math/suitesparse-cholmod \
+		libcolamd.so:math/suitesparse-colamd \
+		libldl.so:math/suitesparse-ldl \
+		libspqr.so:math/suitesparse-spqr \
+		libumfpack.so:math/suitesparse-umfpack \
+		libtbb.so:devel/onetbb
 RUN_DEPENDS=	dune-istl>=2.6:math/dune-istl \
 		dune-localfunctions>=2.6:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid \
@@ -34,7 +47,7 @@ USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	dune-fem
-GL_COMMIT=	d1b565ab01047e44508c23bb9ba3e3b4491cd8a7
+GL_COMMIT=	d1c625e6d51167d0cce57de6adcef21f548a8f82
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
diff --git a/math/dune-fem/distinfo b/math/dune-fem/distinfo
index 4f382001f940..d28bbe2e792f 100644
--- a/math/dune-fem/distinfo
+++ b/math/dune-fem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617891520
-SHA256 (dune-fem-dune-fem-d1b565ab01047e44508c23bb9ba3e3b4491cd8a7_GL0.tar.gz) = 5608b5d194c41b67d28337fedbe7d39bc83b16f89b951893069ae00d29c0ad61
-SIZE (dune-fem-dune-fem-d1b565ab01047e44508c23bb9ba3e3b4491cd8a7_GL0.tar.gz) = 1956947
+TIMESTAMP = 1630977946
+SHA256 (dune-fem-dune-fem-d1c625e6d51167d0cce57de6adcef21f548a8f82_GL0.tar.gz) = 0b744a782fbac28840e42468ce452f8865b1343a13b07c1b11ee16331b38c541
+SIZE (dune-fem-dune-fem-d1c625e6d51167d0cce57de6adcef21f548a8f82_GL0.tar.gz) = 2135354
diff --git a/math/dune-fem/files/patch-CMakeLists.txt b/math/dune-fem/files/patch-CMakeLists.txt
index ee31aa6e1227..f68c840a2e33 100644
--- a/math/dune-fem/files/patch-CMakeLists.txt
+++ b/math/dune-fem/files/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2018-08-20 20:54:13 UTC
+--- CMakeLists.txt.orig	2021-08-24 13:32:47 UTC
 +++ CMakeLists.txt
-@@ -27,7 +27,10 @@ dune_project()
- include(DuneMPI)
+@@ -34,7 +34,10 @@ if( DUNE_ENABLE_PYTHONBINDINGS )
+ endif()
  
  #add sub_directories
--dune_add_subdirs(dune lib doc cmake/modules)
-+dune_add_subdirs(dune lib cmake/modules)
+-dune_add_subdirs(dune lib doc cmake/modules ${PYDEMO_DIR})
++dune_add_subdirs(dune lib cmake/modules ${PYDEMO_DIR})
 +if (FREEBSD_INSTALL_DOCS)
 +dune_add_subdirs(doc)
 +endif()
diff --git a/math/dune-fem/pkg-plist b/math/dune-fem/pkg-plist
index 41405f271b4b..04b108fab7ac 100644
--- a/math/dune-fem/pkg-plist
+++ b/math/dune-fem/pkg-plist
@@ -5,6 +5,7 @@ include/dune/fem/common/fmatrixcol.hh
 include/dune/fem/common/forloop.hh
 include/dune/fem/common/geometrytypemap.hh
 include/dune/fem/common/hybrid.hh
+include/dune/fem/common/intersectionside.hh
 include/dune/fem/common/localcontribution.hh
 include/dune/fem/common/memory.hh
 include/dune/fem/common/referencevector.hh
@@ -65,23 +66,30 @@ include/dune/fem/gridpart/adaptiveleafgridpart.hh
 include/dune/fem/gridpart/adaptiveleafindexset.hh
 include/dune/fem/gridpart/codimindexset.hh
 include/dune/fem/gridpart/common/capabilities.hh
+include/dune/fem/gridpart/common/compositegeometry.hh
 include/dune/fem/gridpart/common/deaditerator.hh
 include/dune/fem/gridpart/common/defaultgridpartentity.hh
 include/dune/fem/gridpart/common/entitysearch.hh
 include/dune/fem/gridpart/common/gridpart.hh
 include/dune/fem/gridpart/common/gridpart2gridview.hh
+include/dune/fem/gridpart/common/gridpartadapter.hh
 include/dune/fem/gridpart/common/gridview2gridpart.hh
 include/dune/fem/gridpart/common/indexset.hh
+include/dune/fem/gridpart/common/localfunctiongeometry.hh
 include/dune/fem/gridpart/common/metatwistutility.hh
 include/dune/fem/gridpart/common/nonadaptiveindexset.hh
 include/dune/fem/gridpart/common/persistentindexset.hh
 include/dune/fem/gridpart/common/policies.hh
+include/dune/fem/gridpart/common/sharedgeometry.hh
+include/dune/fem/gridpart/common/simplegeometry.hh
+include/dune/fem/gridpart/common/unimplementedgeometry.hh
 include/dune/fem/gridpart/filter.hh
 include/dune/fem/gridpart/filter/basicfilterwrapper.hh
 include/dune/fem/gridpart/filter/domainfilter.hh
 include/dune/fem/gridpart/filter/filter.hh
 include/dune/fem/gridpart/filter/inversefilter.hh
 include/dune/fem/gridpart/filter/radialfilter.hh
+include/dune/fem/gridpart/filter/simple.hh
 include/dune/fem/gridpart/filter/threadfilter.hh
 include/dune/fem/gridpart/filter/voidfilter.hh
 include/dune/fem/gridpart/filteredgridpart.hh
@@ -98,6 +106,13 @@ include/dune/fem/gridpart/geogridpart/entity.hh
 include/dune/fem/gridpart/geogridpart/geometry.hh
 include/dune/fem/gridpart/geogridpart/intersection.hh
 include/dune/fem/gridpart/geogridpart/intersectioniterator.hh
+include/dune/fem/gridpart/geometrygridpart.hh
+include/dune/fem/gridpart/geometrygridpart/capabilities.hh
+include/dune/fem/gridpart/geometrygridpart/datahandle.hh
+include/dune/fem/gridpart/geometrygridpart/entity.hh
+include/dune/fem/gridpart/geometrygridpart/indexset.hh
+include/dune/fem/gridpart/geometrygridpart/intersection.hh
+include/dune/fem/gridpart/geometrygridpart/intersectioniterator.hh
 include/dune/fem/gridpart/idgridpart.hh
 include/dune/fem/gridpart/idgridpart/capabilities.hh
 include/dune/fem/gridpart/idgridpart/datahandle.hh
@@ -143,6 +158,10 @@ include/dune/fem/io/visual/grape/datadisp/programtemplate.cc
 include/dune/fem/io/visual/grape/datadisp/readioparams.cc
 include/dune/fem/io/visual/grape/datadisp/readiotupledata.cc
 include/dune/fem/io/visual/grape/datadisp/readtupledata.cc
+include/dune/fem/marking/default.hh
+include/dune/fem/marking/doerfler.hh
+include/dune/fem/marking/localerror.hh
+include/dune/fem/marking/maximum.hh
 include/dune/fem/misc/alugridwriter.hh
 include/dune/fem/misc/bartonnackmaninterface.hh
 include/dune/fem/misc/boundaryidprovider.hh
@@ -160,6 +179,7 @@ include/dune/fem/misc/flops.hh
 include/dune/fem/misc/fmatrixconverter.hh
 include/dune/fem/misc/functor.hh
 include/dune/fem/misc/griddeclaration.hh
+include/dune/fem/misc/gridfunctionview.hh
 include/dune/fem/misc/gridname.hh
 include/dune/fem/misc/gridobjectstreams.hh
 include/dune/fem/misc/gridsolution.hh
@@ -183,12 +203,12 @@ include/dune/fem/misc/threads/threadmanager.hh
 include/dune/fem/misc/threads/threadpartitioner.hh
 include/dune/fem/misc/threads/threadsafevalue.hh
 include/dune/fem/misc/umfpack.hh
-include/dune/fem/operator/1order/dgmasspass.hh
 include/dune/fem/operator/1order/localmassmatrix.hh
 include/dune/fem/operator/common/automaticdifferenceoperator.hh
 include/dune/fem/operator/common/differentiableoperator.hh
 include/dune/fem/operator/common/localcontribution.hh
 include/dune/fem/operator/common/localmatrix.hh
+include/dune/fem/operator/common/localmatrixcolumn.hh
 include/dune/fem/operator/common/localmatrixwrapper.hh
 include/dune/fem/operator/common/localoperator.hh
 include/dune/fem/operator/common/mapping.hh
@@ -204,6 +224,7 @@ include/dune/fem/operator/linear/denserow.hh
 include/dune/fem/operator/linear/eigenoperator.hh
 include/dune/fem/operator/linear/istladapter.hh
 include/dune/fem/operator/linear/istloperator.hh
+include/dune/fem/operator/linear/numpyoperator.hh
 include/dune/fem/operator/linear/petscoperator.hh
 include/dune/fem/operator/linear/spoperator.hh
 include/dune/fem/operator/matrix/blockmatrix.hh
@@ -219,26 +240,13 @@ include/dune/fem/operator/matrix/preconditionerwrapper.hh
 include/dune/fem/operator/matrix/spmatrix.hh
 include/dune/fem/operator/projection/dgl2projection.hh
 include/dune/fem/operator/projection/hdivprojection.hh
-include/dune/fem/operator/projection/l2projection.hh
 include/dune/fem/operator/projection/local/l2projection.hh
 include/dune/fem/operator/projection/local/riesz.hh
 include/dune/fem/operator/projection/local/riesz/dense.hh
 include/dune/fem/operator/projection/local/riesz/localrieszprojection.hh
 include/dune/fem/operator/projection/local/riesz/orthonormal.hh
 include/dune/fem/operator/projection/vtxprojection.hh
-include/dune/fem/pass/common/local.hh
-include/dune/fem/pass/common/localfunctionselector.hh
-include/dune/fem/pass/common/localfunctiontuple.hh
-include/dune/fem/pass/common/pass.hh
-include/dune/fem/pass/common/selector.hh
-include/dune/fem/pass/createpass.hh
-include/dune/fem/pass/dginversemass.hh
-include/dune/fem/pass/insertfunction.hh
-include/dune/fem/pass/insertoperator.hh
-include/dune/fem/pass/localdg.hh
-include/dune/fem/pass/localdg/discretemodel.hh
-include/dune/fem/pass/localdg/modelcaller.hh
-include/dune/fem/pass/localdg/pass.hh
+include/dune/fem/quadrature/agglomerationquadrature.hh
 include/dune/fem/quadrature/caching/cacheprovider.cc
 include/dune/fem/quadrature/caching/cacheprovider.hh
 include/dune/fem/quadrature/caching/pointmapper.hh
@@ -268,6 +276,7 @@ include/dune/fem/quadrature/geometric/geometry.hh
 include/dune/fem/quadrature/geometric/quadrature.hh
 include/dune/fem/quadrature/idprovider.hh
 include/dune/fem/quadrature/integrator.hh
+include/dune/fem/quadrature/interpolationquadrature.hh
 include/dune/fem/quadrature/intersectionquadrature.hh
 include/dune/fem/quadrature/lumpingquadrature.hh
 include/dune/fem/quadrature/pardgsimplexquadrature.hh
@@ -276,11 +285,26 @@ include/dune/fem/quadrature/quadprovider.hh
 include/dune/fem/quadrature/quadrature.hh
 include/dune/fem/quadrature/quadratureimp.hh
 include/dune/fem/quadrature/quadratureimp_inline.hh
+include/dune/fem/schemes/dgelliptic.hh
+include/dune/fem/schemes/dgfemscheme.hh
+include/dune/fem/schemes/diffusionmodel.hh
+include/dune/fem/schemes/dirichletconstraints.hh
+include/dune/fem/schemes/dirichletwrapper.hh
+include/dune/fem/schemes/elliptic.hh
+include/dune/fem/schemes/femscheme.hh
+include/dune/fem/schemes/galerkin.hh
+include/dune/fem/schemes/integrands.hh
+include/dune/fem/schemes/linearized.hh
+include/dune/fem/schemes/molgalerkin.hh
 include/dune/fem/solver/cginverseoperator.hh
+include/dune/fem/solver/communication/fem.hh
+include/dune/fem/solver/communication/hierarchical.hh
+include/dune/fem/solver/communication/owneroverlapcopy.hh
 include/dune/fem/solver/diagonalpreconditioner.hh
 include/dune/fem/solver/eigen.hh
+include/dune/fem/solver/inverseoperatorinterface.hh
+include/dune/fem/solver/istl.hh
 include/dune/fem/solver/istlinverseoperators.hh
-include/dune/fem/solver/istlsolver.hh
 include/dune/fem/solver/krylovinverseoperators.hh
 include/dune/fem/solver/ldlsolver.hh
 include/dune/fem/solver/linear/bicgstab.hh
@@ -288,41 +312,12 @@ include/dune/fem/solver/linear/cg.hh
 include/dune/fem/solver/linear/gmres.hh
 include/dune/fem/solver/multistep.hh
 include/dune/fem/solver/newtoninverseoperator.hh
-include/dune/fem/solver/ode/blas.hpp
-include/dune/fem/solver/ode/communicator.hpp
-include/dune/fem/solver/ode/dynamical_object.hpp
-include/dune/fem/solver/ode/emptycommunicator.hpp
-include/dune/fem/solver/ode/function.hpp
-include/dune/fem/solver/ode/iterative_solver.hpp
-include/dune/fem/solver/ode/limiter.hpp
-include/dune/fem/solver/ode/linear_solver.hpp
-include/dune/fem/solver/ode/matrix.hpp
-include/dune/fem/solver/ode/mpicommunicator.hpp
-include/dune/fem/solver/ode/newton.hpp
-include/dune/fem/solver/ode/nonlinear_solver.hpp
-include/dune/fem/solver/ode/ode_solver.hpp
-include/dune/fem/solver/ode/quadrature.hpp
-include/dune/fem/solver/ode/quasi_exact_newton.hpp
-include/dune/fem/solver/ode/random.hpp
-include/dune/fem/solver/ode/subblas.hpp
-include/dune/fem/solver/ode/thread.hpp
-include/dune/fem/solver/ode/timer.hpp
-include/dune/fem/solver/ode/vector.hpp
 include/dune/fem/solver/odesolver.hh
 include/dune/fem/solver/odesolverinterface.hh
 include/dune/fem/solver/oemsolver.hh
-include/dune/fem/solver/oemsolver/bicgsq.h
-include/dune/fem/solver/oemsolver/bicgstab.h
-include/dune/fem/solver/oemsolver/cblas.h
-include/dune/fem/solver/oemsolver/cghs.h
-include/dune/fem/solver/oemsolver/gmres.h
-include/dune/fem/solver/oemsolver/oemsolver.hh
-include/dune/fem/solver/oemsolver/preconditioning.hh
-include/dune/fem/solver/oemsolver/tmpmem.hh
 include/dune/fem/solver/parameter.hh
-include/dune/fem/solver/pardg.hh
 include/dune/fem/solver/pardginverseoperators.hh
-include/dune/fem/solver/petscsolver.hh
+include/dune/fem/solver/petscinverseoperators.hh
 include/dune/fem/solver/preconditionedinverseoperator.hh
 include/dune/fem/solver/rungekutta/basicimplicit.hh
 include/dune/fem/solver/rungekutta/basicrow.hh
@@ -339,6 +334,8 @@ include/dune/fem/space/basisfunctionset/basisfunctionset.hh
 include/dune/fem/space/basisfunctionset/codegen.hh
 include/dune/fem/space/basisfunctionset/default.hh
 include/dune/fem/space/basisfunctionset/evaluatecaller.hh
+include/dune/fem/space/basisfunctionset/evaluatecallerdeclaration.hh
+include/dune/fem/space/basisfunctionset/evaluatecallerdefaultimpl.hh
 include/dune/fem/space/basisfunctionset/functor.hh
 include/dune/fem/space/basisfunctionset/hpdg/anisotropic.hh
 include/dune/fem/space/basisfunctionset/hpdg/basisfunctionsets.hh
@@ -348,7 +345,6 @@ include/dune/fem/space/basisfunctionset/hpdg/typeindexset.hh
 include/dune/fem/space/basisfunctionset/hpdg/typemap.hh
 include/dune/fem/space/basisfunctionset/hpdg/vectorial.hh
 include/dune/fem/space/basisfunctionset/piolatransformation.hh
-include/dune/fem/space/basisfunctionset/proxy.hh
 include/dune/fem/space/basisfunctionset/simple.hh
 include/dune/fem/space/basisfunctionset/transformation.hh
 include/dune/fem/space/basisfunctionset/transformed.hh
@@ -372,7 +368,7 @@ include/dune/fem/space/common/adaptationmanager.hh
 include/dune/fem/space/common/adaptcallbackhandle.hh
 include/dune/fem/space/common/adaptmanager.hh
 include/dune/fem/space/common/allgeomtypes.hh
-include/dune/fem/space/common/arrays.hh
+include/dune/fem/space/common/auxiliarydofs.hh
 include/dune/fem/space/common/basesetlocalkeystorage.hh
 include/dune/fem/space/common/cachedcommmanager.hh
 include/dune/fem/space/common/capabilities.hh
@@ -392,6 +388,7 @@ include/dune/fem/space/common/functionspace.hh
 include/dune/fem/space/common/functionspaceinterface.hh
 include/dune/fem/space/common/interpolate.hh
 include/dune/fem/space/common/loadbalancer.hh
+include/dune/fem/space/common/localinterpolation.hh
 include/dune/fem/space/common/localrestrictprolong.hh
 include/dune/fem/space/common/restrictprolongfunction.hh
 include/dune/fem/space/common/restrictprolonginterface.hh
@@ -450,6 +447,8 @@ include/dune/fem/space/lagrange/storage.hh
 include/dune/fem/space/localfiniteelement/capabilities.hh
 include/dune/fem/space/localfiniteelement/dgspace.hh
 include/dune/fem/space/localfiniteelement/interpolation.hh
+include/dune/fem/space/localfiniteelement/localrestrictprolong.hh
+include/dune/fem/space/localfiniteelement/quadratureinterpolation.hh
 include/dune/fem/space/localfiniteelement/shapefunctionset.hh
 include/dune/fem/space/localfiniteelement/space.hh
 include/dune/fem/space/mapper/capabilities.hh
@@ -466,6 +465,7 @@ include/dune/fem/space/mapper/localkey.hh
 include/dune/fem/space/mapper/nonblockmapper.hh
 include/dune/fem/space/mapper/parallel.hh
 include/dune/fem/space/mapper/petsc.hh
+include/dune/fem/space/p1bubble.hh
 include/dune/fem/space/padaptivespace.hh
 include/dune/fem/space/padaptivespace/adaptmanager.hh
 include/dune/fem/space/padaptivespace/capabilities.hh
@@ -477,10 +477,6 @@ include/dune/fem/space/padaptivespace/mapper.hh
 include/dune/fem/space/padaptivespace/padaptivespace.hh
 include/dune/fem/space/padaptivespace/restrictprolong.hh
 include/dune/fem/space/rannacherturek.hh
-include/dune/fem/space/rannacherturek/capabilities.hh
-include/dune/fem/space/rannacherturek/declaration.hh
-include/dune/fem/space/rannacherturek/dofmappercode.hh
-include/dune/fem/space/rannacherturek/localinterpolation.hh
 include/dune/fem/space/rannacherturek/space.hh
 include/dune/fem/space/raviartthomas.hh
 include/dune/fem/space/raviartthomas/localinterpolation.hh
@@ -509,6 +505,7 @@ include/dune/fem/storage/objectstack.hh
 include/dune/fem/storage/referencecounter.hh
 include/dune/fem/storage/referencevector.hh
 include/dune/fem/storage/rowreferencevector.hh
+include/dune/fem/storage/singleton.hh
 include/dune/fem/storage/singletonlist.hh
 include/dune/fem/storage/subvector.hh
 include/dune/fem/version.hh
@@ -525,6 +522,7 @@ share/dune/cmake/modules/AddSIONlibFlags.cmake
 share/dune/cmake/modules/CommandLineHacks.cmake
 share/dune/cmake/modules/CorrectWindowsPaths.cmake
 share/dune/cmake/modules/DuneFemMacros.cmake
+share/dune/cmake/modules/DuneFempyMacros.cmake
 share/dune/cmake/modules/FemShort.cmake
 share/dune/cmake/modules/FemTortureTests.cmake
 share/dune/cmake/modules/FindPAPI.cmake
@@ -532,3 +530,4 @@ share/dune/cmake/modules/FindPETSc.cmake
 share/dune/cmake/modules/FindPackageMultipass.cmake
 share/dune/cmake/modules/FindXDR.cmake
 share/dune/cmake/modules/ResolveCompilerPaths.cmake
+share/dune/cmake/modules/UseModelCompiler.cmake