merge with master + fix conflicts in tuts/mesh
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- applications/solvers/DNS/dnsFoam/dnsFoam.C 14 additions, 15 deletionsapplications/solvers/DNS/dnsFoam/dnsFoam.C
- applications/solvers/Lagrangian/kinematicParcelFoam/Make/files 0 additions, 3 deletions...cations/solvers/Lagrangian/kinematicParcelFoam/Make/files
- applications/solvers/combustion/PDRFoam/Make/options 2 additions, 2 deletionsapplications/solvers/combustion/PDRFoam/Make/options
- applications/solvers/combustion/PDRFoam/PDRFoam.C 24 additions, 25 deletionsapplications/solvers/combustion/PDRFoam/PDRFoam.C
- applications/solvers/combustion/PDRFoam/StCourantNo.H 15 additions, 13 deletionsapplications/solvers/combustion/PDRFoam/StCourantNo.H
- applications/solvers/combustion/PDRFoam/bEqn.H 2 additions, 2 deletionsapplications/solvers/combustion/PDRFoam/bEqn.H
- applications/solvers/combustion/PDRFoam/createFields.H 9 additions, 8 deletionsapplications/solvers/combustion/PDRFoam/createFields.H
- applications/solvers/combustion/PDRFoam/hEqn.H 1 addition, 1 deletionapplications/solvers/combustion/PDRFoam/hEqn.H
- applications/solvers/combustion/PDRFoam/huEqn.H 1 addition, 1 deletionapplications/solvers/combustion/PDRFoam/huEqn.H
- applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H 1 addition, 2 deletions.../PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
- applications/solvers/combustion/PDRFoam/pEqn.H 3 additions, 3 deletionsapplications/solvers/combustion/PDRFoam/pEqn.H
- applications/solvers/combustion/XiFoam/Make/options 2 additions, 2 deletionsapplications/solvers/combustion/XiFoam/Make/options
- applications/solvers/combustion/XiFoam/XiFoam.C 24 additions, 25 deletionsapplications/solvers/combustion/XiFoam/XiFoam.C
- applications/solvers/combustion/XiFoam/bEqn.H 3 additions, 3 deletionsapplications/solvers/combustion/XiFoam/bEqn.H
- applications/solvers/combustion/XiFoam/createFields.H 10 additions, 9 deletionsapplications/solvers/combustion/XiFoam/createFields.H
- applications/solvers/combustion/XiFoam/hEqn.H 1 addition, 1 deletionapplications/solvers/combustion/XiFoam/hEqn.H
- applications/solvers/combustion/XiFoam/huEqn.H 1 addition, 1 deletionapplications/solvers/combustion/XiFoam/huEqn.H
- applications/solvers/combustion/XiFoam/pEqn.H 5 additions, 5 deletionsapplications/solvers/combustion/XiFoam/pEqn.H
- applications/solvers/combustion/coldEngineFoam/Make/options 1 addition, 1 deletionapplications/solvers/combustion/coldEngineFoam/Make/options
Please register or sign in to comment