GIT: Resolved merge conflict when merging develop branch
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Allwmake 4 additions, 4 deletionsAllwmake
- README.md 2 additions, 2 deletionsREADME.md
- applications/Allwmake 2 additions, 2 deletionsapplications/Allwmake
- applications/solvers/basic/laplacianFoam/Make/options 1 addition, 0 deletionsapplications/solvers/basic/laplacianFoam/Make/options
- applications/solvers/basic/laplacianFoam/createFields.H 30 additions, 28 deletionsapplications/solvers/basic/laplacianFoam/createFields.H
- applications/solvers/basic/scalarTransportFoam/createFields.H 43 additions, 41 deletions...ications/solvers/basic/scalarTransportFoam/createFields.H
- applications/solvers/combustion/PDRFoam/Make/options 2 additions, 2 deletionsapplications/solvers/combustion/PDRFoam/Make/options
- 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/PDRDragModelNew.C 1 addition, 1 deletion...RFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
- applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C 2 additions, 2 deletions...bustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
- applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C 1 addition, 1 deletion...tion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
- applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C 2 additions, 2 deletions...combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
- applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C 1 addition, 1 deletion...bustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
- applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C 2 additions, 2 deletions...ons/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
- applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C 1 addition, 1 deletion.../solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
- applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C 2 additions, 2 deletions.../PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
- applications/solvers/combustion/chemFoam/createBaseFields.H 0 additions, 1 deletionapplications/solvers/combustion/chemFoam/createBaseFields.H
- applications/solvers/combustion/chemFoam/output.H 1 addition, 2 deletionsapplications/solvers/combustion/chemFoam/output.H
- applications/solvers/combustion/chemFoam/setDeltaT.H 0 additions, 1 deletionapplications/solvers/combustion/chemFoam/setDeltaT.H
Please register or sign in to comment