mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'feature-FO_execute_on_end' into 'develop'
ENH: functionObjects: call execute on last time step - old convention was that on last time step it would only call end() and not execute() - however this meant that e.g. the functionObjectProperties file did not get written - and almost all functionObjects were doing an execute() inside of end() - new convention: call execute() on last time step, just before doing end() See merge request !24
This commit is contained in:
@ -167,10 +167,7 @@ void Foam::CourantNo::execute()
|
||||
|
||||
void Foam::CourantNo::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -184,10 +184,7 @@ void Foam::DESModelRegions::execute()
|
||||
|
||||
void Foam::DESModelRegions::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -156,10 +156,7 @@ void Foam::Lambda2::execute()
|
||||
|
||||
void Foam::Lambda2::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -210,10 +210,7 @@ void Foam::Peclet::execute()
|
||||
|
||||
void Foam::Peclet::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -149,10 +149,7 @@ void Foam::Q::execute()
|
||||
|
||||
void Foam::Q::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -146,12 +146,10 @@ void Foam::blendingFactor::execute()
|
||||
|
||||
void Foam::blendingFactor::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
void Foam::blendingFactor::timeSet()
|
||||
{
|
||||
// Do nothing
|
||||
|
||||
@ -343,10 +343,7 @@ void Foam::pressureTools::execute()
|
||||
|
||||
void Foam::pressureTools::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -328,10 +328,7 @@ void Foam::scalarTransport::execute()
|
||||
|
||||
void Foam::scalarTransport::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -140,10 +140,7 @@ void Foam::timeActivatedFileUpdate::execute()
|
||||
|
||||
void Foam::timeActivatedFileUpdate::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -284,12 +284,7 @@ void Foam::turbulenceFields::execute()
|
||||
|
||||
|
||||
void Foam::turbulenceFields::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
}
|
||||
{}
|
||||
|
||||
|
||||
void Foam::turbulenceFields::timeSet()
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -144,10 +144,7 @@ void Foam::vorticity::execute()
|
||||
|
||||
void Foam::vorticity::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -274,10 +274,7 @@ void Foam::wallShearStress::execute()
|
||||
|
||||
void Foam::wallShearStress::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -209,10 +209,7 @@ void Foam::yPlus::execute()
|
||||
|
||||
void Foam::yPlus::end()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
execute();
|
||||
}
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user