Merge branch 'master' into cvm (d205a84e) · Commits · Development / openfoam

Commit d205a84e authored 13 years ago by

mattijs

Merge branch 'master' into cvm

Conflicts:
	src/meshTools/searchableSurface/closedTriSurfaceMesh.C
	src/meshTools/searchableSurface/closedTriSurfaceMesh.H

parents 4da59cd0 20ee9190

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/combustion/dieselEngineFoam/Make/options 3 additions, 1 deletion

...ications/solvers/combustion/dieselEngineFoam/Make/options
applications/solvers/combustion/dieselEngineFoam/YEqn.H 7 additions, 4 deletions

applications/solvers/combustion/dieselEngineFoam/YEqn.H
applications/solvers/combustion/dieselEngineFoam/createFields.H 15 additions, 22 deletions

...ations/solvers/combustion/dieselEngineFoam/createFields.H
applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C 2 additions, 29 deletions

...ns/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
applications/solvers/combustion/dieselEngineFoam/hsEqn.H 11 additions, 4 deletions

applications/solvers/combustion/dieselEngineFoam/hsEqn.H
applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H 0 additions, 18 deletions

...rs/combustion/dieselEngineFoam/readCombustionProperties.H
applications/solvers/combustion/dieselFoam/Make/options 4 additions, 2 deletions

applications/solvers/combustion/dieselFoam/Make/options
applications/solvers/combustion/dieselFoam/dieselFoam.C 3 additions, 28 deletions

applications/solvers/combustion/dieselFoam/dieselFoam.C
applications/solvers/combustion/fireFoam/YhsEqn.H 4 additions, 4 deletions

applications/solvers/combustion/fireFoam/YhsEqn.H
applications/solvers/combustion/fireFoam/createFields.H 13 additions, 29 deletions

applications/solvers/combustion/fireFoam/createFields.H
applications/solvers/combustion/fireFoam/fireFoam.C 1 addition, 3 deletions

applications/solvers/combustion/fireFoam/fireFoam.C
applications/solvers/combustion/fireFoam/readChemistryProperties.H 0 additions, 23 deletions

...ons/solvers/combustion/fireFoam/readChemistryProperties.H
applications/solvers/combustion/reactingFoam/Make/options 4 additions, 2 deletions

applications/solvers/combustion/reactingFoam/Make/options
applications/solvers/combustion/reactingFoam/YEqn.H 7 additions, 3 deletions

applications/solvers/combustion/reactingFoam/YEqn.H
applications/solvers/combustion/reactingFoam/chemistry.H 0 additions, 44 deletions

applications/solvers/combustion/reactingFoam/chemistry.H
applications/solvers/combustion/reactingFoam/createFields.H 16 additions, 22 deletions

applications/solvers/combustion/reactingFoam/createFields.H
applications/solvers/combustion/reactingFoam/hsEqn.H 1 addition, 1 deletion

applications/solvers/combustion/reactingFoam/hsEqn.H
applications/solvers/combustion/reactingFoam/reactingFoam.C 1 addition, 10 deletions

applications/solvers/combustion/reactingFoam/reactingFoam.C
applications/solvers/combustion/reactingFoam/readChemistryProperties.H 0 additions, 23 deletions

...solvers/combustion/reactingFoam/readChemistryProperties.H
applications/solvers/combustion/rhoReactingFoam/Make/options 4 additions, 2 deletions

applications/solvers/combustion/rhoReactingFoam/Make/options

with 96 additions and 274 deletions

Please register or to comment

Admin message

Merge branch 'master' into cvm