mattijs
beb2943d8e
Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
Conflicts:
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/changeDictionaryDict
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/mut
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p
tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/boundary