Commit graph

5 commits

Author SHA1 Message Date
Henrik Rusche
6ff530f2ba Merge error divDevRhoReff changed 2016-06-07 16:27:05 +02:00
Henrik Rusche
2477805d86 Merged Christian's update 2016-06-06 17:38:44 +02:00
Henrik Rusche
09a06be1a4 Merge branch 'nextRelease' into feature/fullyIntegratedRealGasThermo
Conflicts:
	src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
	src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
	src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
2016-05-31 14:30:51 +02:00
morgoth
72ea9d2d6f solver, tutorial +mixClasses changed 2016-05-12 12:46:39 +02:00
Christian Lucas
4ce8687b97 included real gas thermo in extend 3.1 2015-08-23 16:26:27 +02:00