Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev (906acdcd) · Commits · Development / openfoam

Commit 906acdcd authored 13 years ago by

mattijs

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C

parents 2d53acd4 27e9485e

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/combustion/fireFoam/Make/options 2 additions, 4 deletions

applications/solvers/combustion/fireFoam/Make/options
applications/solvers/combustion/fireFoam/createPyrolysisModel.H 1 addition, 4 deletions

...ations/solvers/combustion/fireFoam/createPyrolysisModel.H
applications/solvers/combustion/fireFoam/fireFoam.C 2 additions, 2 deletions

applications/solvers/combustion/fireFoam/fireFoam.C
applications/solvers/combustion/fireFoam/readPyrolysisTimeControls.H 1 addition, 1 deletion

...s/solvers/combustion/fireFoam/readPyrolysisTimeControls.H
applications/solvers/combustion/fireFoam/solidRegionDiffusionNo.H 1 addition, 1 deletion

...ions/solvers/combustion/fireFoam/solidRegionDiffusionNo.H
applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C 1 addition, 1 deletion

...ble/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C 0 additions, 6 deletions

...ations/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C 0 additions, 6 deletions

...oam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C 0 additions, 6 deletions

...impleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
applications/solvers/compressible/rhoSimpleFoam/pEqn.H 1 addition, 1 deletion

applications/solvers/compressible/rhoSimpleFoam/pEqn.H
applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C 0 additions, 3 deletions

...impleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C 0 additions, 3 deletions

...ations/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C 0 additions, 8 deletions

...ions/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
applications/solvers/heatTransfer/buoyantBaffleSimpleFoam/buoyantBaffleSimpleFoam.C 0 additions, 3 deletions

...ransfer/buoyantBaffleSimpleFoam/buoyantBaffleSimpleFoam.C
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C 0 additions, 5 deletions

...buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C 0 additions, 2 deletions

...buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C 0 additions, 5 deletions

...olvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C 0 additions, 3 deletions

...olvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C 0 additions, 3 deletions

...r/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/Allwclean 0 additions, 1 deletion

...cations/solvers/heatTransfer/chtMultiRegionFoam/Allwclean

with 9 additions and 68 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev