Commit graph

6 commits

Author SHA1 Message Date
Henrik Rusche
ff0871caf9 Fixing merge errors 2016-05-30 10:40:08 +02:00
Henrik Rusche
c0dc374d98 Merge PISO/PIMPLE solver updates. Author: Vanja Skuric. Merge: Henrik Rusche
Conflicts:
	applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
	applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
	applications/solvers/compressible/steadyCompressibleMRFFoam/createFields.H
	applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H
	applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H
	applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H
	applications/solvers/coupled/MRFPorousFoam/createFields.H
	applications/solvers/coupled/pUCoupledFoam/createFields.H
	tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
	tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes
	tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes
	tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes
	tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSchemes
	tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/fvSchemes
	tutorials/equationReader/equationReaderDemo/pitzDaily/system/fvSchemes
	tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSchemes
	tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
	tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
	tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/system/fvSchemes
	tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSchemes
	tutorials/incompressible/pUCoupledFoam/cavity/system/fvSchemes
	tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/system/fvSchemes
2016-05-29 16:37:07 +02:00
Vanja Skuric
620e1ce085 Backported sonicFoam, sonicDyMFoam, sonicLiquidFoam and tutorials (vanilla OF 3.0.1) 2016-05-27 00:17:32 +02:00
Hrvoje Jasak
8cf4b6fcd5 Enable full gradient cacheing capability 2016-05-09 11:03:58 +01:00
Hrvoje Jasak
f206e5ffec Bugfix: Compressible solver update
Conflicts:
	applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
2016-01-05 14:52:10 +00:00
Hrvoje Jasak
5226480f2c Ready for compilation 2010-08-26 15:22:03 +01:00