Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
Conflicts: src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C Conflicts: src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
Showing
- applications/solvers/incompressible/pimpleFoam/pimpleFoam.C 1 addition, 1 deletionapplications/solvers/incompressible/pimpleFoam/pimpleFoam.C
- applications/test/DynamicList/DynamicListTest.C 19 additions, 4 deletionsapplications/test/DynamicList/DynamicListTest.C
- applications/test/HashTable/hashTableTest.C 15 additions, 9 deletionsapplications/test/HashTable/hashTableTest.C
- applications/test/StaticHashTable/staticHashTableTest.C 16 additions, 9 deletionsapplications/test/StaticHashTable/staticHashTableTest.C
- applications/test/UIndirectListTest/UIndirectListTest.C 17 additions, 7 deletionsapplications/test/UIndirectListTest/UIndirectListTest.C
- applications/test/dictionary/dictionaryTest.C 8 additions, 1 deletionapplications/test/dictionary/dictionaryTest.C
- applications/test/dictionary/testDict 20 additions, 14 deletionsapplications/test/dictionary/testDict
- applications/test/dictionary/testDict2 13 additions, 14 deletionsapplications/test/dictionary/testDict2
- applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C 1 addition, 1 deletion...ons/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
- applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H 1 addition, 1 deletion...ons/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
- applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C 1 addition, 1 deletion.../utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
- applications/utilities/mesh/manipulation/createBaffles/createBaffles.C 5 additions, 4 deletions...utilities/mesh/manipulation/createBaffles/createBaffles.C
- applications/utilities/parallelProcessing/decomposePar/decomposePar.C 10 additions, 0 deletions.../utilities/parallelProcessing/decomposePar/decomposePar.C
- bin/foamExec 49 additions, 60 deletionsbin/foamExec
- etc/constant/RASProperties 235 additions, 0 deletionsetc/constant/RASProperties
- etc/settings.csh 6 additions, 1 deletionetc/settings.csh
- etc/settings.sh 7 additions, 2 deletionsetc/settings.sh
- src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C 2 additions, 2 deletions...nFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
- src/OpenFOAM/containers/HashTables/HashTable/HashTable.H 7 additions, 0 deletionssrc/OpenFOAM/containers/HashTables/HashTable/HashTable.H
- src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C 13 additions, 5 deletionssrc/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
Please register or sign in to comment