openfoam/tutorials
Henry 10332e4fff Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev
Conflicts:
	src/thermophysicalModels/basic/Make/files
	src/thermophysicalModels/basic/basicThermo/basicThermo.C
	src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
	src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
	src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
	src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
	src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
2012-05-30 15:32:20 +01:00
..
basic ENH: tutorial input file updates related to DataEntry changes 2011-11-21 18:38:47 +00:00
combustion Thermodynamics: Rationalization 2012-05-30 15:19:38 +01:00
compressible Thermodynamics: Rationalization 2012-05-30 15:19:38 +01:00
discreteMethods Copyright transfered to the OpenFOAM Foundation 2011-08-14 12:17:30 +01:00
DNS/dnsFoam/boxTurb16 Removed trailing whitespace 2012-04-19 14:17:30 +01:00
electromagnetics GIT: Resolve conflict 2011-08-16 16:09:56 +01:00
financial/financialFoam/europeanCall GIT: Resolve conflict 2011-08-16 16:09:56 +01:00
heatTransfer Thermodynamics: Rationalization 2012-05-30 15:19:38 +01:00
incompressible Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev 2012-05-25 13:50:57 +01:00
lagrangian Thermodynamics: Rationalization 2012-05-30 15:19:38 +01:00
mesh ENH: blob: updated tutorial 2012-05-17 12:58:47 +01:00
multiphase Solvers and tutorials: changed use of buoyantPressure BC to fixedFluxPressure 2012-04-20 09:49:58 +01:00
resources/geometry ENH: Moved STL surface to tutorial resources and updated scripts 2011-11-28 14:57:14 +00:00
stressAnalysis STY: Changing version in header 2011-11-02 11:02:03 +00:00
Allclean
Allrun Copyright transfered to the OpenFOAM Foundation 2011-08-14 12:17:30 +01:00
Alltest Thermodynamics: Rationalization 2012-05-30 15:21:32 +01:00