Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev (619b77e1) · Commits · Development / openfoam

Commit 619b77e1 authored 12 years ago by

Henry

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C

parents a8dcee25 11593b2e

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C 2 additions, 2 deletions

...on/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C 2 additions, 2 deletions

...ies/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
src/OpenFOAM/global/foamDoc.H 2 additions, 2 deletions

src/OpenFOAM/global/foamDoc.H
src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C 15 additions, 12 deletions

...essHeatExchangerSource/effectivenessHeatExchangerSource.C
src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H 1 addition, 1 deletion

...essHeatExchangerSource/effectivenessHeatExchangerSource.H
src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C 2 additions, 2 deletions

...ble/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C 2 additions, 2 deletions

...ceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C 2 additions, 2 deletions

src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
src/turbulenceModels/compressible/RAS/LRR/LRR.C 2 additions, 2 deletions

src/turbulenceModels/compressible/RAS/LRR/LRR.C
src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C 2 additions, 2 deletions

...ls/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C 2 additions, 2 deletions

...Models/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C 2 additions, 2 deletions

...rbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C 2 additions, 2 deletions

...WallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C 2 additions, 2 deletions

...silonWallFunction/epsilonWallFunctionFvPatchScalarField.C
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C 2 additions, 2 deletions

...s/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C 2 additions, 2 deletions

src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C 2 additions, 2 deletions

src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C 2 additions, 2 deletions

...ulenceModels/compressible/RAS/realizableKE/realizableKE.C
src/turbulenceModels/compressible/RAS/v2f/v2f.C 1 addition, 1 deletion

src/turbulenceModels/compressible/RAS/v2f/v2f.C
src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H 6 additions, 0 deletions

...enceModels/compressible/turbulenceModel/turbulenceModel.H

with 55 additions and 46 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev