dumux merge requestshttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests2020-06-01T11:04:48Zhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2161[cleanup] Use find PTScotch from Dune2020-06-01T11:04:48ZTimo Kochtimokoch@math.uio.no[cleanup] Use find PTScotch from Dune@gruenich We don't need this here, right? And it might even overwrite the stuff that Dune found!?@gruenich We don't need this here, right? And it might even overwrite the stuff that Dune found!?3.3Christoph GrüningerChristoph Grüningerhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2135WIP: [freeflow] Improve parallel velocities for stair-like boundaries2020-05-29T17:05:15ZMelanie LippWIP: [freeflow] Improve parallel velocities for stair-like boundaries<!--
Thanks for sending a merge request!
If this is your first time, read our [contributing guidelines](/CONTRIBUTING.md)
-->
**What this MR does / why does DuMux need it**:
Fixes #888.
![parallelVelocities](/uploads/7530b446...<!--
Thanks for sending a merge request!
If this is your first time, read our [contributing guidelines](/CONTRIBUTING.md)
-->
**What this MR does / why does DuMux need it**:
Fixes #888.
![parallelVelocities](/uploads/7530b446fb69bcd1bb49c05d44ef0a2f/parallelVelocities.png)
**Special notes for your reviewer**:
Please only keep the second commit and omit all the temporary ones (MR set to WIP as long as temporary commits are in there). The temporary commits are meant to make review easier. In the following there is also the numbered grid for the kovasnay test which lets one compare the parallel indices.
![kovasnay_net](/uploads/ee2e598c546c68ad533e1b77f8cee383/kovasnay_net.png)
Do you see any nice way to get an implementation for higher order without passing the curSol all the way down to staggeredupwindfluxvariables?3.3Ned ColtmanNed Coltmanhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2152WIP add default fluxcache properties2020-05-28T07:23:43ZBernd FlemischWIP add default fluxcache propertiesFixes #867.Fixes #867.3.3Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2149WIP: Resolve "Translate shell scripts to Python"2020-05-27T13:55:05ZFarid MohammadiWIP: Resolve "Translate shell scripts to Python"Closes #883Closes #883https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1719[WIP] Improve stokes darcy coupling2020-05-11T07:53:50ZKilian Weishaupt[WIP] Improve stokes darcy couplingFor testing, might not be merged.
__Problems__:
* how to make backwards-compatible?
* solution-dependent Dirichlet?
* Neumann-Neumann / Dirichlet-Dirichlet coupling does not yield the same resultsFor testing, might not be merged.
__Problems__:
* how to make backwards-compatible?
* solution-dependent Dirichlet?
* Neumann-Neumann / Dirichlet-Dirichlet coupling does not yield the same resultsKilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2095[fix] change maxRelativeNewtonShift to a stricter criterion to make solution ...2020-04-29T16:16:35ZKatharina Heck[fix] change maxRelativeNewtonShift to a stricter criterion to make solution more stableWith this change the test passes me. Before the pressure solution varied by 1.2 percent.With this change the test passes me. Before the pressure solution varied by 1.2 percent.Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2046[WIP] [common] Add function rows(multiTypeBlockMatrix)2020-04-29T07:49:06ZKilian Weishaupt[WIP] [common] Add function rows(multiTypeBlockMatrix)fixes #872 fixes #872 3.3Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2043WIP:Backport/update 2pfracturetests2020-04-28T14:08:50ZNed ColtmanWIP:Backport/update 2pfracturetestsadds !2042 to releases/3.2
fixes #863 adds !2042 to releases/3.2
fixes #863 3.2https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2058[WIP] Cleanup/matrixconverter2020-04-27T13:40:31ZKilian Weishaupt[WIP] Cleanup/matrixconverterCannot be backported to 3.2Cannot be backported to 3.23.3Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2057Merge branch 'fix/clone-opm-release-branches' into 'master'2020-04-27T09:35:14ZTimo Kochtimokoch@math.uio.noMerge branch 'fix/clone-opm-release-branches' into 'master'First merge !2056
[bin] clone OPM release branches
See merge request dumux-repositories/dumux!2050
(cherry picked from commit 9cd965f51980ea6aa99a03427618820bd41588c9)
4db9a880 [bin] clone OPM release branchesFirst merge !2056
[bin] clone OPM release branches
See merge request dumux-repositories/dumux!2050
(cherry picked from commit 9cd965f51980ea6aa99a03427618820bd41588c9)
4db9a880 [bin] clone OPM release branches3.2Ned ColtmanNed Coltmanhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2056Merge branch 'fix/test-2p-cornerpoint' into 'master'2020-04-27T09:35:07ZTimo Kochtimokoch@math.uio.noMerge branch 'fix/test-2p-cornerpoint' into 'master'[test][cornerpoint] Add -fopenmp to link options.
See merge request dumux-repositories/dumux!2055
(cherry picked from commit 43d33f47e359a00691a7db5e5c710482ce5adc86)
25ca8b00 [test][cornerpoint] Add -fopenmp to link options.[test][cornerpoint] Add -fopenmp to link options.
See merge request dumux-repositories/dumux!2055
(cherry picked from commit 43d33f47e359a00691a7db5e5c710482ce5adc86)
25ca8b00 [test][cornerpoint] Add -fopenmp to link options.3.2Ned ColtmanNed Coltmanhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1941WIP: Feature/example rot sym2020-04-23T10:50:07ZMartin SchneiderWIP: Feature/example rot symFixes #787
ToDos:
* [x] Update documentation, especially in spatialparams
* [x] explain rotationsymmetricgridgeometrytraits
* [x] write 1p equation in radial coordinates and specify analytical solution
* [x] generate and include...Fixes #787
ToDos:
* [x] Update documentation, especially in spatialparams
* [x] explain rotationsymmetricgridgeometrytraits
* [x] write 1p equation in radial coordinates and specify analytical solution
* [x] generate and include result pictures
* [x] maybe also explain how the paraview filter can be used for visualization
* [x] Move calculate L2 error to main.cc
* [x] Move add vtk output to main.cc3.2Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1817Feature/test rotationsymmetry2020-04-23T10:48:58ZMartin SchneiderFeature/test rotationsymmetryFixes #787 Fixes #787 3.2Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/2032Merge branch 'feature/biomin_example' into 'master'2020-04-22T16:48:23ZTimo Kochtimokoch@math.uio.noMerge branch 'feature/biomin_example' into 'master'Feature/biomin example
See merge request dumux-repositories/dumux!1784
(cherry picked from commit b27b2a2fc9edcefada532e5738f4500f37cdeef0)
d90afc08 [examples][biomin] added new biomineralization exampleFeature/biomin example
See merge request dumux-repositories/dumux!1784
(cherry picked from commit b27b2a2fc9edcefada532e5738f4500f37cdeef0)
d90afc08 [examples][biomin] added new biomineralization example3.2Ned ColtmanNed Coltmanhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1983[WIP] Merge branch 'feature/version-check-solverfactory' into 'master'2020-04-21T07:24:35ZTimo Kochtimokoch@math.uio.no[WIP] Merge branch 'feature/version-check-solverfactory' into 'master'[linear][istlsolverfactorybackend] Make usable with dune 2.7
See merge request dumux-repositories/dumux!1982
(cherry picked from commit 074885763b45b60e1afed2370268c11a61a84fab)
947f1b32 [linear][istlsolverfactorybackend] Make u...[linear][istlsolverfactorybackend] Make usable with dune 2.7
See merge request dumux-repositories/dumux!1982
(cherry picked from commit 074885763b45b60e1afed2370268c11a61a84fab)
947f1b32 [linear][istlsolverfactorybackend] Make usable with dune 2.73.2Ned ColtmanNed Coltmanhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1993Feature/improve ff example backport2020-04-18T08:51:05ZTimo Kochtimokoch@math.uio.noFeature/improve ff example backport3.2Ned ColtmanNed Coltmanhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1954Merge branch 'bugfix/2p-analytic-derivative' into 'master'2020-04-07T08:35:27ZTimo Kochtimokoch@math.uio.noMerge branch 'bugfix/2p-analytic-derivative' into 'master'Bugfix/2p analytic derivative
See merge request dumux-repositories/dumux!1952
(cherry picked from commit 250c5c6faad53f7c1a32208468ed136fb55b6e69)
af101b08 [2p][bugfix] Fix analytic storage derivatives
c6c51639 [2p] Correct signs of l...Bugfix/2p analytic derivative
See merge request dumux-repositories/dumux!1952
(cherry picked from commit 250c5c6faad53f7c1a32208468ed136fb55b6e69)
af101b08 [2p][bugfix] Fix analytic storage derivatives
c6c51639 [2p] Correct signs of local variables for analytic flux derivative
1674a58c [test][2p] Add incompressible tpfa test with analytic Jacobian
8f78875b [2p][bugfix] Fix equation index for analytic box Jacobian
945f8898 [2p] Fix sign of local derivative variables in box analytic Jacobian
f113c4b4 [test][2p] Add box 2p test with analytic JacobianTimo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1930WIP cleanup/use lambdas for isvalid2020-04-06T18:31:11ZDennis GläserWIP cleanup/use lambdas for isvalidTimo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1902Feature/hasresize concept2020-04-06T18:31:10ZDennis GläserFeature/hasresize concept**What this MR does / why does DuMux need it**:
This introduces resizable concepts for vectors and matrix to be used together with the Dune concepts facility.
In case we like this:
- [ ] Introduce doxygen group for concepts
- [x] T...**What this MR does / why does DuMux need it**:
This introduces resizable concepts for vectors and matrix to be used together with the Dune concepts facility.
In case we like this:
- [ ] Introduce doxygen group for concepts
- [x] TODO: Open issue for finding more places where we use `isValid` but we could also use Dune::models() #843
Fixes #745 3.2Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1827WIP: Uzawa algorithm for Navier Stokes2020-04-04T08:03:17ZBernd FlemischWIP: Uzawa algorithm for Navier StokesProvide two linear solvers for Navier-Stokes that use the Uzawa algorithm.
The Uzawa algorithm is implemented in form of the preconditioner `SeqUzawa`. By default, the direct `UMFPack` solver is used for the velocity subsystem. Altern...Provide two linear solvers for Navier-Stokes that use the Uzawa algorithm.
The Uzawa algorithm is implemented in form of the preconditioner `SeqUzawa`. By default, the direct `UMFPack` solver is used for the velocity subsystem. Alternatively, setting `LinearSolver.InexactVelocitySolver` to true will use one AMG cycle instead. The success is rather sensitive to the relaxation parameter `LinearSolver.PreconditionerRelaxation` that depends (at least) on the mesh size and the viscosity.
The solver `UzawaSolver` employs the preconditioner by default in a simple loop. Setting `LinearSolver.AndersonAcceleration` to true will speed up the convergence by using Anderson acceleration. The solver `UzawaBiCGSTABBackend` uses a BiCGSTAB solver around the Uzawa preconditioner.
Tests `test_ff_navierstokes_sincos_uzawasolver` and `...uzawapreconditioner` have been added to `test/freeflow/navierstokes/sincos` and are supposed to reproduce the results of `test_ff_navierstokes_sincos_instationary`.
The promising fact is that both solvers work, meaning that we are no longer restricted to direct solvers. However, the number of required iterations is very high, especially when starting from an already small residual. For the considered tests, the `UzawaBiCGSTABBackend` is superior to the Anderson-accelerated `UzawaSolver`.
__Dumux Day 25.03.20__
Only consider Uzawa preconditioner for 3.2
TODO
* [x] Remove dependency on grid geometry
* [x] Use Dune::Indices for improved readability
* [ ] Revise incorporation of boundary conditions in Uzawa preconditioner
* [ ] Make Uzawa preconditioner usable without solver factory
* [ ] Extract parameter tree conversion from solver factory to make it reusable
* [ ] ~~Revisit memory usage of Anderson Acceleration (do we really need maxIter-sized containers? can be very large)~~
* [ ] ~~Maybe extend for multidomain problems, i.e., allow to handle additional matrix blocks with given preconditioners~~3.2