diff --git a/src/duneevaluate.cc b/src/duneevaluate.cc index dd28b626b8e56c47240f8808cfb87d8e691ea12f..0fee6e52add3aa61e2a9368fd55e089e4334ebae 100644 --- a/src/duneevaluate.cc +++ b/src/duneevaluate.cc @@ -27,8 +27,8 @@ Evaluate x -> 1/2<Ax,x> - <b,x> + H(|x|) at each point y that is a column vector Functional::SmallVector b; Dune::octaveToDune<dim>(args(1).vector_value(), b); - Dune::SteepFunctionNonsmooth f_steep; - Dune::SampleFunction f_sample; + Dune::SampleFunction<100> f_steep; + Dune::SampleFunction<2> f_sample; charNDArray bar = args(2).char_array_value(); Dune::NiceFunction *foo; diff --git a/src/duneminimise.cc b/src/duneminimise.cc index fb66823b67c22ae38f15ce680c5f084f2a1ce2b4..4238fa2b8c624d7b97f4107112c647fae21676bc 100644 --- a/src/duneminimise.cc +++ b/src/duneminimise.cc @@ -27,8 +27,8 @@ Make a minimisation step of x -> 1/2<Ax,x> - <b,x> + H(|x|) using DUNE starting Functional::SmallVector b; Dune::octaveToDune<dim>(args(1).vector_value(), b); - Dune::SteepFunctionNonsmooth f_steep; - Dune::SampleFunction f_sample; + Dune::SampleFunction<100> f_steep; + Dune::SampleFunction<2> f_sample; charNDArray bar = args(2).char_array_value(); Dune::NiceFunction *foo;