Commit Graph

365 Commits

Author SHA1 Message Date
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
Andreas Lauser
7fa134c3b7 tabulated component: also catch Dune::NotImplemented when creating the tables 2012-07-12 21:24:27 +02:00
Bernd Flemisch
b99d4b9365 changed to NonwettingPhase, since renaming has not been decided 2012-07-12 21:24:27 +02:00
Andreas Lauser
f65b45868b fix the fluid systems test.
{gas|liquid}HeatCapacity was not defined for the tabulated component
2012-07-12 21:24:27 +02:00
Andreas Lauser
3394db4ac9 h2o-n2 fluid systems: some further improvements
mainly to make the heat capacity consistent with the enthalpy
2012-07-12 21:24:27 +02:00
Andreas Lauser
ca53026549 H2O-N2 fluid system: some cleanups and corrections
- extend some comments
- assume an ideal mixture for gas everywhere, i.e. use the partial
  pressure to calculate the "partial" specific quantities like
  e.g. the specific partial enthalpies of water and nitrogen
- let the water and nitrogen component determine the "partial
  densities" of gas if the complex relations are enabled. before, an
  ideal gas was assumed. (now the individual components can be
  non-ideal gases, but we still assume an ideal mixture.)
2012-07-12 21:24:27 +02:00
Andreas Lauser
c26c960825 h2o-n2 fluid system: oops 2012-07-12 21:24:27 +02:00
Andreas Lauser
288cc638a3 H2O-N2 fluid system: implement heatCapacity() correctly 2012-07-12 21:24:27 +02:00
Andreas Lauser
766d400438 parameter cache: set the temperature and pressure exclude flags if updateComposition was called
for mixtures using cubic EOS, this means that the parameters of the
pure components do not need to be re-calculated if updateComposition()
is called. (they only depend on temperature!) this is a actually a
quite important optimization for cubic EOS because calculating the
parameters of the pure components is the most expensive part in
calculating parameters of the mixture.
2012-07-12 21:24:26 +02:00
Andreas Lauser
29ca3ae5fb avoid some compiler warnings 2012-07-12 21:24:26 +02:00
Andreas Lauser
0f7c940e23 make the peng-robinson EOS faster by tabulating the critical points
For cubic EOS, the critical values only depends on the attractive
paramter "a" and the co-volume of the fluid "b" which makes them an
easy prey for tabulation. also added: a class which does bi-linear
interpolation on an arbitrary function.

TODO: extend Dumux::Tabulated2DFunction so that upper and lower limit
      curves f(x) and g(x) can be specified and the sampling points do
      not need to be equidistant anymore. If this is done, use it for
      Dumux::TabulatedMaterial2.

MORE TODO: In Dumux::Tabulated2DFunction, do not use linear
           interpolation, but take the partial derivatives at the
           sampling points into account. then, interpolate the partial
           derivatives linearly between the sample points. I have not
           spend too much time thinking about the, though...
2012-07-12 21:24:26 +02:00
Andreas Lauser
3a3f0a0d9a introduce overlay fluid states for pressure, temperature and saturation
an overlay fluid state takes an arbitrary other fluid state as an
argument to which it forwards everything except the quantity which it
overlays.

also, the fluidsystems test now tests all fluid states for API conformance...
2012-07-12 21:24:26 +02:00
Andreas Lauser
f135ad5738 some fixes to the peng-robinson EOS and the base class of the parameter cache 2012-07-12 21:24:26 +02:00
Andreas Lauser
238a636452 decoupled: make test_dec2p2cproblem compile, fix include of "defaultcomponents.hh" in old_fluidsystems/h2o_n2_system.hh 2012-07-12 21:24:26 +02:00
Andreas Lauser
71ed920c65 H2O-N2 fluid system: avoid division by zero if composition of gas is zero
this fixes the NCP flash test
2012-07-12 21:24:26 +02:00
Andreas Lauser
6ff2720d44 do not include stuff from the property system in the fluid systems
this makes the fluid framework work standalone, as requested
e.g. today by Knuth-Andreas Lie of OPM fame...
2012-07-12 21:24:26 +02:00
Andreas Lauser
1a340e90d4 Added adapter to maintain usage of FluidSystem<TypeTag> 2012-07-12 21:24:26 +02:00
Andreas Lauser
4feb11a8a7 fix the non-equilibrium fluid state and the assign methods of both compositional fluid states 2012-07-12 21:24:26 +02:00