diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 6aabf93eabea0809280c6969484807012cf90118..59d09611e5f07cd15e91766d47158a0f82e73073 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -943,6 +943,17 @@ bool Foam::Time::run() const
addProfiling(functionObjects, "functionObjects.execute()");
functionObjects_.execute();
}
+
+ // Check if the execution of functionObjects require re-reading
+ // any files. This moves effect of e.g. 'timeActivatedFileUpdate'
+ // one time step forward. Note that we cannot call
+ // readModifiedObjects from within timeActivatedFileUpdate since
+ // it might re-read the functionObjects themselves (and delete
+ // the timeActivatedFileUpdate one)
+ if (functionObjects_.filesModified())
+ {
+ const_cast<Time&>(*this).readModifiedObjects();
+ }
}
// Update the "running" status following the
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index b0a92bc5c1363ce94fd28127a4bd5293bb51d311..4ce4821b46426a12f956665a6196dbd7dba25947 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -146,6 +146,12 @@ bool Foam::functionObject::adjustTimeStep()
}
+bool Foam::functionObject::filesModified() const
+{
+ return false;
+}
+
+
void Foam::functionObject::updateMesh(const mapPolyMesh&)
{}
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 9c7d56a340d99c9a9bebecdc29ee1ea7329ff5dc..367c0094ee5edbd8c80c2341bdc38831815ce42e 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -233,6 +233,9 @@ public:
//- Called at the end of Time::adjustDeltaT() if adjustTime is true
virtual bool adjustTimeStep();
+ //- Did any file get changed during execution?
+ virtual bool filesModified() const;
+
//- Update for changes of mesh
virtual void updateMesh(const mapPolyMesh& mpm);
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 142da30fa6a69ec903ea19965708b02b3a89915e..d64e264eda0a7948d84cd1e4ee29aab5c4de3be0 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -819,6 +819,21 @@ bool Foam::functionObjectList::read()
}
+bool Foam::functionObjectList::filesModified() const
+{
+ bool ok = false;
+ if (execution_)
+ {
+ forAll(*this, objectI)
+ {
+ bool changed = operator[](objectI).filesModified();
+ ok = ok || changed;
+ }
+ }
+ return ok;
+}
+
+
void Foam::functionObjectList::updateMesh(const mapPolyMesh& mpm)
{
if (execution_)
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 41e6a1fd468767f7698efcab747720a3175fea28..2a3efb45ed3d2e7beb6b0826e1919236ade85c16 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -264,6 +264,9 @@ public:
//- Called at the end of Time::adjustDeltaT() if adjustTime is true
bool adjustTimeStep();
+ //- Did any file get changed during execution?
+ bool filesModified() const;
+
//- Update for changes of mesh
void updateMesh(const mapPolyMesh& mpm);
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
index 02b174d419f3471a8fe53d274cc3583053f591f2..8e99aebe071bd8ba74829165bca0195bd61ae7dc 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
@@ -220,6 +220,17 @@ bool Foam::functionObjects::timeControl::read
}
+bool Foam::functionObjects::timeControl::filesModified() const
+{
+ bool mod = false;
+ if (active())
+ {
+ mod = foPtr_->filesModified();
+ }
+ return mod;
+}
+
+
void Foam::functionObjects::timeControl::updateMesh
(
const mapPolyMesh& mpm
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
index 9108d12f52cfee4afa60385e4dc74f2ab21898ef..aac5343c424ededd4a4f2eec0a1f94dd033d7ec9 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -177,6 +177,9 @@ public:
//- Called at the end of Time::adjustDeltaT() if adjustTime is true
virtual bool adjustTimeStep();
+ //- Did any file get changed during execution?
+ virtual bool filesModified() const;
+
//- Read and set the function object if its data have changed
virtual bool read(const dictionary&);
diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 18b233e64c3cfd5c234f3520dce7c47b1d3a362f..cd74fc9ae10cbd42a34b63f906a16702d3ab873a 100644
--- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -48,11 +48,10 @@ namespace functionObjects
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void Foam::functionObjects::timeActivatedFileUpdate::updateFile
-(
- const bool checkFiles
-)
+void Foam::functionObjects::timeActivatedFileUpdate::updateFile()
{
+ modified_ = false;
+
label i = lastIndex_;
while
(
@@ -73,14 +72,7 @@ void Foam::functionObjects::timeActivatedFileUpdate::updateFile
mv(destFile, fileToUpdate_);
lastIndex_ = i;
- if (checkFiles)
- {
- // Do an early check to avoid an additional iteration before
- // any changes are picked up (see Time::run : does readModified
- // before executing FOs). Note we have to protect the read
- // constructor of *this from triggering this behaviour.
- const_cast<Time&>(time_).Time::readModifiedObjects();
- }
+ modified_ = true;
}
}
@@ -98,7 +90,8 @@ Foam::functionObjects::timeActivatedFileUpdate::timeActivatedFileUpdate
time_(runTime),
fileToUpdate_("unknown-fileToUpdate"),
timeVsFile_(),
- lastIndex_(-1)
+ lastIndex_(-1),
+ modified_(false)
{
read(dict);
}
@@ -142,8 +135,8 @@ bool Foam::functionObjects::timeActivatedFileUpdate::read
<< timeVsFile_[i].second() << endl;
}
- // Copy starting files. Avoid recursion by not checking for modified files.
- updateFile(false);
+ // Copy starting files
+ updateFile();
return true;
}
@@ -151,7 +144,7 @@ bool Foam::functionObjects::timeActivatedFileUpdate::read
bool Foam::functionObjects::timeActivatedFileUpdate::execute()
{
- updateFile(true);
+ updateFile();
return true;
}
@@ -163,4 +156,10 @@ bool Foam::functionObjects::timeActivatedFileUpdate::write()
}
+bool Foam::functionObjects::timeActivatedFileUpdate::filesModified() const
+{
+ return modified_;
+}
+
+
// ************************************************************************* //
diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index 4e0981ee33886c563a49c41c6c5e0b3743400626..e6fbedcc82e8d7657cd0a1d8022aa86aedaad3c2 100644
--- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -106,11 +106,14 @@ class timeActivatedFileUpdate
//- Index of last file copied
label lastIndex_;
+ //- Has anything been copied?
+ bool modified_;
+
// Private Member Functions
//- Update file
- void updateFile(const bool checkFiles);
+ void updateFile();
//- Disallow default bitwise copy construct
timeActivatedFileUpdate(const timeActivatedFileUpdate&);
@@ -150,6 +153,9 @@ public:
//- Do nothing
virtual bool write();
+
+ //- Did any file get changed during execution?
+ virtual bool filesModified() const;
};