GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 09:32:38 +00:00
246 changed files with 4020 additions and 788 deletions

View File

@ -24,6 +24,9 @@ License
Application
PDRFoam
Group
grpCombustionSolvers
Description
Solver for compressible premixed/partially-premixed combustion with
turbulence modelling.
@ -54,16 +57,17 @@ Description
regions containing blockages which cannot be resolved by the mesh.
The fields used by this solver are:
betav: Volume porosity
Lobs: Average diameter of obstacle in cell (m)
Aw: Obstacle surface area per unit volume (1/m)
CR: Drag tensor (1/m)
CT: Turbulence generation parameter (1/m)
Nv: Number of obstacles in cell per unit volume (m^-2)
nsv: Tensor whose diagonal indicates the number to substract from
Nv to get the number of obstacles crossing the flow in each
direction.
\plaintable
betav | Volume porosity
Lobs | Average diameter of obstacle in cell (m)
Aw | Obstacle surface area per unit volume (1/m)
CR | Drag tensor (1/m)
CT | Turbulence generation parameter (1/m)
Nv | Number of obstacles in cell per unit volume (m^-2)
nsv | Tensor whose diagonal indicates the number to substract from
| Nv to get the number of obstacles crossing the flow in each
| direction.
\endplaintable
\*---------------------------------------------------------------------------*/

View File

@ -24,6 +24,9 @@ License
Application
XiFoam
Group
grpCombustionSolvers grpMovingMeshSolvers
Description
Solver for compressible premixed/partially-premixed combustion with
turbulence modelling.

View File

@ -24,6 +24,9 @@ License
Application
XiFoam
Group
grpCombustionSolvers
Description
Solver for compressible premixed/partially-premixed combustion with
turbulence modelling.

View File

@ -24,6 +24,9 @@ License
Application
chemFoam
Group
grpCombustionSolvers
Description
Solver for chemistry problems
- designed for use on single cell cases to provide comparison against

View File

@ -22,7 +22,10 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
engineFoam
coldEngineFoam
Group
grpCombustionSolvers grpMovingMeshSolvers
Description
Solver for cold-flow in internal combustion engines.

View File

@ -0,0 +1,30 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
You should have received a copy of the GNU General Public License along with
OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\defgroup grpCombustionSolvers Combustion solvers
@{
\ingroup grpSolvers
This group contains combustion solvers.
@}
\*---------------------------------------------------------------------------*/

View File

@ -24,6 +24,9 @@ License
Application
engineFoam
Group
grpCombustionSolvers
Description
Solver for internal combustion engines.

View File

@ -24,8 +24,11 @@ License
Application
fireFoam
Group
grpCombustionSolvers
Description
Transient PIMPLE solver for Fires and turbulent diffusion flames with
Transient PIMPLE solver for fires and turbulent diffusion flames with
reacting Lagrangian parcels, surface film and pyrolysis modelling.
\*---------------------------------------------------------------------------*/

View File

@ -24,6 +24,9 @@ License
Application
reactingFoam
Group
grpCombustionSolvers
Description
Solver for combustion with chemical reactions.

View File

@ -24,6 +24,9 @@ License
Application
rhoReactingBuoyantFoam
Group
grpCombustionSolvers
Description
Solver for combustion with chemical reactions using density based
thermodynamics package, using enahanced buoyancy treatment.

View File

@ -24,6 +24,9 @@ License
Application
rhoReactingFoam
Group
grpCombustionSolvers
Description
Solver for combustion with chemical reactions using density based
thermodynamics package.