diff --git a/dune/gfe/mixedriemanniantrsolver.cc b/dune/gfe/mixedriemanniantrsolver.cc index b93229e723a2f5401e9ce7d7a71141f0e1ad16fe..625836ecbd941095ef38859d4de21adbfe48bb16 100644 --- a/dune/gfe/mixedriemanniantrsolver.cc +++ b/dune/gfe/mixedriemanniantrsolver.cc @@ -21,8 +21,6 @@ #include <dune/gfe/parallel/matrixcommunicator.hh> #include <dune/gfe/parallel/vectorcommunicator.hh> -#include <dune/gfe/cosseratvtkwriter.hh> - template <class GridType, class Basis, class Basis0, class TargetSpace0, @@ -560,16 +558,7 @@ void MixedRiemannianTrustRegionSolver<GridType,Basis,Basis0,TargetSpace0,Basis1, break; } } -#if 0 - // Output each iterate, to better understand what the algorithm does - DuneFunctionsBasis<Basis0> fufemBasis0(assembler_->basis0_); - DuneFunctionsBasis<Basis1> fufemBasis1(assembler_->basis1_); - std::stringstream iAsAscii; - iAsAscii << i+1; - CosseratVTKWriter<GridType>::template writeMixed<DuneFunctionsBasis<Basis0>, DuneFunctionsBasis<Basis1> >(fufemBasis0,x_[_0], - fufemBasis1,x_[_1], - "mixed-cosserat_iterate_" + iAsAscii.str()); -#endif + if (rank==0) std::cout << "iteration took " << totalTimer.elapsed() << " sec." << std::endl; diff --git a/src/simofoxshell.cc b/src/simofoxshell.cc index f8a77af5f6f85d95d644ebbc8d04cf7604521f6b..fcad1af33c558de0956302b9bfcbf62e0b18dd7d 100644 --- a/src/simofoxshell.cc +++ b/src/simofoxshell.cc @@ -12,18 +12,20 @@ #include <dune/grid/utility/structuredgridfactory.hh> #include <dune/grid/io/file/gmshreader.hh> +#include <dune/grid/io/file/vtk/subsamplingvtkwriter.hh> #include <dune/grid/uggrid.hh> +#include <dune/functions/functionspacebases/interpolate.hh> #include <dune/functions/functionspacebases/lagrangebasis.hh> #include <dune/functions/functionspacebases/compositebasis.hh> #include <dune/functions/functionspacebases/powerbasis.hh> +#include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh> #include <dune/fufem/functiontools/boundarydofs.hh> #include <dune/fufem/dunepython.hh> #include <dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh> #include <dune/gfe/assemblers/simofoxenergy.hh> -#include <dune/gfe/cosseratvtkwriter.hh> #include <dune/gfe/embeddedglobalgfefunction.hh> #include <dune/gfe/assemblers/mixedgfeassembler.hh> #include <dune/gfe/mixedriemanniantrsolver.hh>