dumux merge requestshttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests2019-09-04T12:00:16Zhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1711[fix][tests] fix cmake guard to ug grid instead of alu2019-09-04T12:00:16ZKatharina Heck[fix][tests] fix cmake guard to ug grid instead of aluthe cmake guard had a typo..should be ug grid instead of aluthe cmake guard had a typo..should be ug grid instead of aluDennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1696Feature/diffusion laws mass refvelocity2019-10-02T12:13:51ZKatharina HeckFeature/diffusion laws mass refvelocity- [x] include switch that old implementation is also possible
- [x] adapt docu in all models
- [x] change reference solutions
- [x] change tracer maxwell stefan test to a test with constant molar masses so that there is no velocity
-...- [x] include switch that old implementation is also possible
- [x] adapt docu in all models
- [x] change reference solutions
- [x] change tracer maxwell stefan test to a test with constant molar masses so that there is no velocity
- [x] include new 1p test with fluidsystem from old multicomponent tracer tests which tests with varying molar masses
Fixes #757.3.1Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1684Improve effective laws2020-04-06T08:44:11ZKilian WeishauptImprove effective lawsFixes #711
Fixes #710
Fixes #733
The goal of this MR is to make the effective laws more general and use the same interfaces for all of them, making them easier accessible. The effective values should then be added in the volumeVar...Fixes #711
Fixes #710
Fixes #733
The goal of this MR is to make the effective laws more general and use the same interfaces for all of them, making them easier accessible. The effective values should then be added in the volumeVariables and which means that then all effective quantities could be accessed from the volumevariables (e.g. in FicksLaw take the effective diffusion coefficient directly from the volumevariables). To make this possible, a common interface in the volumevariables is necessary. To achieve this the following steps are taken in this MR:
- [x] delete the obsolete johansenindices from the thermalconductivityjohansen and get the wetting index directly from the volumevariables (minor change)
- [x] introduce effective diffusion coefficients in all compositional volume variables
- [x] MPFA also needed some fixing adressed in #733.
While introducing the above point it was obvious that currently the diffusion coefficients are treated quite heterogeneously in the volumevariables depending on the model. That is why the suggestion was to introduce a container for the diffusion coefficients so that they can be easier accessed. That means the container deals with transferring the indices for phaseIdx, compIIdx, compJIdx to the right diffusion coefficient. The goal is to use the common interface `diffusioncoefficient(int phaseIdx, int compIIdx, int compJIdx)` in the volumevariables.
Container types for the diffusion coefficients are introduced.
* [x] Depends on a fix in MPFA to handle zero coefficients.
__TODO__
- [x] Revise the maxstef container
- [x] Revise the fixs law container to include a loop for each specialization
- [x] Redo the Volvars to include the update functions and helper lambdas (1p2c, 2p2c)
- [x] Redo the Volvars to include the update functions and helper lambdas (1pnc, 2pnc, mpnc, 3p3c)
- [x] Redo the Volvars to include the update functions and helper lambdas (richardsnc, richards)
- [x] Fix the 1p tracer example which fails.
- [x] Fix the 2p tracer test.
- [x] Redo the Volvars to include the update functions and helper lambdas (3pwateroil)
- [x] Redo the Volvars to include the update functions and helper lambdas (co2)
- [x] Adapt NavierStokesNC for Ficks law.
- [x] Adapt NavierStokesNC for Max-Stef law.
- [x] Remove MPFA warnings
- [x] Adapt Compositional RANS
- [x] Fix all branch related warnings
As of Thursday 2020.01.30 all of the tests compile without branch related deprecation warnings, and pass. This leaves two tasks:
- [x] Address comments in 1543095d232f45e4e53aa48fe45d3186fc214f43
- [x] Try and the reduce property system duplication with better inheritance
- [x] Recommit/squash everything
After Dumux day on the 4th of March:
- [x] Add sentence to changelog3.2Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1673[logginParameterTree] Exclude "ParamFile" from unused params2019-07-25T07:57:37ZKilian Weishaupt[logginParameterTree] Exclude "ParamFile" from unused params<!--
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**:
Suppresses the ouput of "ParameterFile" as unused parameters...<!--
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**:
Suppresses the ouput of "ParameterFile" as unused parameters at the end of a simulation, which is confusing.
Fixes #7383.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1654[freeflow][test] In channel 3d test use smaller Newton tolerance. This way,...2019-07-01T09:01:19ZMelanie Lipp[freeflow][test] In channel 3d test use smaller Newton tolerance. This way,...[freeflow][test] In channel 3d test use smaller Newton tolerance. This way, velocities in y and z direction, which should be zero, assume values smaller 1e-12 which is the tolerance for comparing the test solution against the reference s...[freeflow][test] In channel 3d test use smaller Newton tolerance. This way, velocities in y and z direction, which should be zero, assume values smaller 1e-12 which is the tolerance for comparing the test solution against the reference solution. Additionally, adapt the reference solution.
Closes #7323.1Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1648WIP: Feature/simplify effectivelaws - Do not merge!2019-08-05T18:27:27ZGabi SeitzWIP: Feature/simplify effectivelaws - Do not merge!Fixes #711
Fixes #710
Fixes #733
* [x] Depends on a fix in MPFA to handle zero coefficients.
This MR is outdated and superseded by !1684
Fixes #711
Fixes #710
Fixes #733
* [x] Depends on a fix in MPFA to handle zero coefficients.
This MR is outdated and superseded by !1684
3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1623WIP: add spline law for fluid-matrix interactions2020-09-27T22:59:41ZBernd FlemischWIP: add spline law for fluid-matrix interactionsUse monotone cubic spline to interpolate pc and kr curves.Use monotone cubic spline to interpolate pc and kr curves.https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1612[io] Add RasterImageReader2019-06-01T10:53:35ZKilian Weishaupt[io] Add RasterImageReader- [x] make reader static/stateless
- [x] add documentation and changelog- [x] make reader static/stateless
- [x] add documentation and changelog3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1609Feature/projector2019-05-27T12:21:05ZDennis GläserFeature/projector3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1607Feature/new materiallaw 2p2020-10-30T20:50:12ZTimo Kochtimokoch@math.uio.noFeature/new materiallaw 2p**Current status**
* The material law classes are built in a bit complicated way as a series of wrappers
* In order to evaluate a law you need the type of the law and the parameters
* Regularization is somewhat inflexible
* It's not pos...**Current status**
* The material law classes are built in a bit complicated way as a series of wrappers
* In order to evaluate a law you need the type of the law and the parameters
* Regularization is somewhat inflexible
* It's not possible to cache anything in the laws
**What this MR does / why does DuMux need it**:
* New class that gets policy template arguments instead of wrappers
* New fluidmatrixinteraction object that knows it's parameterization
* A single object that knows how to evaluate a law and can also cache things
* Flexible regularization that also allows e.g. for approximation / spline-interpolation in any part of the function
Fixes #319.
**Special notes for your reviewer / TODO**:
* [x] !2249 Should be merged first.
* [x] ~~Add update function to update the parameters of a function~~ (not implemented for now. Can be added later)
* [x] deprecation in volume variables and other call sites (-> !2260)
* [x] do the same for the interfacial area laws (non-equilibrium) (-> !2260)
* [x] deprecate old laws
* [x] adjust material law unit test to new laws
* [x] implement brooks-corey
* [x] implement twop default regularization for brooks-corey & vangenuchten
* [x] reimplement weird "regularized" linear law (should be a separate law in my opinion since the entire curve is changed)
* [x] reimplement heatpipelaw as example of a law that simply satisfies the interface (doesn't need to make use of `TwoPMaterialLaw`)
* [x] Change all spatialParams to get rid of deprecation warnings (could be done in team)
* [x] Use getters and setters for parameters (like before)
* [x] Adapt 2p sequential headers
* [x] Adapt plot material law to be able to use new style material laws
* [x] adapt box interface solver
* [x] adapt 2p incompressible local residual
* [x] adapt flash headers and tests3.3Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1596[shallow water] Add friction laws (Manning and Nikuradse)2019-07-01T09:45:38ZMartin Utz[shallow water] Add friction laws (Manning and Nikuradse)close #688 \
The friction laws after Manning and Nikuradse are implemeted.\
The related test uses Mannings law to simulate a normal flow in a rough rectangular channel. Therefore the formula of Gaukler-Manning-Strickler can be used to ...close #688 \
The friction laws after Manning and Nikuradse are implemeted.\
The related test uses Mannings law to simulate a normal flow in a rough rectangular channel. Therefore the formula of Gaukler-Manning-Strickler can be used to obtain the analytical solution.Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1595[io][grid] Simplify Yasp2019-05-17T08:26:03ZKilian Weishaupt[io][grid] Simplify Yasp* use same class for EquidistantCoordinates and EquidistantOffsetCoordinates
* use tag dispatch to call the correct ctor* use same class for EquidistantCoordinates and EquidistantOffsetCoordinates
* use tag dispatch to call the correct ctor3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1576[io] Implement grid managers in seperate headers2019-05-07T10:56:04ZTimo Kochtimokoch@math.uio.no[io] Implement grid managers in seperate headers* With this patch you only include what you need
* The header gridmanager.hh includes all specializations
as convenience. This makes this patch also fully backwards-compatible
Fixes #583 * With this patch you only include what you need
* The header gridmanager.hh includes all specializations
as convenience. This makes this patch also fully backwards-compatible
Fixes #583 3.1Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1567[fix][multidomain][couplingdata] fix upwind enthalpy of components.2019-10-02T15:21:04ZKatharina Heck[fix][multidomain][couplingdata] fix upwind enthalpy of components.Positive diffusive fluxes mean that the inside enthalpy should be used
as it is an outflux
fixes #670
* [x] implement component enthalpy in miscible fluidsystems as they could be used for the couplingPositive diffusive fluxes mean that the inside enthalpy should be used
as it is an outflux
fixes #670
* [x] implement component enthalpy in miscible fluidsystems as they could be used for the coupling3.1Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1548[freeflow] Consider full stress tensor at Dirichlet/Neumann BCs2019-04-26T07:10:16ZKilian Weishaupt[freeflow] Consider full stress tensor at Dirichlet/Neumann BCs
- [x] Adapt naming, fixes #691
- [x] dumux freeflow
- [x] dumux boundary multidomain
- [x] dumux-mixeddimension
- [x] Adapt naming, fixes #691
- [x] dumux freeflow
- [x] dumux boundary multidomain
- [x] dumux-mixeddimension Ned ColtmanNed Coltmanhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1538Improve tabulation for components and other functions2019-12-20T12:43:31ZTimo Kochtimokoch@math.uio.noImprove tabulation for components and other functions* [x] Make tabularized component work with any component (needs to check for availability of functions)
Fixes #676
Fixes #682 * [x] Make tabularized component work with any component (needs to check for availability of functions)
Fixes #676
Fixes #682 3.2Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1523Feature/improve box facet fluxes2019-03-19T14:45:23ZDennis GläserFeature/improve box facet fluxesComputation of the support point for flux computations across coupled facets using the box scheme now reuses the geometry intersection algorithms to compute an optimal point within the element. Therefore, 2d-1d intersection algorithms ha...Computation of the support point for flux computations across coupled facets using the box scheme now reuses the geometry intersection algorithms to compute an optimal point within the element. Therefore, 2d-1d intersection algorithms have been implemented.3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1520WIP: Feature/2p tracer new2019-03-12T15:57:34ZSimon EmmertWIP: Feature/2p tracer newstill a lot of things/todos and cleanup from moira in there and I need to look at gravity a bit more
**Also some comparison files are in there at the moment which will be removed and squashed before this gets merged!**
Closes #498still a lot of things/todos and cleanup from moira in there and I need to look at gravity a bit more
**Also some comparison files are in there at the moment which will be removed and squashed before this gets merged!**
Closes #4983.1https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1516Add labels to tests2019-03-01T14:09:20ZTheresa SchollenbergerAdd labels to testsThe labels porousmediumflow and geomechanics are added to each test in the respective folders. In multidomain there are the labels boundary, darcydarcy, stokesdarcy, facet and embedded. Further each test has a label of the used model (e....The labels porousmediumflow and geomechanics are added to each test in the respective folders. In multidomain there are the labels boundary, darcydarcy, stokesdarcy, facet and embedded. Further each test has a label of the used model (e.g. 1p, 1pnc, navierstokes, ...).
Closes issue #595Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1480Freeflow/test sincos2021-05-10T07:16:54ZAndrea VescoviniFreeflow/test sincosA steady and an unsteady free flow test with an analytical solutions which can be used to cleanly evaluate the spatial and temporal order of the NS model.
Addresses #415.
Closes #490.
Depends on !1551.
__TODO__
* [x] converge...A steady and an unsteady free flow test with an analytical solutions which can be used to cleanly evaluate the spatial and temporal order of the NS model.
Addresses #415.
Closes #490.
Depends on !1551.
__TODO__
* [x] convergence test
3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.no