Merge branch 'master' into pairPatchAgglomeration

Conflicts:
	applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H
This commit is contained in:
sergio
2011-02-21 17:20:43 +00:00
62 changed files with 2534 additions and 809 deletions

View File

@ -27,7 +27,7 @@
(
fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+ fvc::div(phi)
==
==
parcels.Srho()
+ massSource.SuTot()
);