Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev
Conflicts: applications/solvers/multiphase/compressibleInterFoam/Allwmake
Showing
- src/OpenFOAM/meshes/polyMesh/polyMesh.H 1 addition, 4 deletionssrc/OpenFOAM/meshes/polyMesh/polyMesh.H
- src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C 12 additions, 10 deletionssrc/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
- src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C 2 additions, 2 deletions...hes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
- tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvOptions 1 addition, 1 deletion...compressible/rhoLTSPimpleFoam/angledDuct/system/fvOptions
- tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvOptions 1 addition, 1 deletion...oSimpleFoam/angledDuctExplicitFixedCoeff/system/fvOptions
Please register or sign in to comment