Merge remote-tracking branch 'origin/master' into feature/procAgglom
Conflicts: src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H src/finiteVolume/fvMesh/fvMesh.H
Showing
- README.html 36 additions, 23 deletionsREADME.html
- README.org 4 additions, 4 deletionsREADME.org
- applications/solvers/basic/potentialFoam/Make/options 9 additions, 2 deletionsapplications/solvers/basic/potentialFoam/Make/options
- applications/solvers/basic/potentialFoam/potentialFoam.C 8 additions, 3 deletionsapplications/solvers/basic/potentialFoam/potentialFoam.C
- applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C 2 additions, 2 deletions...on/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
- applications/solvers/combustion/chemFoam/readInitialConditions.H 3 additions, 3 deletions...tions/solvers/combustion/chemFoam/readInitialConditions.H
- applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H 1 addition, 1 deletion...ns/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
- applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C 5 additions, 7 deletions...hoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
- applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H 0 additions, 23 deletions...ompressible/rhoCentralFoam/readThermophysicalProperties.H
- applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C 1 addition, 6 deletions...ible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
- applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C 1 addition, 2 deletions...ions/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
- applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H 8 additions, 8 deletions.../solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
- applications/solvers/compressible/rhoSimpleFoam/pEqn.H 0 additions, 5 deletionsapplications/solvers/compressible/rhoSimpleFoam/pEqn.H
- applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H 4 additions, 4 deletions...ers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
- applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createZones.H 0 additions, 3 deletions...pressible/rhoSimpleFoam/rhoPorousSimpleFoam/createZones.H
- applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H 3 additions, 8 deletions...ers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
- applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C 1 addition, 2 deletions...e/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
- applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H 1 addition, 6 deletions.../solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
- applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options 4 additions, 2 deletions...ers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
- applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H 8 additions, 4 deletions...s/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
Please register or sign in to comment