Merge remote branch 'OpenCFD/master' into olesenm (c1857db5) · Commits · Development / openfoam

Commit c1857db5 authored 14 years ago by

Mark Olesen

Browse files

Merge remote branch 'OpenCFD/master' into olesenm

parents 14b4c384 397dad7e

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

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

...on/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H 2 additions, 1 deletion

...on/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options 2 additions, 0 deletions

...ions/solvers/heatTransfer/chtMultiRegionFoam/Make/options
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C 1 addition, 0 deletions

...vers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options 2 additions, 0 deletions

.../chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C 1 addition, 0 deletions

...nFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H 4 additions, 72 deletions

...onFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H 12 additions, 4 deletions

...oam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H 4 additions, 72 deletions

...heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H 12 additions, 4 deletions

...tTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H 6 additions, 4 deletions

...ransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
applications/solvers/multiphase/multiphaseInterFoam/Make/files 1 addition, 1 deletion

...cations/solvers/multiphase/multiphaseInterFoam/Make/files
applications/solvers/multiphase/multiphaseInterFoam/Make/options 2 additions, 4 deletions

...tions/solvers/multiphase/multiphaseInterFoam/Make/options
applications/solvers/multiphase/multiphaseInterFoam/createFields.H 1 addition, 1 deletion

...ons/solvers/multiphase/multiphaseInterFoam/createFields.H
applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C 1 addition, 1 deletion

...vers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C 17 additions, 12 deletions

...tactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H 16 additions, 16 deletions

...tactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C 6 additions, 5 deletions

...multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H 1 addition, 1 deletion

...multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C 56 additions, 29 deletions

...cations/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C

with 150 additions and 229 deletions

Please register or to comment

Admin message

Admin message

Merge remote branch 'OpenCFD/master' into olesenm