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

solutionControl: Replace solveFlow control with frozenFlow

Browse Source 
The old "solveFlow" keyword in sprayFoam and chtMultiRegionFoam is still
available for backwards compatibility
This commit is contained in:
Will Bainbridge
2018-02-21 10:34:36 +00:00
parent c7a5f740d8
commit a5560ad05a
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
View File

@ -1,4 +1,4 @@
if (!pimple.solveFlow())
if (pimple.frozenFlow())
{
#include "EEqn.H"
}

4
applications/solvers/lagrangian/sprayFoam/sprayFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,7 +75,7 @@ int main(int argc, char *argv[])
parcels.evolve();
if (pimple.solveFlow())
if (!pimple.frozenFlow())
{
#include "rhoEqn.H"

9
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.C
View File

@ -42,8 +42,8 @@ Foam::fluidSolutionControl::fluidSolutionControl
)
:
nonOrthogonalSolutionControl(mesh, algorithmName),
solveFlow_(false),
momentumPredictor_(false),
frozenFlow_(false),
momentumPredictor_(true),
transonic_(false),
consistent_(false)
{}
@ -66,7 +66,10 @@ bool Foam::fluidSolutionControl::read()
const dictionary& solutionDict = dict();
solveFlow_ = solutionDict.lookupOrDefault<bool>("solveFlow", true);
// The solveFluid keyword is maintained here for backwards compatibility
frozenFlow_ = !solutionDict.lookupOrDefault<bool>("solveFluid", true);
frozenFlow_ = solutionDict.lookupOrDefault<bool>("frozenFlow", frozenFlow_);
momentumPredictor_ =
solutionDict.lookupOrDefault<bool>("momentumPredictor", true);
transonic_ = solutionDict.lookupOrDefault<bool>("transonic", false);

8
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.H
View File

@ -56,8 +56,8 @@ protected:
// Protected data
//- Flag to indicate to solve for the flow
bool solveFlow_;
//- Flag to indicate not to solve for the flow
bool frozenFlow_;
//- Flag to indicate to solve for momentum
bool momentumPredictor_;
@ -97,8 +97,8 @@ public:
// Access
//- Flag to indicate to solve for the flow
inline bool solveFlow() const;
//- Flag to indicate not to solve for the flow
inline bool frozenFlow() const;
//- Flag to indicate to solve for momentum
inline bool momentumPredictor() const;

4
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControlI.H
View File

@ -25,9 +25,9 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
inline bool Foam::fluidSolutionControl::solveFlow() const
inline bool Foam::fluidSolutionControl::frozenFlow() const
{
return solveFlow_;
return frozenFlow_;
}