zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2018-05-22 20:01:39 +01:00
parent 26ec6f8ceb 9dcdf23a6b
commit 314e464f7d
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleLoop/pimpleLoop.C
View File

@ -71,6 +71,18 @@ bool Foam::pimpleLoop::loop(correctorConvergenceControl& convergence)
// Handle quit conditions first // Handle quit conditions first
{ {
// If converged on the last iteration then end the correction loop
if (converged_)
{
Info<< control_.algorithmName() << ": Converged in "
<< corrPimple_ - 1 << " iterations" << endl;
corrPimple_ = 0;
converged_ = false;
return false;
}
// If all corrections have been completed then end the correction loop // If all corrections have been completed then end the correction loop
if (corrPimple_ > nCorrPimple_) if (corrPimple_ > nCorrPimple_)
{ {
@ -80,17 +92,6 @@ bool Foam::pimpleLoop::loop(correctorConvergenceControl& convergence)
<< nCorrPimple_ << " iterations" << endl; << nCorrPimple_ << " iterations" << endl;
} }
corrPimple_ = 0;
return false;
}
// If converged on the last iteration then end the correction loop
if (converged_)
{
Info<< control_.algorithmName() << ": Converged in "
<< corrPimple_ - 1 << " iterations" << endl;
corrPimple_ = 0; corrPimple_ = 0;
converged_ = false; converged_ = false;

6
src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -49,12 +49,12 @@ Description
Y_{i,n} | mass fraction on the neighbour patch [] Y_{i,n} | mass fraction on the neighbour patch []
\endvartable \endvartable
A species that the baffle is permable to will, therefore, have a A species that the baffle is permeable to will, therefore, have a
coefficient greater than zero, whilst a species that does not transfer will coefficient greater than zero, whilst a species that does not transfer will
have a coefficient equal to zero. have a coefficient equal to zero.
This condition calculates the species flux. The fluxes are summed up by the This condition calculates the species flux. The fluxes are summed up by the
velocity consition to generate the net mass transfer across the baffle. velocity condition to generate the net mass transfer across the baffle.
This mass-fraction condition then generates a corrective diffusive flux to This mass-fraction condition then generates a corrective diffusive flux to
ensure that the correct amounts of the permeable species are transferred. ensure that the correct amounts of the permeable species are transferred.

2
src/waves/waveSuperposition/waveSuperposition.C
View File

@ -198,7 +198,7 @@ Foam::waveSuperposition::waveSuperposition(const waveSuperposition& waves)
ramp_(waves.ramp_, false), ramp_(waves.ramp_, false),
scale_(waves.scale_, false), scale_(waves.scale_, false),
crossScale_(waves.crossScale_, false), crossScale_(waves.crossScale_, false),
heightAboveWave_(false) heightAboveWave_(waves.heightAboveWave_)
{} {}