Commit Graph

159 Commits

Author SHA1 Message Date
Andreas Lauser
ed13754ff8 change names according to the meeting on monday 2012-07-12 21:22:28 +02:00
Andreas Lauser
8121eae709 cleanup: remove all #ifdef HAVE_DUNE_PDELAB
(PDELab has been mandatory for quite some time)
2012-07-12 21:22:28 +02:00
Andreas Lauser
6ff3bec068 tutorials: convert to new structure 2012-07-12 21:22:28 +02:00
Andreas Lauser
e036e578be 2p2c box model: convert to new structure 2012-07-12 21:22:28 +02:00
Andreas Lauser
63ebb939bf big cleanup
timemanager API, restart, boxmodel are affected
2012-07-12 21:22:27 +02:00
Andreas Lauser
c07de5d462 sync with splitting point 2012-07-12 21:21:06 +02:00
Andreas Lauser
6a577ed3b9 add missing includes and propery tag definitions, remove init function from the component base class 2012-07-11 23:30:08 +02:00
Andreas Lauser
e836bee2bd material: make the components settable without specifying a new fluidsystem 2012-07-11 23:30:08 +02:00
Benjamin Faigle
511779dc74 added a property to select the description of water (simple, iapws, tabulated...). this plus initialization call should be done in problem-files. 2012-07-11 23:30:08 +02:00
Philipp Nuske
2ea2e7f756 ia models need SwtoSwe from outsided directly, therefore made public 2012-07-11 23:30:08 +02:00
Bernd Flemisch
a8bb762684 continued restructuring. 2012-07-11 23:29:58 +02:00
Markus Wolff
40d8fe5010 capped regularized brooks-corey law added
- kr cannot be larger than 1
2012-07-11 23:29:18 +02:00
Bernd Flemisch
bc1c8a7310 1p box model adapted to new material system 2012-07-11 23:29:17 +02:00
Andreas Lauser
7dbab4b37a sanitize white space
replace eacg tab by 4 spaces and remove the spaces at line ends. we
should do this more often!
2012-07-11 23:29:17 +02:00
Andreas Lauser
2b9baf12d2 h2o_n2 fluid system: change equilibrium calculation
when only gas phase is present, use mole fraction times total pressure
as the partial pressure for the component. it seems like the inverse
of the partial density is not consistent with this approach. why this
is the case is a mystery to me...
2012-07-11 23:29:17 +02:00
Bernd Flemisch
f50ccd2dee changed from new_decoupled to decoupled, introduced substructuring in test/decoupled, moved 2p2c stuff from test/fractionalflow to test/decoupled 2012-07-11 23:29:12 +02:00
Melanie Darcis
3edce1c824 change enthalpy and internalEnergy to phaseEnthalpy and phaseInternalEnergy 2012-07-11 23:28:34 +02:00
Markus Wolff
dd6c3fdb10 linear material law limited to the range 0 - 1 2012-07-11 23:28:33 +02:00
Bernd Flemisch
6e189635af component Unit added 2012-07-11 23:28:33 +02:00
Bernd Flemisch
298b8271b6 included fmatrix.hh in settablephase.hh 2012-07-11 23:28:33 +02:00
Melanie Darcis
942413befc documentation: citations included 2012-07-11 23:28:32 +02:00
Andreas Lauser
9ec7761bf6 2pNc/material: rename degasPressure to fugacityCoeff 2012-07-11 23:28:32 +02:00
Andreas Lauser
742be17629 material: change calculation of the liquid density in H2O+N2 fluid system 2012-07-11 23:28:32 +02:00
Andreas Lauser
7a59b3287c h2o_IAPWS: fix regulatization
we need to use the vapor pressure if we're unphysical!
2012-07-11 23:28:32 +02:00
Philipp Nuske
f3f0c95856 something that looks like hysteresis last argument: 5e3 almost for sure only artefact 2012-07-11 23:28:32 +02:00
Andreas Lauser
38ed7d3b9b fix compilation of H2 and O2 components 2012-07-11 23:28:32 +02:00
Andreas Lauser
708407d9fe change the API to calculating the termodynamic equilibrium in the fluid systems
now we just have a computeEquilibrium method which is responsible for doing
everything. no more messing around with partial pressures!
2012-07-11 23:28:32 +02:00
Andreas Lauser
28d44cf3d7 rename pcMinSw() method of the regularized brooks-corey law to thresholdSw()
the relative permeabilities don't need a threshold anymore...
2012-07-11 23:28:31 +02:00
Andreas Lauser
257ebeacc3 fix regularized brooks corey material law
there was a discontinuity at Swe = 1 and the splines at the upper part
of the relative permeabilities have been replaced by straight lines.
2012-07-11 23:28:31 +02:00
Andreas Lauser
ac988567b4 fix computePartialPressures() for the H2O-N2 and Brine-CO2 fluid systems 2012-07-11 23:28:31 +02:00
Andreas Lauser
ada5d1c976 use the enthalpy relations for ideal gases from Reid'87 for all components where nothing better is available 2012-07-11 23:28:31 +02:00
Andreas Lauser
44ca4dc866 add material law which can be used for the GDLs of fuel cells.
Actually it can be used with any capillary pressure-saturation curve
which was obtained experimentally. Maybe ExperimentalDataLaw would be
a better name...
2012-07-11 23:28:30 +02:00
Andreas Lauser
0667230e26 some tiny cleanups in the co2 component and h2o_n2 fluid system, make the simple_h2o_n2 fluid system work again 2012-07-11 23:28:30 +02:00
Bernd Flemisch
a49341ff8c removed unnecessary include dumux/box/boxproperties.hh 2012-07-11 23:28:30 +02:00
Andreas Lauser
8298ad8ce8 change the new material laws so that they behave as decided in the last dumux material laws meeting
This significantly reduces the need for nesting typedefs because a
material law with absolute saturations as input parameters can be
defined like:

 typedef RegularizedVanGenuchten<Scalar> EffectiveSatLaw;
 typedef EffToAbsLaw<EffectiveSatLaw> AbsoluteSatLaw;

Basically, the material laws can now be considered complete...
2012-07-11 23:28:29 +02:00
Andreas Lauser
c4d282929d change namespace from Dune to Dumux and fix a few compilation issues
I tried to catch most stuff, but occationally Dune:: prefix is
required for stuff which is provided by DUNE and sometimes the Dune::
prefix needs to be changed to Dumux:: for stuff which is part of DuMuX
2012-07-11 23:28:29 +02:00
Andreas Lauser
93c1818313 introduce context objects 2012-07-11 23:28:28 +02:00
Markus Wolff
2828afdcfd linearmaterial splitted into normal and regularized part
- regularized: kr curves regularized with splines at beginning and the
     SEff lines
2012-07-11 23:28:28 +02:00
Andreas Lauser
d16171da3b add missing file 2012-07-11 23:28:28 +02:00
Andreas Lauser
2551a7a14c lots of cleanups in the 2p models, some cleanups in the CO2 laws
- make it possible to use the 2p fluid state in conjunction with fluid
  systems which require the phase composition
- make the 2pni model and tests work
- move the ifp application from appl/co2-ifp to appl/co2/ifp
- add the benchmark3 CO2 problem (i.e. kezin formation)
- make the benchmark3 problem compile. the 2pni part works, but not in parallel
- fix a most stupid bug in the h2o_n2 fluid system (temperature and pressure
  parameters for the density() method were integers)
- improve the end-of-iteration output of the 2p models (now it also
  prints the vertex and the primary variable which where the defect is
  worst.)
- add the salinity used to calculate the CO2 properties to the
  generated output. this avoids inconsistencies between the tabulation
  and the brine properties used by the simulation.
- use this salinity value in the brine_co2 system
2012-07-11 23:28:28 +02:00
Jochen Fritz
90ca51541e 2012-07-11 23:28:27 +02:00
Andreas Lauser
5656dda1e2 various name changes in the models using the new material laws, CO2 improvements
- change phaseState -> fluidState
- also use the tabulated CO2 solubility
- update the CO2 tabulation utility to generate the corrosponding tables
- in the Brine-CO2 system do not ask the CO2 for anything if the pressure is to low
- do not call updateStaticData() in initial() of the box scheme in order to avoid
  the 2p2c model from breaking down if the initial condidition requires a change in
  the present phases
- update the IFP problem to include a much larger CO2 table. this was made possible
  by the fact that calculating the CO2 solubility in the extraction utility is now _much_
  faster than it used to be
- add SimpleCO2 class (currently it is basically useless besides retrieving the triple
  and critical points)
2012-07-11 23:28:24 +02:00
Andreas Lauser
8ebcff6b06 add partial pressures to vtk output of the 2p2c model 2012-07-11 23:28:24 +02:00
Andreas Lauser
d20fe85a5f add components for brine and co2, provide a fluid system for them 2012-07-11 23:28:23 +02:00
Andreas Lauser
88bcf9ba3b remove incorrect regularization from the h2o_n2 fluid system
now that the base h2o class is regularized this is not necessary
2012-07-11 23:28:23 +02:00
Andreas Lauser
c66d4d8020 make the verbosity of the tabulated component class changeable 2012-07-11 23:28:23 +02:00
Andreas Lauser
33c90951fb some cleanups in the simple water class 2012-07-11 23:28:23 +02:00
Andreas Lauser
0dea084c70 properly regularize the IAPWS water properties for unphysical values
... and suddenly all headaches go away. Yeah :)
2012-07-11 23:28:23 +02:00
Andreas Lauser
3c29ccfef1 change the interface of the h2o_n2 fluid system to allow arbitrary equations of state 2012-07-11 23:28:23 +02:00
Andreas Lauser
29350f1f3a split the IAPWS water fluid properties into multiple files.
this makes it easier to implement additional regions and cleans up the
H2O class quite a bit.
2012-07-11 23:28:23 +02:00