Skip to content
Snippets Groups Projects

[factory] Adapt to function.hh deprecation

Merged Timo Koch requested to merge feature/update-element-param-interface into master
All threads resolved!
2 files
+ 35
0
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -4,9 +4,9 @@
#define DUNE_FOAMGRID_ELEMENTS_HH
#include <memory>
#include <functional>
#include <dune/common/fmatrix.hh>
#include <dune/common/function.hh>
#include <dune/foamgrid/foamgrid/foamgridvertex.hh>
#include <dune/foamgrid/foamgrid/foamgridedge.hh>
@@ -181,7 +181,7 @@ namespace Dune {
bool isNew_;
/** \brief The element parametrization */
std::shared_ptr<VirtualFunction<FieldVector<ctype, dimgrid>, FieldVector<ctype, dimworld> > > elementParametrization_;
std::function<FieldVector<ctype, dimworld>(FieldVector<ctype, dimgrid>)> elementParametrization_;
/** \brief This flag is set by postGrow() if the element looses its right to coarsen
* because it contains a bifurcation facet without father */
@@ -366,7 +366,7 @@ namespace Dune {
FoamGridEntityImp<dimgrid, dimgrid ,dimworld, ctype>* father_;
/** \brief The element parametrization */
std::shared_ptr<VirtualFunction<FieldVector<ctype, dimgrid>, FieldVector<ctype, dimworld> > > elementParametrization_;
std::function<FieldVector<ctype, dimworld>(FieldVector<ctype, dimgrid>)> elementParametrization_;
/** \brief This flag is set by postGrow() if the element looses its right to coarsen
* because it contains a bifurcation facet without father */
Loading