zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MRG: Resolve conflict with latest foundation merge

Browse Source
This commit is contained in:
Andrew Heather
2016-10-26 15:37:15 +01:00
parent 3b96a557e2 a375d6b2ed
commit af81184ecf
243 changed files with 11116 additions and 28853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
View File

@ -523,7 +523,7 @@ void Foam::twoPhaseSystem::solve()
fvScalarMatrix alpha1Eqn
(
fvm::ddt(alpha1) - fvc::ddt(alpha1)
- fvm::laplacian(alpha1alpha2f*pPrimeByA_(), alpha1, "bounded")
- fvm::laplacian(alpha1alpha2f()*pPrimeByA_(), alpha1, "bounded")
);
alpha1Eqn.relax();