adapted templates in diffusivityconstanttau.hh, which wasn't used
anyway.
added rhoSolid to the thermalconductivitylaws.
updated some comments and GNU licence.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14430 2fb0f335-1f38-0410-981e-8018bf24f1b0

by doxygen.
- One more small change in a unit in co2.hh.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14370 2fb0f335-1f38-0410-981e-8018bf24f1b0

Reviewed by Alex

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14369 2fb0f335-1f38-0410-981e-8018bf24f1b0

In some places, property retrievals of the form
GET_PROP...(TypeTag, PTAG(...))
can still be found. The use of PTAG is not required for a very long time
already. This patch replaces such calls by
GET_PROP...(TypeTag, ...)

Reviewed by gruenich.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14240 2fb0f335-1f38-0410-981e-8018bf24f1b0

Changed floating point comparisons. For comparisons with zero an absolute criteria is used, otherwise a relative one.

Reviewed by Timo 

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14145 2fb0f335-1f38-0410-981e-8018bf24f1b0

(reviewed by natalies)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14086 2fb0f335-1f38-0410-981e-8018bf24f1b0

This implements FS#216.

The "heatCapacity" function of the spatial parameters and the volume
variables for the implicit nonisothermal models was a misnomer, since it
returned an effective quantity, namely, 
heatCapacity*density*(1 - porosity) in [J/(K m^3)].
Except for mpnc, which resulted in an additional inconsistency.

Corresponding to the decision documented in FS#216, this patch renames
the function to "solidHeatCapacity" and returns always the "true"
(non-effective) heat capacity in [J/(kg K)]. This requires an additional
function "solidDensity" which returns the mass density of the porous
matrix. Moreover, the functions "thermalConductivitySolid/Fluid" are
renamed to "solid/fluidThermalConductivity". The decision to prepend
with "solid/fluid" rather than to append is motivated by consistency
with components and fluid systems, where "gas" and "liquid" are always
prepended to the corresponding function names.

_Beware_: this change breaks compatibility. You have to adapt your
spatial parameters such that they offer functions "solidHeatCapacity",
"solidDensity" and "solidThermalConductivity".

Reviewed by Alex.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14070 2fb0f335-1f38-0410-981e-8018bf24f1b0

- implemented heat capacity from already existing component heat
  capacities in h2oairfluidsystem.hh
- implemented return functions for moleFraction, temperature, and heat
  capacity in fluxVars



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13872 2fb0f335-1f38-0410-981e-8018bf24f1b0

They were only deprecated by a comment, now warnings
are emitted.
(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13750 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13453 2fb0f335-1f38-0410-981e-8018bf24f1b0

fixed latex part of doxygen comments


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13441 2fb0f335-1f38-0410-981e-8018bf24f1b0

Write it lower case to ease release manager's duty.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13439 2fb0f335-1f38-0410-981e-8018bf24f1b0

- Deprecated the 3p3cni model
- Added effective thermal conductivity calculation in fluidmatrixinteractions for 3p
- Added thermal conductivity functions to the 3p fluidsystem h2oairmesitylen.hh and h2oairxylene.hh
- Upddated the 3p3cni test for the generic non-isothermal model
- Changed the reference vtus for the two tests, since results are slightly different due to different thermal conductivities


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13427 2fb0f335-1f38-0410-981e-8018bf24f1b0

resolving make headercheck errors

reviewed by C.Grueninger



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13412 2fb0f335-1f38-0410-981e-8018bf24f1b0

changing dim-matrices to dimWorld-matrices, needed for dim!=dimWorld grids

reviewed by A.Kissinger



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13392 2fb0f335-1f38-0410-981e-8018bf24f1b0

removed file which was deprecated a year ago

reviewed by martinb


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13382 2fb0f335-1f38-0410-981e-8018bf24f1b0

updated doxygen docu, there are still 7 warnings are produced


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13381 2fb0f335-1f38-0410-981e-8018bf24f1b0

changing dim-vectors to dimWorld-vectors, needed for dim!=dimWorld grids

reviewed by A.Kissinger



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13376 2fb0f335-1f38-0410-981e-8018bf24f1b0

updated doxgen docu, 3 warnings left


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13350 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13292 2fb0f335-1f38-0410-981e-8018bf24f1b0

conductivities, correct comments and spacing.

The additional properties required by the generic non-isothermal model
can be centralized in a file niproperties.hh. 

The signature of the effectiveThermalConductivity functions is unified.
They get the volume variables, spatial parameters and the arguments that
will be required for calling the spatial parameters. When attempting to
use the nonisothermal model for 3p3c, it will be seen whether this
signature is genral enough.

Reviewed by Alex K.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13289 2fb0f335-1f38-0410-981e-8018bf24f1b0

correct use of wildcards, add ALUGrid flags to tests with AMG.

Merge revisions 12949, 13246 and 13248 from the strip-pdelab branch.
They all improve the buildsystem behavior.

Thanks to Markus Blatt for the work.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13282 2fb0f335-1f38-0410-981e-8018bf24f1b0

- The implicit 1p2c model is ready to use with the non-isothermal model
- Added 1p fluidmatrixinteractions to calculate effective thermal conductivity of fluid and solid
- Adjusted test/implicit/1p2c:
	- 1p2coutflowproblem.hh can be switched to nonisothermal
	- 1p2cconductionproblem.hh compares the model results to a simple analytical model
	- 1p2cconvectionproblem.hh compares the model results to another simple analytical model

Reviewed by Bernd

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13264 2fb0f335-1f38-0410-981e-8018bf24f1b0

The correct usage of wildcards is "$(wildcard *.hh)".
With this patch we use these instead of "*.hh".

Quoting from https://www.gnu.org/software/make/manual/html_node/Wildcard-Examples.html#Wildcard-Examples

Wildcard expansion does not happen when you define a variable. Thus, if you write this:

     objects = *.o

then the value of the variable objects is the actual string ‘*.o’. However, if you use the value of objects in a target or prerequisite, wildcard expansion will take place there. If you use the value of objects in a recipe, the shell may perform wildcard expansion when the recipe runs. To set objects to the expansion, instead use:

     objects := $(wildcard *.o)



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/branches/strip-pdelab@13248 2fb0f335-1f38-0410-981e-8018bf24f1b0

included the energy fluxes transported by the diffusive component fluxes
times the enthalpy of the components
applies only for the free flow region

reviewed by Bernd and Vishal


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13165 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12924 2fb0f335-1f38-0410-981e-8018bf24f1b0

(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12836 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12756 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12755 2fb0f335-1f38-0410-981e-8018bf24f1b0

Local chemical equilibrium and local thermal non-equilibrium with two energy equations. 

A new fluidsystem with constant properties is implemented. 

The fluid temperature on the right boundary is verified by an analytical approximation for the stationary configuration.

reviewed by Christoph

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12743 2fb0f335-1f38-0410-981e-8018bf24f1b0

adding the heatpipelaw from devel to stable. This relation gives capillary pressure as a function of interfacial tension, permeability and porosity. It was prominently used in Udell (1985), but is also known as Leverett Function. 

reviewed (like the last commit) by Christoph

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12742 2fb0f335-1f38-0410-981e-8018bf24f1b0

- it is now possible to specify the number of solved energy equations (property NumEnergyEquations). 
Either 0 isothermal
	1 standard-nonisothermal
	2 *new* one energy equation for the void-space and one for the solid
	3 one energy equation for each phase (wetting, non-wetting, solid)
	
Therefore, the boolean property EnableKineticEnergy had to be renamed to the integer property NumEnergyEquations

- solve bug in test_boxmpnckinetic


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12741 2fb0f335-1f38-0410-981e-8018bf24f1b0

to prevent breakdown of the linear solver in completeFluidState_.

Reviewed by Philipp.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12586 2fb0f335-1f38-0410-981e-8018bf24f1b0

Add functions for the heat capacity to the components air and co2, that will be required by the decoupled NI-model. Enabled acess to these methods in the co2-brine-fluidsystem (only pure-phase heat capacities are used).
reviewed by Klaus

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12462 2fb0f335-1f38-0410-981e-8018bf24f1b0

(reviewed by karens)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12442 2fb0f335-1f38-0410-981e-8018bf24f1b0

length = 150, thanks to kristopherg

reviewed by fetzer


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12429 2fb0f335-1f38-0410-981e-8018bf24f1b0

Regularize the reduced temperature beyond the critical point of water. This will *not* lead to physically meaningful results, but increases stability if there are intermediate hot states in a simulation. 

reviewed by Benjamin

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12425 2fb0f335-1f38-0410-981e-8018bf24f1b0

fluidsystems: call component enthalpies with phase pressure not with
partial pressure

this was discussed with Klaus, Holger, Philipp and Bernd. The
enthalpies can be called with the partial pressure and be summed up directly,
or they can be called  with the phase pressure and are then weighted by
the mass fractions. Klaus compared the two possibilities and found only
minor differences.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12402 2fb0f335-1f38-0410-981e-8018bf24f1b0

Remove the incremental upate of mean molar mass. I.e. the mean molar mass is re-calculated every time a mole fraction is set. This means more calculations, but before random errors occured. In other words: this is more stable.
reviewed by Bernd

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12215 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12088 2fb0f335-1f38-0410-981e-8018bf24f1b0