Commit Graph
129 Commits
Author SHA1 Message Date
Andreas Lauser 9e3563f799 remove the affiliations of the copyright holders
these will be documented separately in the toplevel file "COPYING"
2012-08-23 12:36:47 +02:00
Markus Wolff 9c51221df8 more consistent naming of components
- the prefix "simple" should only be used if a more complex version of
     the same component is available
   - deprecated Oil and SimpleDNAPL

   approved by coffee break

Dumux-Svn-Revison: 8943
Ported-By: Andreas Lauser <andreas.lauser@iws.uni-stuttgart.de>
2012-08-22 13:35:01 +02:00
Andreas Lauser f24608011b make end time of the coupled tutorial match the ones of the decoupled one
also increase the initial time step size to 1000 seconds since 10
seconds is way too small
2012-08-19 23:28:35 +02:00
Andreas Lauser 2416905f45 rename GridSize -> DomainSize, Grid\.?Cells -> Cells
this hopefully reduces confusion about what which parameter means. the
Domain* parameters specify the physical size of the simulated domain,
the Cells* specify how many cells the grid has into the direction of
each axis.
2012-07-12 21:27:42 +02:00
Andreas Lauser a8c039bb8b remove unused typedefs and enums 2012-07-12 21:25:24 +02:00
Andreas Lauser 4a0aaecead replace the 1p and 2p(ni) box models by the immiscible(ni) model
the immiscible(ni) model is a model that is independent on the number
of phases and assumes immiscibility. this change is along the lines of
the previous commit for the compositional primary variable switching
model.
2012-07-12 21:25:23 +02:00
Andreas Lauser e52f2d72f8 rename parameters TEnd and DtInitial
to make them self-descriptive and consistent with the other parameters
and properties "TEnd" is renamed to "EndTime" and "DtInitial" to
"InitialTimeStepSize".
2012-07-12 21:25:22 +02:00
Andreas Lauser 88636f077b implement the remaining Dumux naming conventions for the non-decoupled models
Tensor -> DimMatrix
refElem -> refElement
gv -> gridView
remove "AtIP" suffix
*Index -> *Idx for variables
remove ${MODEL_NAME}Index property
consistent argument names for compute(Storage|Flux|Source) in the local residuals

also remove the "MassUpwindWeight" and "UpwindWeight" properties as
they were not really useful.
2012-07-12 21:25:18 +02:00
Andreas Lauser f1b3a3d3e6 tutorial: fix Makefile.am 2012-07-12 21:25:17 +02:00
Andreas Lauser 13d9867500 decoupled: finish the SpatialParameters -> SpatialParams frenzy
I also removed the deprecation stuff, as IMO it is more confusing than
helpful. (Ever tried to set the
SpatialParameters instead of SpatialParams in your problem?)

Also move the decoupled spatial parameters from dumux/material to
dumux/decoupled because they are specific to the decoupled models.
2012-07-12 21:25:16 +02:00
Markus Wolff ed2bf12c5f changed naming in decoupled tutorial
Cherry picked from Dumux SVN trunk (revision 8135)
2012-07-12 21:25:16 +02:00
Andreas Lauser 20875b5a6c tutorial_coupled: impose boundary conditions weakly 2012-07-12 21:25:15 +02:00
Andreas Lauser 7b3c8f18bb fix includes
most includes are now sorted by abstraction levels, with the most
abstract header first. also some system headers like <string> are now
explicitly included in every file where some of their classes are
used.
2012-07-12 21:25:12 +02:00
Andreas Lauser 7df261d46a fix -pedantic warnings, make the 'generalproblem' decoupled only
the last point is necessarry because the box models are pretty much
decoupled from trunk by now...
2012-07-12 21:25:08 +02:00
Andreas Lauser 3882013f1c remove unnecessary typedefs and enums 2012-07-12 21:25:08 +02:00
Andreas Lauser d7db90476e box models: fold the spatial parameters directly into the problems 2012-07-12 21:25:06 +02:00
Andreas Lauser 591334ac82 box models: introduce BaseProblem property
that's the base class from which the actual problems are derived from
2012-07-12 21:25:06 +02:00
Andreas Lauser 9131de9074 fix various hiccups in the non-test problems after the recebt switches
the switches are the introduction of "smart primary variables", rate
vectors, and changing the capillary pressure API for the multi-phase
models to the one previously used by the MpNc model.
2012-07-12 21:25:06 +02:00
Andreas Lauser f4f7190c72 change the 2p(ni) and 2p2c(ni) models to the generic capillary pressure laws
also change the 2p model to "smart primary variables" and rate vectors and
make the 2p and 2p2c test problems model agnostic
2012-07-12 21:25:06 +02:00
Andreas Lauser 57e9f74f3a consistently make the time index available
- this renames historyIdx to timeIdx (I think it expresses what it is meant for better)
- rename localIdx to "spaceIdx" in the problems/spatial parameters
- add a "timeIdx" argument to the problem's methods
2012-07-12 21:25:06 +02:00
Andreas Lauser 2591f9cca0 tests, tutorials, lecture problems: make them all compile 2012-07-12 21:25:05 +02:00
Andreas Lauser dc920d9030 Improve the startup and parameter routines. 2012-07-12 21:25:04 +02:00
Christoph Grueninger fdcd099b40 Provide *.input in tarball. 2012-07-12 21:25:02 +02:00
Andreas Lauser 4f3eaf0101 parameter files: partially fix formating
as requested by the PFP
2012-07-12 21:25:01 +02:00
Klaus Mosthaf e8323070d0 corrections in the coupled tutorial, spell check & beautification 2012-07-12 21:25:01 +02:00
Klaus Mosthaf 8ad532feba Fixed some typos and linebreaks (for the handbook) 2012-07-12 21:25:01 +02:00
Benjamin Faigle e2953d8eca correct spelling mistakes and other minor issues in tutorial introduces breaks to get all documentation in the code on a page in the handbook. 2012-07-12 21:25:00 +02:00
Markus Wolff 2578c26c5a Changed decoupled tutorial to use the start() routine
- we decided to keep the tutorials similar and to change them to
     start from a parameter file
2012-07-12 21:25:00 +02:00
Philipp Nuske 70fb80746e - added a tiny exercise to the coupled tutorial: change from cubes to simplex 2012-07-12 21:24:55 +02:00
Andreas Lauser f5a9cf1a83 rename files for structured grid creators to make them consistent with the classes which they contain
structuredcubegridcreator.hh -> cubegridcreator.hh
structuredsimplexgridcreator.hh -> simplexgridcreator.hh

also document them properly.
2012-07-12 21:24:54 +02:00
Andreas Lauser 25aba6a3f2 update the tutorial for the coupled models 2012-07-12 21:24:53 +02:00
Bernd Flemisch fc04520ad2 tutorial: fix -pedantic error 2012-07-12 21:24:47 +02:00
Andreas Lauser 4706fcf898 new institute name in remaining files 2012-07-12 21:24:43 +02:00
Andreas Lauser 35242a073e fix copyright notices
- new institute name
- add missing modelines
- reformat the entry for leopold stadler in air.hh
2012-07-12 21:24:43 +02:00
Bernd Flemisch 778d80aa12 remove error-causing add_dependencies 2012-07-12 21:24:40 +02:00
Markus Wolff 7ca28bcd97 made decoupled tutorial run again after changes in decoupled models 2012-07-12 21:24:39 +02:00
Andreas Lauser 5863d6306c remove all unused typedefs
since this was done in a semi-automatic way compilation for stuff not
used by the non-decoupled tests may be non-functional. I spared the
decoupled stuff because it does not compile ATM so I did not have a
way verify that it still works...
2012-07-12 21:24:35 +02:00
Andreas Lauser 9b653a7051 properties: remove all superfluous PTAG() invocations 2012-07-12 21:24:33 +02:00
Andreas Lauser a47f8e2aec boxmodels: make them compile with -pedantic
tested on GCC 4.3 and GCC 4.6. Due to an incompatibility between those
two compilers (GCC 4.3 expects that there's no semicolon behind
static_assert(), GCC 4.6 requires one), it only compiles on GCC 4.6.
2012-07-12 21:24:32 +02:00
Bernd Flemisch 89ea64ab96 remove warning-causing commas 2012-07-12 21:24:31 +02:00
Bernd Flemisch c0f8a64960 remove warning-causing semicolons 2012-07-12 21:24:31 +02:00
Bernd Flemisch 1dbd4b606a decoupled 2p: fix compilation of tutorial and generalproblem, keep the property TwoPIndices for compatibility with box models, comment declaration of some unused variables 2012-07-12 21:24:31 +02:00
Andreas Lauser 358449a1bd eliminate all dependencies on boost
mainly to get rid of AX_BOOST_BASE and to reduce the number of
dependencies.
2012-07-12 21:24:28 +02:00
Bernd Flemisch 9924b8b49e changed to NonwettingPhase, since renaming has not been decided 2012-07-12 21:24:27 +02:00
Andreas Lauser e507529019 Added adapter to maintain usage of FluidSystem<TypeTag> 2012-07-12 21:24:26 +02:00
Andreas Lauser d9bd5a1b03 insert emacs and vi modelines to make indentation more consistent 2012-07-12 21:24:25 +02:00
Andreas Lauser 9f7d1d109b re-applied fluid framework changes to the newfluidframework branch 2012-07-12 21:24:21 +02:00
Bernd Flemisch 89ff5ad8fc Reverting previous commits and going back to revision 6808. There is no need to rush things. We agreed on first having the meeting and then porting the change to the non-MpNc-models. Moreover, the change has not been carried out according to what has been discussed at the meeting. E.g. there was no completeState functionality of the models, and the simple models also introduced parameter caches, although it was thought to not necessarily having to do so. 2012-07-12 21:24:20 +02:00
Andreas Lauser 710ee0ae4e NonwettingPhase -> NonWettingPhase
also call fluidState_.pressure() instead of
fluidState_.phasePressure() in the TwoPVolumeVariables.
2012-07-12 21:24:20 +02:00
Bernd Flemisch b7aab50731 Worked further on the Doxygen modules. The structure seems quite ok now, and the classes seem to be associated with the correct groups.
Also improved documentation by getting rid of more than 250 Doxygen
warnings.
2012-07-12 21:24:19 +02:00