Merge branch 'master' into splitCyclic
Conflicts: applications/utilities/mesh/generation/blockMesh/blockMeshApp.C applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C etc/bashrc etc/cshrc src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C src/decompositionMethods/parMetisDecomp/parMetisDecomp.C src/dynamicMesh/Make/files src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C src/dynamicMesh/perfectInterface/perfectInterface.C src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H src/finiteVolume/Make/files src/mesh/blockMesh/blockMesh/blockMesh.C src/mesh/blockMesh/blockMesh/blockMeshTopology.C src/meshTools/Make/files src/meshTools/sets/topoSets/faceSet.C
Showing
- .gitignore 2 additions, 2 deletions.gitignore
- Allwmake 2 additions, 3 deletionsAllwmake
- README 3 additions, 3 deletionsREADME
- applications/Allwmake 2 additions, 3 deletionsapplications/Allwmake
- applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H 2 additions, 2 deletionsapplications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C 1 addition, 1 deletion...RFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
- applications/solvers/combustion/PDRFoam/StCourantNo.H 2 additions, 2 deletionsapplications/solvers/combustion/PDRFoam/StCourantNo.H
- applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C 1 addition, 1 deletion...tion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
- applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C 1 addition, 1 deletion...bustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
- applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C 1 addition, 1 deletion.../solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
- applications/solvers/combustion/PDRFoam/setDeltaT.H 2 additions, 2 deletionsapplications/solvers/combustion/PDRFoam/setDeltaT.H
- applications/solvers/combustion/XiFoam/bEqn.H 1 addition, 1 deletionapplications/solvers/combustion/XiFoam/bEqn.H
- applications/solvers/combustion/dieselEngineFoam/createFields.H 8 additions, 0 deletions...ations/solvers/combustion/dieselEngineFoam/createFields.H
- applications/solvers/combustion/dieselEngineFoam/createSpray.H 1 addition, 1 deletion...cations/solvers/combustion/dieselEngineFoam/createSpray.H
- applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C 3 additions, 2 deletions...ns/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
- applications/solvers/combustion/dieselEngineFoam/spraySummary.H 1 addition, 1 deletion...ations/solvers/combustion/dieselEngineFoam/spraySummary.H
- applications/solvers/combustion/dieselFoam/dieselFoam.C 3 additions, 2 deletionsapplications/solvers/combustion/dieselFoam/dieselFoam.C
- applications/solvers/combustion/engineFoam/engineFoam.C 1 addition, 0 deletionsapplications/solvers/combustion/engineFoam/engineFoam.C
- applications/solvers/combustion/reactingFoam/chemistry.H 2 additions, 2 deletionsapplications/solvers/combustion/reactingFoam/chemistry.H
- applications/solvers/combustion/reactingFoam/reactingFoam.C 1 addition, 1 deletionapplications/solvers/combustion/reactingFoam/reactingFoam.C
Please register or sign in to comment