Commit Graph

382 Commits

Author SHA1 Message Date
Andreas Lauser
94bc342f6f fluid systems: add isIdealGas(phaseIdx) methods
this is primary to allow models to check whether their assumptions are
valid for the given fluidsystem

also add the H2O-Air fluid system to the fluid systems test. this
caught a few issues!
2012-07-12 21:24:40 +02:00
Andreas Lauser
3c12ff1e06 add forgotten files. 2012-07-12 21:24:40 +02:00
Andreas Lauser
570834ca33 add a test for the peng robinson EOS
This implied to move the SPE5 fluid system to the main
repository. alas, the test itself does not work yet because the flash
solver blows up.
2012-07-12 21:24:40 +02:00
Andreas Lauser
3c7251e8b2 free flow: make it compile with GCC 4.6, fix -pedantic warnings 2012-07-12 21:24:40 +02:00
Andreas Lauser
5cd2cb0a23 property&parameter systems: get rid of the warnings when -pedantic is used 2012-07-12 21:24:40 +02:00
Philipp Nuske
ca400de662 - added formulation for p,T dependence of thermal conductivity according to IAPWS - can be used tabulated or directly - nitrogen is still a constant value (with proper reference though) - thermal conductivity of the mixture is obtained by mass fraction weighting in case of the gas, liquid uses thermal conductivity of water 2012-07-12 21:24:39 +02:00
Klaus Mosthaf
4ebe684372 Added h2on2 fluid system to respective doxygen group 2012-07-12 21:24:39 +02:00
Andreas Lauser
b7eead2d52 mathbf{grad}ient -> gradient
that was a error in the latex correction push
2012-07-12 21:24:38 +02:00
Andreas Lauser
501b06bbad fix LaTeX errors in formulas
that was a lot of fun!
2012-07-12 21:24:38 +02:00
Klaus Mosthaf
b1afaf2bc7 added component air 2012-07-12 21:24:38 +02:00
Klaus Mosthaf
d93571271e added binary coefficients for h2o-air 2012-07-12 21:24:38 +02:00
Klaus Mosthaf
1d956cfad8 added h2o-air fluidsystem 2012-07-12 21:24:38 +02:00
Andreas Lauser
d64a6b802b fluid states: fix massFraction() method for the case where the average molar mass is negative
yeah, that's really exotic, but this occationally happens to me. (if i
force all mole fractions to be positive, I get worse convergence
rates.)
2012-07-12 21:24:37 +02:00
Bernd Flemisch
a1a4191b81 send unused headers to devel 2012-07-12 21:24:37 +02:00
Bernd Flemisch
e0b9292d85 send unused headers to devel 2012-07-12 21:24:36 +02:00
Klaus Mosthaf
86c23502d3 Renamed overloaded matrixHeatFlux() method (boxspatialparameters.hh) at outflow boundaries: boundaryMatrixHeatFlux() is called instead (from 2p2cnifluxvariables), using the face type as template parameter. In principle this method can be used for both, inner SCV faces and boundary faces; on the long run it would be nice to employ just one single method which handles the heat flux for both face types. 2012-07-12 21:24:35 +02:00
Andreas Lauser
8485b08819 make 'make headercheck' work
well, for everything except the decoupled stuff. Thanks goes to
Christoph for pointing this out.
2012-07-12 21:24:35 +02:00
Andreas Lauser
35c9a9af4c also remove unused non-public constants and more unused typedefs 2012-07-12 21:24:35 +02:00
Andreas Lauser
0b9d8ea8e3 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
Klaus Mosthaf
0a68e1a18b Added some required typedefs 2012-07-12 21:24:35 +02:00
Klaus Mosthaf
9b28f3bf58 Enabled outflow conditions (beta version) for the 2p2cni model. boxspatialparameters: additional empty matrixHeatFlux() method, which uses the face as argument and can handle both, boundary faces and sub-control-volume faces; this is used for the calculation of outflow fluxes only so far and has to be specified in the spatial parameters, if required. 2p2cnifluxvariables: additional call to matrixHeatFlux(), if we are on a boundary face; changed temperature gradient to a private object with a return function to make it accessible from outside. boxlocalresidual: removed some superfluous asImp()s. 2p2cnilocalresidual: added computeOutflowValues() method for the evaluation of outflow conditions. regularizedvangenuchten: corrected typo. 2012-07-12 21:24:35 +02:00
Andreas Lauser
8edb2d5bd4 fix the test for the tabulated components 2012-07-12 21:24:34 +02:00
Andreas Lauser
1c4b109b66 tabulated component: disable range check
for the "intelligent" the tabulation, alphas can be well out of range
[0, 1]
2012-07-12 21:24:34 +02:00
Andreas Lauser
cad12a7057 revert changes in nonequilibriumfluidstate.hh made in revision 7333
AFAICS it was only debugging code which was not useful in a general
context...
2012-07-12 21:24:34 +02:00
Philipp Nuske
fb32031744 - heat conduction in MpNc switched off - Coordscalar -> Scalar: this makes switching all Scalars to quad possible - some code in MpNclocalresidual that makes it possible to sum up the individual energy equation in the case of kinetic consideration - debugging code in the nonequilibriumfluidstate 2012-07-12 21:24:34 +02:00
Andreas Lauser
98f29b47e3 tabulated component: add template parameter to let the user chose between "dumb" and "intelligent" tabulation
the ifp problem seems to have some issues with tabulation along the
vapor pressure curve. I'll have to investigate this further...
2012-07-12 21:24:34 +02:00
Andreas Lauser
2c19f53e1b tabulated component: make it use some brains again
it seems that the issue which triggered to make the tabulation "dumb"
was not related to the tabulation. I guess that it had something to do
with the fact that I used -ffast-math without -fno-finite-math-only...
2012-07-12 21:24:34 +02:00
Andreas Lauser
980f69bf1b regularized brooks-corey: remove spline region for relative permeabilities 2012-07-12 21:24:34 +02:00
Andreas Lauser
62b0fbc125 more grr: next try on spurious valgrind complaints in the setMoleFraction() methods 2012-07-12 21:24:33 +02:00
Bernd Flemisch
c938c99ef6 add missing includes 2012-07-12 21:24:33 +02:00
Andreas Lauser
6a7d61e060 properties: remove all superfluous PTAG() invocations 2012-07-12 21:24:33 +02:00
Andreas Lauser
0ad9f7abe7 compositional fluid states: fix spurious valgrind complaints 2012-07-12 21:24:32 +02:00
Andreas Lauser
1496a72dcc 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
53dc4f47f4 remove warning-causing semicolons 2012-07-12 21:24:31 +02:00
Bernd Flemisch
713cbca842 removed some superfluous semicolons and commas causing warnings if -pedantic is used 2012-07-12 21:24:31 +02:00
Andreas Lauser
4b9109df4c H2O-N2 fluid system: also normalize the density if the complex relations are used
this is required to make sure that the relation

\rho^\kappa_g = X^\kappa_g \rho_g

holds unconditionally. note, that we define the sum of the mass
fractions to be the same as the sum of the mole fractions.

(also note, that this change only affects the case where the gas phase
is not present.)
2012-07-12 21:24:31 +02:00
Markus Wolff
1a6a0239ce added new fluid state for isothermal incompressible models
- used from decoupled models
2012-07-12 21:24:31 +02:00
Klaus Mosthaf
d1b230a910 corrected some typos, added some comments 2012-07-12 21:24:30 +02:00
Andreas Lauser
c898554306 fix the ncp flash test 2012-07-12 21:24:29 +02:00
Andreas Lauser
dea3f0ac07 H2O-N2 fluid system: fix heatCapacity()
that one was stupid even for my standards...
2012-07-12 21:24:29 +02:00
Andreas Lauser
375bc24242 tabulated component: be less intelligent
we used to tabulate along the vapor pressure curve. it turns out that
if a phase is not present, the component might get queried for
unphysical values, which lead to breakdowns. now we just sample the
specified pressure range uniformly...
2012-07-12 21:24:29 +02:00
Andreas Lauser
3b750e641e fluid states: recover from assigning non-finite values as mole fraction 2012-07-12 21:24:29 +02:00
Bernd Flemisch
b7ef17c119 added more tests to CMakeLists, removed check for WaterContaminantFluidSystem 2012-07-12 21:24:28 +02:00
Bernd Flemisch
40c9ed4e79 remove unnecessary pardiso.hh includes 2012-07-12 21:24:28 +02:00
Bernd Flemisch
f9029c1bfa remove unused headers 2012-07-12 21:24:28 +02:00
Andreas Lauser
021b3f3cc8 fix compilation on g++ 4.2 2012-07-12 21:24:28 +02:00
Andreas Lauser
488f5dc4c8 fluid states: fix the documentation
IMHO it is perfectly okay to have some references to wikipedia for
basic stuff. Reason: Other online sources are also not reliable and
can usually found in the reference section of the wikipedia
article. (also, even for normal textbooks, there are the occational
errors.)
2012-07-12 21:24:28 +02:00
Benjamin Faigle
67f146b783 improved documentation 2012-07-12 21:24:28 +02:00
Andreas Lauser
3d92e604cb H2O-N2 fluid system: some cosmetic cleanup of the viscosity 2012-07-12 21:24:28 +02:00
Andreas Lauser
a7d1339292 brine: add heatCapacity() methods 2012-07-12 21:24:28 +02:00