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

GIT: conflict resolution

Browse Source
This commit is contained in:
andy
2012-09-17 12:03:11 +01:00
parent e6bc9ba2ae a4ac852e9c
commit 8489de277d
514 changed files with 13454 additions and 11215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
View File

@ -55,7 +55,8 @@ Foam::outputFilterOutputControl::outputFilterOutputControl
:
time_(t),
outputControl_(ocTimeStep),
outputInterval_(0)
outputInterval_(0),
outputTimeLastDump_(0)
{
read(dict);
}
@ -88,6 +89,12 @@ void Foam::outputFilterOutputControl::read(const dictionary& dict)
break;
}
case ocOutputTime:
{
outputInterval_ = dict.lookupOrDefault<label>("outputInterval", 1);
break;
}
default:
{
// do nothing
@ -97,7 +104,7 @@ void Foam::outputFilterOutputControl::read(const dictionary& dict)
}
bool Foam::outputFilterOutputControl::output() const
bool Foam::outputFilterOutputControl::output()
{
switch (outputControl_)
{
@ -113,7 +120,11 @@ bool Foam::outputFilterOutputControl::output() const
case ocOutputTime:
{
return time_.outputTime();
if (time_.outputTime())
{
outputTimeLastDump_ ++;
return !(outputTimeLastDump_ % outputInterval_);
}
break;
}

5
src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
View File

@ -78,6 +78,9 @@ private:
// a value <= 1 means execute at every time step
label outputInterval_;
//- Dumping counter for ocOutputTime
label outputTimeLastDump_;
// Private Member Functions
@ -110,7 +113,7 @@ public:
}
//- Flag to indicate whether to output
bool output() const;
bool output();
};