Merge branch 'master' into cvm
Conflicts: src/OpenFOAM/meshes/boundBox/boundBox.H
Showing
- Allwmake 6 additions, 0 deletionsAllwmake
- COPYING 1 addition, 1 deletionCOPYING
- applications/Allwmake 6 additions, 0 deletionsapplications/Allwmake
- applications/solvers/DNS/dnsFoam/dnsFoam.C 2 additions, 2 deletionsapplications/solvers/DNS/dnsFoam/dnsFoam.C
- applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H 4 additions, 2 deletionsapplications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
- applications/solvers/basic/laplacianFoam/laplacianFoam.C 1 addition, 1 deletionapplications/solvers/basic/laplacianFoam/laplacianFoam.C
- applications/solvers/basic/laplacianFoam/write.H 1 addition, 1 deletionapplications/solvers/basic/laplacianFoam/write.H
- applications/solvers/basic/potentialFoam/potentialFoam.C 1 addition, 1 deletionapplications/solvers/basic/potentialFoam/potentialFoam.C
- applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C 1 addition, 1 deletion...s/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
- applications/solvers/combustion/PDRFoam/PDRFoam.C 1 addition, 1 deletionapplications/solvers/combustion/PDRFoam/PDRFoam.C
- applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C 1 addition, 1 deletionapplications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
- applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C 15 additions, 11 deletions...Foam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
- applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H 1 addition, 1 deletion...Foam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
- applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C 3 additions, 3 deletions...ion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
- applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H 1 addition, 1 deletion...ion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C 2 additions, 2 deletions.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H 1 addition, 1 deletion.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C 1 addition, 1 deletion...RFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C 3 additions, 3 deletions...ers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H 1 addition, 1 deletion...ers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
Please register or sign in to comment