Commit c0537248 authored 14 years ago by graham

Merge branch 'master' into cvm

parents 3f81e7af 54ba1948

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
ReleaseNotes-dev 0 additions, 2 deletions

ReleaseNotes-dev
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C 1 addition, 1 deletion

...solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C 1 addition, 1 deletion

.../PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
applications/solvers/combustion/reactingFoam/chemistry.H 23 additions, 10 deletions

applications/solvers/combustion/reactingFoam/chemistry.H
applications/solvers/combustion/rhoReactingFoam/Make/options 3 additions, 1 deletion

applications/solvers/combustion/rhoReactingFoam/Make/options
applications/solvers/combustion/rhoReactingFoam/chemistry.H 0 additions, 28 deletions

applications/solvers/combustion/rhoReactingFoam/chemistry.H
applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C 5 additions, 6 deletions

...d/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options 4 additions, 2 deletions

...ons/solvers/lagrangian/LTSReactingParcelFoam/Make/options
applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H 6 additions, 3 deletions

...lvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H
applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H 2 additions, 2 deletions

...ons/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
applications/solvers/lagrangian/coalChemistryFoam/Make/options 6 additions, 2 deletions

...cations/solvers/lagrangian/coalChemistryFoam/Make/options
applications/solvers/lagrangian/coalChemistryFoam/chemistry.H 0 additions, 32 deletions

...ications/solvers/lagrangian/coalChemistryFoam/chemistry.H
applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options 4 additions, 2 deletions

...agrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options 3 additions, 1 deletion

...s/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options 6 additions, 2 deletions

...ngian/porousExplicitSourceReactingParcelFoam/Make/options
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H 0 additions, 31 deletions

...angian/porousExplicitSourceReactingParcelFoam/chemistry.H
applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options 6 additions, 2 deletions

...ns/solvers/lagrangian/reactingParcelFilmFoam/Make/options
applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H 0 additions, 32 deletions

...ons/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H
applications/solvers/lagrangian/reactingParcelFoam/Make/options 6 additions, 2 deletions

...ations/solvers/lagrangian/reactingParcelFoam/Make/options

with 78 additions and 162 deletions

Please register or to comment