GIT: Resolved conflict
Showing
- applications/test/parallel/Test-parallel.C 185 additions, 104 deletionsapplications/test/parallel/Test-parallel.C
- applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict 6 additions, 2 deletions...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
- applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightBinaryStream.H 3 additions, 3 deletions...essing/dataConversion/foamToEnsight/ensightBinaryStream.H
- applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H 3 additions, 52 deletions...ics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
- applications/utilities/postProcessing/sampling/sample/sampleDict 5 additions, 0 deletions...tions/utilities/postProcessing/sampling/sample/sampleDict
- applications/utilities/surface/surfaceInflate/surfaceInflate.C 5 additions, 5 deletions...cations/utilities/surface/surfaceInflate/surfaceInflate.C
- bin/tools/RunFunctions 17 additions, 8 deletionsbin/tools/RunFunctions
- etc/bashrc 1 addition, 0 deletionsetc/bashrc
- src/Allwmake 1 addition, 1 deletionsrc/Allwmake
- src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C 33 additions, 2 deletionssrc/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
- src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H 20 additions, 5 deletionssrc/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
- src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C 2 additions, 2 deletionssrc/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C 113 additions, 155 deletionssrc/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H 9 additions, 1 deletionsrc/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
- src/OpenFOAM/db/IOstreams/Pstreams/exchange.C 1 addition, 3 deletionssrc/OpenFOAM/db/IOstreams/Pstreams/exchange.C
- src/OpenFOAM/db/dictionary/dictionaryIO.C 4 additions, 3 deletionssrc/OpenFOAM/db/dictionary/dictionaryIO.C
- src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C 3 additions, 3 deletions...b/functionObjects/functionObjectFile/functionObjectFile.C
- src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C 5 additions, 6 deletions...s/GeometricFields/GeometricField/GeometricBoundaryField.C
- src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C 62 additions, 39 deletionssrc/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
- src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C 3 additions, 4 deletions...nFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
Please register or sign in to comment