Commit 765bcdc7 authored by Lukas Riedel's avatar Lukas Riedel

removed dune_implicitonestep.hh #47

parent a885b1c7
......@@ -38,6 +38,8 @@
#include <dune/geometry/type.hh>
#include <dune/localfunctions/common/interfaceswitch.hh>
#include <dune/pdelab/adaptivity/adaptivity.hh>
#include <dune/pdelab/backend/istl.hh>
#include <dune/pdelab/backend/interface.hh>
......@@ -48,6 +50,7 @@
#include <dune/pdelab/finiteelementmap/qkdg.hh>
#include <dune/pdelab/finiteelementmap/pkfem.hh>
#include <dune/pdelab/gridfunctionspace/gridfunctionspace.hh>
#include <dune/pdelab/gridfunctionspace/localfunctionspace.hh>
#include <dune/pdelab/gridoperator/gridoperator.hh>
#include <dune/pdelab/gridoperator/onestep.hh>
#include <dune/pdelab/instationary/onestep.hh>
......
......@@ -169,8 +169,8 @@ public:
SolutionContainer kfu_raw = cache_water_content();
std::vector<RF> res(kfu_raw.size());
typedef LocalFunctionSpace<KFGFS> LFS;
typedef LFSIndexCache<LFS> LFSCache;
typedef Dune::PDELab::LocalFunctionSpace<KFGFS> LFS;
typedef Dune::PDELab::LFSIndexCache<LFS> LFSCache;
typedef typename KFU::template ConstLocalView<LFSCache> XView;
typedef FiniteElementInterfaceSwitch<
typename Dune::PDELab::LocalFunctionSpace<KFGFS>::Traits::FiniteElementType
......
......@@ -70,13 +70,13 @@ void Simulation<Traits>::operator_setup ()
pdesolver->setVerbosityLevel(verbose);
// --- Time Step Operators ---
Dune::Dorie::OneStepMethodResult osm_result;
Dune::PDELab::OneStepMethodResult osm_result;
if(osm){
osm_result = osm->result(); // cache old result
}
osm = std::make_unique<OSM>(alex2,*igo,*pdesolver,osm_result);
osm = std::make_unique<OSM>(alex2,*igo,*pdesolver);
osm->setResult(osm_result);
osm->setVerbosityLevel(verbose+1);
osm->setStepNumber(osm_result.successful.timesteps+1);
gfs->update();
......
......@@ -63,7 +63,7 @@ protected:
/// Time stepping scheme
using TimeStepScheme = Dune::PDELab::Alexander2Parameter<RF>;
/// Method computing the time step
using OSM = Dune::Dorie::OneStepMethod<RF,IGO,PDESOLVER,U,U>;
using OSM = Dune::PDELab::OneStepMethod<RF,IGO,PDESOLVER,U,U>;
// -- Utility Class Definitions -- //
/// VTK Output writer base class
......
......@@ -16,6 +16,5 @@
#include <dune/dorie/solver/param_factory.hh>
#include <dune/dorie/solver/operator_DG.hh>
#include <dune/dorie/solver/operator_error_indicator.hh>
#include <dune/dorie/solver/dune_implicitonestep.hh>
#endif // DUNE_DORIE_SOLVER_HH
This diff is collapsed.
Markdown is supported
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