diff --git a/buildme b/buildme new file mode 100755 index 0000000000..a77bec6ee7 --- /dev/null +++ b/buildme @@ -0,0 +1 @@ +cd build && make -j16 diff --git a/opm/simulators/linalg/StandardPreconditioners_serial.hpp b/opm/simulators/linalg/StandardPreconditioners_serial.hpp index b45c7bfb80..96dcf71c0e 100644 --- a/opm/simulators/linalg/StandardPreconditioners_serial.hpp +++ b/opm/simulators/linalg/StandardPreconditioners_serial.hpp @@ -31,6 +31,19 @@ namespace Opm { +template +class TrivialPreconditioner : public Dune::PreconditionerWithUpdate +{ + public: + TrivialPreconditioner(){}; + virtual void update() override {}; + virtual bool hasPerfectUpdate() const override {return true;} + virtual void pre (X& x, Y& y) override {}; + virtual void post (X& x) override {}; + virtual void apply (X& x, const Y& y) override {}; + virtual Dune::SolverCategory::Category category() const override { return Dune::SolverCategory::sequential; }; +}; + template struct StandardPreconditioners>> @@ -71,6 +84,14 @@ struct StandardPreconditioners>(op.getmat()); }); + F::addCreator("mixed-ilu0", [](const O& op, const P& prm, const std::function&, std::size_t) { + DUNE_UNUSED_PARAMETER(prm); + return std::make_shared>(); + }); + F::addCreator("mixed-dilu", [](const O& op, const P& prm, const std::function&, std::size_t) { + DUNE_UNUSED_PARAMETER(prm); + return std::make_shared>(); + }); F::addCreator("jac", [](const O& op, const P& prm, const std::function&, std::size_t) { const int n = prm.get("repeats", 1); const double w = prm.get("relaxation", 1.0); diff --git a/opm/simulators/linalg/setupPropertyTree.cpp b/opm/simulators/linalg/setupPropertyTree.cpp index 9b6438f9dd..ac61936e0a 100644 --- a/opm/simulators/linalg/setupPropertyTree.cpp +++ b/opm/simulators/linalg/setupPropertyTree.cpp @@ -408,6 +408,7 @@ setupMixedILU([[maybe_unused]] const std::string& conf, const FlowLinearSolverPa prm.put("maxiter", p.linear_solver_maxiter_); prm.put("verbosity", p.linear_solver_verbosity_); prm.put("solver", "mixed-bicgstab"s); + prm.put("preconditioner.type", "trivial"s); return prm; } diff --git a/shellme b/shellme new file mode 100755 index 0000000000..d5e907af06 --- /dev/null +++ b/shellme @@ -0,0 +1 @@ +guix shell -L ~/repos/nrseman/aaguix --share=$PWD/.. -CD opm-simulators