Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev (dee5c153) · Commits · Development / openfoam

Commit dee5c153 authored 15 years ago by

Andrew Heather

Browse files

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

parents 4e2dbe65 1ebc1c1a

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H 0 additions, 40 deletions

...ions/solvers/Lagrangian/reactingParcelFoam/createClouds.H
applications/solvers/combustion/coalChemistryFoam/Make/options 0 additions, 1 deletion

...cations/solvers/combustion/coalChemistryFoam/Make/options
applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C 4 additions, 6 deletions

.../solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
applications/solvers/combustion/coalChemistryFoam/createClouds.H 2 additions, 35 deletions

...tions/solvers/combustion/coalChemistryFoam/createClouds.H
applications/solvers/combustion/coalChemistryFoam/createFields.H 2 additions, 2 deletions

...tions/solvers/combustion/coalChemistryFoam/createFields.H
applications/solvers/combustion/coalChemistryFoam/rhoEqn.H 1 addition, 1 deletion

applications/solvers/combustion/coalChemistryFoam/rhoEqn.H
applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C 1 addition, 1 deletion

...fer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C 1 addition, 1 deletion

...buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/files 0 additions, 4 deletions

...ations/solvers/heatTransfer/chtMultiRegionFoam/Make/files
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options 1 addition, 3 deletions

...ions/solvers/heatTransfer/chtMultiRegionFoam/Make/options
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C 27 additions, 12 deletions

...vers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.C 0 additions, 186 deletions

...Transfer/chtMultiRegionFoam/coupleManager/coupleManager.C
applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManagerI.H 0 additions, 98 deletions

...ransfer/chtMultiRegionFoam/coupleManager/coupleManagerI.H
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperatureCoupled/solidWallHeatFluxTemperatureCoupledFvPatchScalarField.C 0 additions, 150 deletions

...d/solidWallHeatFluxTemperatureCoupledFvPatchScalarField.C
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C 191 additions, 91 deletions

...pled/solidWallMixedTemperatureCoupledFvPatchScalarField.C
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H 22 additions, 13 deletions

...pled/solidWallMixedTemperatureCoupledFvPatchScalarField.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H 3 additions, 5 deletions

...ions/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H 1 addition, 59 deletions

...heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/hEqn.H 11 additions, 3 deletions

...ions/solvers/heatTransfer/chtMultiRegionFoam/fluid/hEqn.H

with 270 additions and 711 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev