From 9a800a3f3cb35f0d637335d70fa2a6551c448167 Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@googlemail.com>
Date: Mon, 3 Dec 2018 16:03:57 +0100
Subject: [PATCH] [solver] reenable one specialization of solve
---
.gitsuper | 42 +++++++++++++++++++++---------------------
dune/xt/la/solver.hh | 12 ++++++------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/.gitsuper b/.gitsuper
index 744420bc6..a94b79b72 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -1,26 +1,26 @@
[supermodule]
remote = git@github.com:dune-community/dune-gdt-super.git
status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
- +20a673b9dad7e2e25bd97defa8849debb59d247c config.opts (20a673b)
+ 28c9ce81c14c878a71e907ab05b9bb72df77883e config.opts (heads/master)
8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5)
707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20)
- +3e2723c5f85990f621f8e9a8be6d7e8ef0d1c3ca dune-gdt (heads/entropy_flux_even_newer)
+ +100be59afd86dfc8823e126ed8f9064d738d70d6 dune-gdt (heads/entropy_flux_even_newer)
390a2c503783bbed778a8ff610f8c5ca09c238d0 dune-geometry (v2.5.1-5-g390a2c5)
d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5)
9e29a333e8af02382d80b95335a784d5ce1ea2c8 dune-grid-glue (v2.4.0-70-g9e29a33)
63df56a54f81eda308233a683eb329e77e69f0a9 dune-istl (v2.5.1rc1)
0d757d65e5d57134a7ecf304e35d063f4ccc7116 dune-localfunctions (v2.5.1rc1)
- +7e0191a01e80ab1b57dd9e8f763daeb98d4511de dune-pybindxi (v2.2.1-17-g7e0191a)
+ 8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6)
741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest)
0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2)
- +92c57fa717f1bb48bdf08de085bf4cb6beee21cb dune-xt-common (heads/master)
- +e69fd76a2344e7ed99858ff9cb0988437c439b5a dune-xt-data (heads/releases/18.10)
- +aea4ef43bb0177466be2ec3cb56e3f4f5ced2c25 dune-xt-functions (heads/master)
- +8a51b63c953466077824b3ed1177f09b2e555257 dune-xt-grid (heads/master)
- +f0279906711825b1539a1e413ccc2be4cc4f650d dune-xt-la (heads/clang_format_6)
+ 5041a24932b5d375bc3f304c2e7b371cf8b9f3db dune-xt-common (heads/momentmodels)
+ 27c4d5cffc78147488d9fca2c0a286130e270ede dune-xt-data (heads/momentmodels)
+ c23606375be3f99c90b21577eec7c1fd2ce0c99e dune-xt-functions (heads/momentmodels)
+ 93e7123392178bb4ec4bd698c427238a9b709a7c dune-xt-grid (heads/momentmodels)
+ +2cb9e5158e85cc2a42255e1293e71029b70938f4 dune-xt-la (heads/dailywork_tleibner)
09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
-commit = 2f899b90c31cda76e39538abbffefef1c48ca173
+commit = 217c19a46d7289f7fbd84bf1174f8caf43d6ea31
[submodule.bin]
remote = git@github.com:dune-community/local-bin.git
@@ -30,7 +30,7 @@ commit = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8
[submodule.config.opts]
remote = git@github.com:dune-community/config.opts.git
status =
-commit = 20a673b9dad7e2e25bd97defa8849debb59d247c
+commit = 28c9ce81c14c878a71e907ab05b9bb72df77883e
[submodule.dune-alugrid]
remote = https://github.com/dune-mirrors/dune-alugrid.git
@@ -44,8 +44,8 @@ commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f
[submodule.dune-gdt]
remote = git@github.com:dune-community/dune-gdt.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 3e2723c5f85990f621f8e9a8be6d7e8ef0d1c3ca
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = 100be59afd86dfc8823e126ed8f9064d738d70d6
[submodule.dune-geometry]
remote = git@github.com:dune-community/dune-geometry.git
@@ -75,7 +75,7 @@ commit = 0d757d65e5d57134a7ecf304e35d063f4ccc7116
[submodule.dune-pybindxi]
remote = git@github.com:dune-community/dune-pybindxi.git
status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (a18500d)
-commit = 7e0191a01e80ab1b57dd9e8f763daeb98d4511de
+commit = 8a69fc68165780921bbba77da338b6932daf983c
[submodule.dune-python]
remote = https://github.com/dune-mirrors/dune-python.git
@@ -95,27 +95,27 @@ commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e
[submodule.dune-xt-common]
remote = git@github.com:dune-community/dune-xt-common.git
status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 92c57fa717f1bb48bdf08de085bf4cb6beee21cb
+commit = 5041a24932b5d375bc3f304c2e7b371cf8b9f3db
[submodule.dune-xt-data]
remote = git@github.com:dune-community/dune-xt-data
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = e69fd76a2344e7ed99858ff9cb0988437c439b5a
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = 27c4d5cffc78147488d9fca2c0a286130e270ede
[submodule.dune-xt-functions]
remote = git@github.com:dune-community/dune-xt-functions.git
-status = +2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = aea4ef43bb0177466be2ec3cb56e3f4f5ced2c25
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = c23606375be3f99c90b21577eec7c1fd2ce0c99e
[submodule.dune-xt-grid]
remote = git@github.com:dune-community/dune-xt-grid.git
-status = +2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 8a51b63c953466077824b3ed1177f09b2e555257
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = 93e7123392178bb4ec4bd698c427238a9b709a7c
[submodule.dune-xt-la]
remote = git@github.com:dune-community/dune-xt-la.git
status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = f0279906711825b1539a1e413ccc2be4cc4f650d
+commit = 2cb9e5158e85cc2a42255e1293e71029b70938f4
[submodule.scripts]
remote = https://github.com/wwu-numerik/scripts.git
diff --git a/dune/xt/la/solver.hh b/dune/xt/la/solver.hh
index de6236b19..f10062b65 100644
--- a/dune/xt/la/solver.hh
+++ b/dune/xt/la/solver.hh
@@ -146,12 +146,12 @@ typename std::enable_if<is_matrix<M>::value, Solver<M>>::type make_solver(const
}
-// template <class M, class V, class... Args>
-// typename std::enable_if<is_matrix<M>::value && is_vector<V>::value, void>::type
-// solve(const M& A, const V& b, V& x, Args&&... args)
-//{
-// make_solver(A).apply(b, x, std::forward<Args>(args)...);
-//}
+template <class M, class V, class... Args>
+typename std::enable_if<is_matrix<M>::value && is_vector<V>::value, void>::type
+solve(const M& A, const V& b, V& x, Args&&... args)
+{
+ make_solver(A).apply(b, x, std::forward<Args>(args)...);
+}
// template <class M, class C>
--
GitLab