diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 07802b6fa5..d4c1d6fa94 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             calcEk(U, K).write
             (
diff --git a/applications/solvers/basic/laplacianFoam/write.H b/applications/solvers/basic/laplacianFoam/write.H
index 47aa182c0a..6b14ba4995 100644
--- a/applications/solvers/basic/laplacianFoam/write.H
+++ b/applications/solvers/basic/laplacianFoam/write.H
@@ -1,4 +1,4 @@
-    if (runTime.outputTime())
+    if (runTime.writeTime())
     {
         volVectorField gradT(fvc::grad(T));
 
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
index 50c7f66085..f6ee12aa1a 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             nAveragingSteps = 0;
         }
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
index 2a10c763c9..6f9f7c9331 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             nAveragingSteps = 0;
         }
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index c146b13cb4..74636b59ae 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             writeCellGraph(V, runTime.graphFormat());
             writeCellGraph(delta, runTime.graphFormat());
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index ff72dd93dd..c74ba442da 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 
         #include "evaluateNearWall.H"
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             #include "makeGraphs.H"
         }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/write.H b/applications/solvers/multiphase/twoPhaseEulerFoam/write.H
index 303661beb6..bc5434b14d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/write.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/write.H
@@ -1,4 +1,4 @@
-    if (runTime.outputTime())
+    if (runTime.writeTime())
     {
         volVectorField Ur
         (
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H
index b2f9900082..d3bdb20ee4 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H
@@ -1,4 +1,4 @@
-    if (runTime.outputTime())
+    if (runTime.writeTime())
     {
         volSymmTensorField sigma
         (
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/calculateStress.H b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/calculateStress.H
index b7f35e10e8..b05ae83449 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/calculateStress.H
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/calculateStress.H
@@ -1,4 +1,4 @@
-    if (runTime.outputTime())
+    if (runTime.writeTime())
     {
         volSymmTensorField sigma
         (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 3b892fc44a..d764f08b5e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -1525,7 +1525,7 @@ void Foam::conformalVoronoiMesh::move()
         << "They will not be inserted." << endl;
 
     // Save displacements to file.
-    if (foamyHexMeshControls().objOutput() && time().outputTime())
+    if (foamyHexMeshControls().objOutput() && time().writeTime())
     {
         Info<< "Writing point displacement vectors to file." << endl;
         OFstream str
@@ -1706,7 +1706,7 @@ void Foam::conformalVoronoiMesh::move()
         printVertexInfo(Info);
     }
 
-    if (time().outputTime())
+    if (time().writeTime())
     {
         writeMesh(time().timeName());
     }
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index eb46fe89d3..088ccbabec 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -476,7 +476,7 @@ int main(int argc, char *argv[])
 
     IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
 
-    // Bypass runTime write (since only writes at outputTime)
+    // Bypass runTime write (since only writes at writeTime)
     if
     (
        !runTime.objectRegistry::writeObject
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
index 17b7cc49cf..344ae189f9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
@@ -59,14 +59,14 @@ functions
 
         // When to write:
         //  timeStep            (with optional writeInterval)
-        //  outputTime          (with optional writeInterval)
+        //  writeTime          (with optional writeInterval)
         //  adjustableTime
         //  runTime
         //  clockTime
         //  cpuTime
-        writeControl   outputTime;
+        writeControl   writeTime;
 
-        // Write every writeInterval (only valid for timeStemp, outputTime)
+        // Write every writeInterval (only valid for timeStemp, writeTime)
         writeInterval  1;
 
         // Interval of time (valid for adjustableTime, runTime, clockTime,
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2.cfg b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
index 7db52b5571..d61c0d4f1f 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2.cfg
+++ b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
@@ -18,6 +18,6 @@ type            Lambda2;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-writeControl   outputTime;
+writeControl   writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/Q.cfg b/etc/caseDicts/postProcessing/fields/Q.cfg
index a1d42b27f4..a9bf4b235f 100644
--- a/etc/caseDicts/postProcessing/fields/Q.cfg
+++ b/etc/caseDicts/postProcessing/fields/Q.cfg
@@ -18,6 +18,6 @@ type            Q;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-writeControl   outputTime;
+writeControl   writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/postProcessing/graphs/graph.cfg
index e9de6a2c13..f11826cb26 100644
--- a/etc/caseDicts/postProcessing/graphs/graph.cfg
+++ b/etc/caseDicts/postProcessing/graphs/graph.cfg
@@ -18,7 +18,7 @@ type            sets;
 functionObjectLibs ("libsampling.so");
 
 enabled         true;
-writeControl   outputTime;
+writeControl   writeTime;
 
 sets
 (
diff --git a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
index 10008b2638..b548b156fd 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
@@ -18,7 +18,7 @@ type            pressureTools;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-writeControl   outputTime;
+writeControl   writeTime;
 log             false;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/cloud.cfg b/etc/caseDicts/postProcessing/probes/cloud.cfg
index 1a2a10b744..b474fc9e2a 100644
--- a/etc/caseDicts/postProcessing/probes/cloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/cloud.cfg
@@ -18,6 +18,6 @@ type            sets;
 functionObjectLibs ("libsampling.so");
 
 enabled         true;
-writeControl   outputTime;
+writeControl   writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines.cfg b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
index 6883c570e3..dd810f96df 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines.cfg
+++ b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
@@ -17,7 +17,7 @@ FoamFile
 type            streamLine;
 functionObjectLibs ( "libfieldFunctionObjects.so" );
 
-writeControl   outputTime;
+writeControl   writeTime;
 
 setFormat       vtk;
 UName           U;
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
index a87bd5a4a4..203f753e4d 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg
+++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
@@ -18,7 +18,7 @@ type            surfaces;
 functionObjectLibs ("libsampling.so");
 
 enabled         true;
-writeControl   outputTime;
+writeControl   writeTime;
 
 surfaceFormat   vtk;
 interpolationScheme cellPoint;
diff --git a/etc/templates/axisymmetricJet/system/graph b/etc/templates/axisymmetricJet/system/graph
index fa17d0cb3b..a419b446d9 100644
--- a/etc/templates/axisymmetricJet/system/graph
+++ b/etc/templates/axisymmetricJet/system/graph
@@ -18,7 +18,7 @@ graph
 {
     type            sets;
     functionObjectLibs ("libsampling.so");
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     interpolationScheme cellPointFace;
 
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 8e58c9ddd0..29f62aa7da 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -91,21 +91,7 @@ void Foam::Time::adjustDeltaT()
         timeToNextWrite = max
         (
             0.0,
-            (outputTimeIndex_ + 1)*writeInterval_ - (value() - startTime_)
-        );
-    }
-    if (secondaryWriteControl_ == wcAdjustableRunTime)
-    {
-        adjustTime = true;
-        timeToNextWrite = max
-        (
-            0.0,
-            min
-            (
-                timeToNextWrite,
-                (secondaryOutputTimeIndex_ + 1)*secondaryWriteInterval_
-              - (value() - startTime_)
-            )
+            (writeTimeIndex_ + 1)*writeInterval_ - (value() - startTime_)
         );
     }
 
@@ -376,10 +362,7 @@ Foam::Time::Time
     stopAt_(saEndTime),
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
-    secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax/10.0), // bit less to allow calculations
     purgeWrite_(0),
-    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
     sigWriteNow_(true, *this),
@@ -471,10 +454,7 @@ Foam::Time::Time
     stopAt_(saEndTime),
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
-    secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
-    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
     sigWriteNow_(true, *this),
@@ -573,10 +553,7 @@ Foam::Time::Time
     stopAt_(saEndTime),
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
-    secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
-    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
     sigWriteNow_(true, *this),
@@ -671,10 +648,7 @@ Foam::Time::Time
     stopAt_(saEndTime),
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
-    secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
-    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
 
@@ -1115,126 +1089,63 @@ Foam::Time& Foam::Time::operator++()
             }
         }
 
-
-        outputTime_ = false;
-        primaryOutputTime_ = false;
-        secondaryOutputTime_ = false;
+        writeTime_ = false;
 
         switch (writeControl_)
         {
             case wcTimeStep:
-                primaryOutputTime_ = !(timeIndex_ % label(writeInterval_));
+                writeTime_ = !(timeIndex_ % label(writeInterval_));
             break;
 
             case wcRunTime:
             case wcAdjustableRunTime:
             {
-                label outputIndex = label
+                label writeIndex = label
                 (
                     ((value() - startTime_) + 0.5*deltaT_)
                   / writeInterval_
                 );
 
-                if (outputIndex > outputTimeIndex_)
+                if (writeIndex > writeTimeIndex_)
                 {
-                    primaryOutputTime_ = true;
-                    outputTimeIndex_ = outputIndex;
+                    writeTime_ = true;
+                    writeTimeIndex_ = writeIndex;
                 }
             }
             break;
 
             case wcCpuTime:
             {
-                label outputIndex = label
+                label writeIndex = label
                 (
                     returnReduce(elapsedCpuTime(), maxOp<double>())
                   / writeInterval_
                 );
-                if (outputIndex > outputTimeIndex_)
+                if (writeIndex > writeTimeIndex_)
                 {
-                    primaryOutputTime_ = true;
-                    outputTimeIndex_ = outputIndex;
+                    writeTime_ = true;
+                    writeTimeIndex_ = writeIndex;
                 }
             }
             break;
 
             case wcClockTime:
             {
-                label outputIndex = label
+                label writeIndex = label
                 (
                     returnReduce(label(elapsedClockTime()), maxOp<label>())
                   / writeInterval_
                 );
-                if (outputIndex > outputTimeIndex_)
+                if (writeIndex > writeTimeIndex_)
                 {
-                    primaryOutputTime_ = true;
-                    outputTimeIndex_ = outputIndex;
+                    writeTime_ = true;
+                    writeTimeIndex_ = writeIndex;
                 }
             }
             break;
         }
 
 
-        // Adapt for secondaryWrite controls
-        switch (secondaryWriteControl_)
-        {
-            case wcTimeStep:
-                secondaryOutputTime_ =
-                    !(timeIndex_ % label(secondaryWriteInterval_));
-            break;
-
-            case wcRunTime:
-            case wcAdjustableRunTime:
-            {
-                label outputIndex = label
-                (
-                    ((value() - startTime_) + 0.5*deltaT_)
-                  / secondaryWriteInterval_
-                );
-
-                if (outputIndex > secondaryOutputTimeIndex_)
-                {
-                    secondaryOutputTime_ = true;
-                    secondaryOutputTimeIndex_ = outputIndex;
-                }
-            }
-            break;
-
-            case wcCpuTime:
-            {
-                label outputIndex = label
-                (
-                    returnReduce(elapsedCpuTime(), maxOp<double>())
-                  / secondaryWriteInterval_
-                );
-                if (outputIndex > secondaryOutputTimeIndex_)
-                {
-                    secondaryOutputTime_ = true;
-                    secondaryOutputTimeIndex_ = outputIndex;
-                }
-            }
-            break;
-
-            case wcClockTime:
-            {
-                label outputIndex = label
-                (
-                    returnReduce(label(elapsedClockTime()), maxOp<label>())
-                  / secondaryWriteInterval_
-                );
-                if (outputIndex > secondaryOutputTimeIndex_)
-                {
-                    secondaryOutputTime_ = true;
-                    secondaryOutputTimeIndex_ = outputIndex;
-                }
-            }
-            break;
-        }
-
-
-        outputTime_ = primaryOutputTime_ || secondaryOutputTime_;
-
-
         // Check if endTime needs adjustment to stop at the next run()/end()
         if (!end())
         {
@@ -1245,25 +1156,23 @@ Foam::Time& Foam::Time::operator++()
             else if (stopAt_ == saWriteNow)
             {
                 endTime_ = value();
-                outputTime_ = true;
-                primaryOutputTime_ = true;
+                writeTime_ = true;
             }
-            else if (stopAt_ == saNextWrite && outputTime_ == true)
+            else if (stopAt_ == saNextWrite && writeTime_ == true)
             {
                 endTime_ = value();
             }
         }
 
-        // Override outputTime if one-shot writing
+        // Override writeTime if one-shot writing
         if (writeOnce_)
         {
-            primaryOutputTime_ = true;
-            outputTime_ = true;
+            writeTime_ = true;
             writeOnce_ = false;
         }
 
         // Adjust the precision of the time directory name if necessary
-        if (outputTime_)
+        if (writeTime_)
         {
             // Tolerance used when testing time equivalence
             const scalar timeTol =
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 5461f33e19..b57d773946 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -132,20 +132,8 @@ protected:
 
         scalar writeInterval_;
 
-        // Additional writing
-
-            writeControls secondaryWriteControl_;
-
-            scalar secondaryWriteInterval_;
-
         label  purgeWrite_;
-        mutable FIFOStack<word> previousOutputTimes_;
-
-        // Additional purging
-
-            label  secondaryPurgeWrite_;
-            mutable FIFOStack<word> previousSecondaryOutputTimes_;
-
+        mutable FIFOStack<word> previousWriteTimes_;
 
         // One-shot writing
         bool writeOnce_;
@@ -157,7 +145,7 @@ protected:
         autoPtr<TimeState> prevTimeState_;
 
 
-        // Signal handlers for secondary writing
+        // Signal handlers for writing
 
             //- Enable one-shot writing upon signal
             sigWriteNow sigWriteNow_;
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 10b00f77f6..918bdd548a 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -207,7 +207,6 @@ void Foam::Time::readDict()
     }
 
     scalar oldWriteInterval = writeInterval_;
-    scalar oldSecondaryWriteInterval = secondaryWriteInterval_;
 
     if (controlDict_.readIfPresent("writeInterval", writeInterval_))
     {
@@ -224,55 +223,17 @@ void Foam::Time::readDict()
     }
 
 
-    // Additional writing
-    if (controlDict_.found("secondaryWriteControl"))
-    {
-        secondaryWriteControl_ = writeControlNames_.read
-        (
-            controlDict_.lookup("secondaryWriteControl")
-        );
-
-        if
-        (
-            controlDict_.readIfPresent
-            (
-                "secondaryWriteInterval",
-                secondaryWriteInterval_
-            )
-        )
-        {
-            if
-            (
-                secondaryWriteControl_ == wcTimeStep
-             && label(secondaryWriteInterval_) < 1
-            )
-            {
-                FatalIOErrorInFunction(controlDict_)
-                    << "secondaryWriteInterval < 1"
-                    << " for secondaryWriteControl timeStep"
-                    << exit(FatalIOError);
-            }
-        }
-        else
-        {
-            controlDict_.lookup("secondaryWriteFrequency")
-                >> secondaryWriteInterval_;
-        }
-    }
-
-
-
     if (oldWriteInterval != writeInterval_)
     {
         switch (writeControl_)
         {
             case wcRunTime:
             case wcAdjustableRunTime:
-                // Recalculate outputTimeIndex_ to be in units of current
+                // Recalculate writeTimeIndex_ to be in units of current
                 // writeInterval.
-                outputTimeIndex_ = label
+                writeTimeIndex_ = label
                 (
-                    outputTimeIndex_
+                    writeTimeIndex_
                   * oldWriteInterval
                   / writeInterval_
                 );
@@ -282,26 +243,6 @@ void Foam::Time::readDict()
             break;
         }
     }
-    if (oldSecondaryWriteInterval != secondaryWriteInterval_)
-    {
-        switch (secondaryWriteControl_)
-        {
-            case wcRunTime:
-            case wcAdjustableRunTime:
-                // Recalculate secondaryOutputTimeIndex_ to be in units of
-                // current writeInterval.
-                secondaryOutputTimeIndex_ = label
-                (
-                    secondaryOutputTimeIndex_
-                  * oldSecondaryWriteInterval
-                  / secondaryWriteInterval_
-                );
-            break;
-
-            default:
-            break;
-        }
-    }
 
     if (controlDict_.readIfPresent("purgeWrite", purgeWrite_))
     {
@@ -316,20 +257,6 @@ void Foam::Time::readDict()
         }
     }
 
-    if (controlDict_.readIfPresent("secondaryPurgeWrite", secondaryPurgeWrite_))
-    {
-        if (secondaryPurgeWrite_ < 0)
-        {
-            WarningInFunction
-                << "invalid value for secondaryPurgeWrite "
-                << secondaryPurgeWrite_
-                << ", should be >= 0, setting to 0"
-                << endl;
-
-            secondaryPurgeWrite_ = 0;
-        }
-    }
-
     if (controlDict_.found("timeFormat"))
     {
         const word formatName(controlDict_.lookup("timeFormat"));
@@ -490,7 +417,7 @@ bool Foam::Time::writeObject
     IOstream::compressionType cmp
 ) const
 {
-    if (outputTime())
+    if (writeTime())
     {
         const word tmName(timeName());
 
@@ -519,42 +446,14 @@ bool Foam::Time::writeObject
 
         if (writeOK)
         {
-            // Does primary or secondary time trigger purging?
-            // Note that primary times can only be purged by primary
-            // purging. Secondary times can be purged by either primary
-            // or secondary purging.
-            if (primaryOutputTime_ && purgeWrite_)
+            // Does the writeTime trigger purging?
+            if (writeTime_ && purgeWrite_)
             {
-                previousOutputTimes_.push(tmName);
+                previousWriteTimes_.push(tmName);
 
-                while (previousOutputTimes_.size() > purgeWrite_)
+                while (previousWriteTimes_.size() > purgeWrite_)
                 {
-                    rmDir(objectRegistry::path(previousOutputTimes_.pop()));
-                }
-            }
-            if
-            (
-               !primaryOutputTime_
-             && secondaryOutputTime_
-             && secondaryPurgeWrite_
-            )
-            {
-                // Writing due to secondary
-                previousSecondaryOutputTimes_.push(tmName);
-
-                while
-                (
-                    previousSecondaryOutputTimes_.size()
-                  > secondaryPurgeWrite_
-                )
-                {
-                    rmDir
-                    (
-                        objectRegistry::path
-                        (
-                            previousSecondaryOutputTimes_.pop()
-                        )
-                    );
+                    rmDir(objectRegistry::path(previousWriteTimes_.pop()));
                 }
             }
         }
@@ -570,8 +469,7 @@ bool Foam::Time::writeObject
 
 bool Foam::Time::writeNow()
 {
-    primaryOutputTime_ = true;
-    outputTime_ = true;
+    writeTime_ = true;
     return write();
 }
 
diff --git a/src/OpenFOAM/db/Time/TimeState.C b/src/OpenFOAM/db/Time/TimeState.C
index f3e3740107..d3d61a8b38 100644
--- a/src/OpenFOAM/db/Time/TimeState.C
+++ b/src/OpenFOAM/db/Time/TimeState.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,11 +36,8 @@ Foam::TimeState::TimeState()
     deltaTSave_(0),
     deltaT0_(0),
     deltaTchanged_(false),
-    outputTimeIndex_(0),
-    primaryOutputTime_(false),
-    secondaryOutputTimeIndex_(0),
-    secondaryOutputTime_(false),
-    outputTime_(false)
+    writeTimeIndex_(0),
+    writeTime_(false)
 {}
 
 
@@ -64,34 +61,4 @@ Foam::scalar Foam::TimeState::timeToUserTime(const scalar t) const
 }
 
 
-Foam::scalar Foam::TimeState::timeOutputValue() const
-{
-    return timeToUserTime(value());
-}
-
-
-Foam::label Foam::TimeState::timeIndex() const
-{
-    return timeIndex_;
-}
-
-
-Foam::dimensionedScalar Foam::TimeState::deltaT() const
-{
-    return dimensionedScalar("deltaT", dimTime, deltaT_);
-}
-
-
-Foam::dimensionedScalar Foam::TimeState::deltaT0() const
-{
-    return dimensionedScalar("deltaT0", dimTime, deltaT0_);
-}
-
-
-bool Foam::TimeState::outputTime() const
-{
-    return outputTime_;
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/Time/TimeState.H b/src/OpenFOAM/db/Time/TimeState.H
index b055d439f0..fb3a090ba7 100644
--- a/src/OpenFOAM/db/Time/TimeState.H
+++ b/src/OpenFOAM/db/Time/TimeState.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,6 @@ namespace Foam
                            Class TimeState Declaration
 \*---------------------------------------------------------------------------*/
 
-
 class TimeState
 :
     public dimensionedScalar
@@ -59,16 +58,9 @@ protected:
         scalar deltaTSave_;
         scalar deltaT0_;
         bool deltaTchanged_;
+        label writeTimeIndex_;
+        bool writeTime_;
 
-        label outputTimeIndex_;
-        //- Is outputTime because of primary?
-        bool primaryOutputTime_;
-
-        label secondaryOutputTimeIndex_;
-        //- Is outputTime because of secondary?
-        bool secondaryOutputTime_;
-
-        bool outputTime_;
 
 public:
 
@@ -92,34 +84,32 @@ public:
             virtual scalar timeToUserTime(const scalar t) const;
 
             //- Return current time value
-            scalar timeOutputValue() const;
+            inline scalar timeOutputValue() const;
 
             //- Return current time index
-            label timeIndex() const;
+            inline label timeIndex() const;
 
             //- Return time step value
-            inline scalar deltaTValue() const
-            {
-                return deltaT_;
-            }
+            inline scalar deltaTValue() const;
 
             //- Return old time step value
-            inline scalar deltaT0Value() const
-            {
-                return deltaT0_;
-            }
+            inline scalar deltaT0Value() const;
 
             //- Return time step
-            dimensionedScalar deltaT() const;
+            inline dimensionedScalar deltaT() const;
 
             //- Return old time step
-            dimensionedScalar deltaT0() const;
+            inline dimensionedScalar deltaT0() const;
 
 
         // Check
 
-            //- Return true if this is an output time (primary or secondary)
-            bool outputTime() const;
+            //- Return true if this is a write time
+            inline bool writeTime() const;
+
+            //- Return true if this is a write time.
+            //  Provided for backward-compatibility
+            inline bool outputTime() const;
 };
 
 
@@ -129,6 +119,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "TimeStateI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/Time/TimeStateI.H b/src/OpenFOAM/db/Time/TimeStateI.H
new file mode 100644
index 0000000000..939d983435
--- /dev/null
+++ b/src/OpenFOAM/db/Time/TimeStateI.H
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+inline Foam::scalar Foam::TimeState::timeOutputValue() const
+{
+    return timeToUserTime(value());
+}
+
+
+inline Foam::label Foam::TimeState::timeIndex() const
+{
+    return timeIndex_;
+}
+
+
+inline Foam::scalar Foam::TimeState::deltaTValue() const
+{
+    return deltaT_;
+}
+
+
+inline Foam::scalar Foam::TimeState::deltaT0Value() const
+{
+    return deltaT0_;
+}
+
+
+inline Foam::dimensionedScalar Foam::TimeState::deltaT() const
+{
+    return dimensionedScalar("deltaT", dimTime, deltaT_);
+}
+
+
+inline Foam::dimensionedScalar Foam::TimeState::deltaT0() const
+{
+    return dimensionedScalar("deltaT0", dimTime, deltaT0_);
+}
+
+
+inline bool Foam::TimeState::writeTime() const
+{
+    return writeTime_;
+}
+
+
+inline bool Foam::TimeState::outputTime() const
+{
+    return writeTime_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
index 087de87cb3..7e01bb9cf5 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
@@ -93,12 +93,12 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute
 {
     if (active())
     {
-        if (evaluateControl_.output())
+        if (evaluateControl_.execute())
         {
             filter_.execute();
         }
 
-        if (forceWrite || writeControl_.output())
+        if (forceWrite || writeControl_.execute())
         {
             filter_.write();
         }
@@ -113,7 +113,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::end()
 {
     filter_.end();
 
-    if (writeControl_.output())
+    if (writeControl_.execute())
     {
         filter_.write();
     }
@@ -140,17 +140,17 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::adjustTimeStep()
     if
     (
         active()
-     && writeControl_.writeControl()
+     && writeControl_.control()
      == outputFilterControl::ocAdjustableRunTime
     )
     {
-        const label  outputTimeIndex = writeControl_.outputTimeLastDump();
-        const scalar writeInterval = writeControl_.writeInterval();
+        const label  writeTimeIndex = writeControl_.executionIndex();
+        const scalar writeInterval = writeControl_.interval();
 
         scalar timeToNextWrite = max
         (
             0.0,
-            (outputTimeIndex + 1)*writeInterval
+            (writeTimeIndex + 1)*writeInterval
           - (time_.value() - time_.startTime().value())
         );
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 952a93d2bf..40d03a60be 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -51,7 +51,7 @@ Description
                 enabled             yes;
                 timeStart           0;
                 timeEnd             10;
-                writeControl        outputTime;
+                writeControl        writeTime;
                 writeInterval       1;
                 ...
             }
@@ -77,7 +77,7 @@ Description
     \table
         Option            | Description
         timeStep          | Execute/write every 'writeInterval' time-steps
-        outputTime        | Execute/write every 'writeInterval' output times
+        writeTime        | Execute/write every 'writeInterval' output times
         adjustableRunTime | Execute/write every 'writeInterval' run time period
         runTime           | Execute/write every 'writeInterval' run time period
         clockTime       | Execute/write every 'writeInterval' clock time period
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.C b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.C
index 78f8268534..d09b004058 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.C
+++ b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.C
@@ -31,7 +31,7 @@ License
 namespace Foam
 {
     template<>
-    const char* NamedEnum<outputFilterControl::writeControls, 8>::
+    const char* NamedEnum<outputFilterControl::timeControls, 8>::
     names[] =
     {
         "timeStep",
@@ -45,8 +45,8 @@ namespace Foam
     };
 }
 
-const Foam::NamedEnum<Foam::outputFilterControl::writeControls, 8>
-    Foam::outputFilterControl::writeControlNames_;
+const Foam::NamedEnum<Foam::outputFilterControl::timeControls, 8>
+    Foam::outputFilterControl::timeControlNames_;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -60,10 +60,10 @@ Foam::outputFilterControl::outputFilterControl
 :
     time_(t),
     prefix_(prefix),
-    writeControl_(ocTimeStep),
-    outputInterval_(0),
-    writeInterval_(-1),
-    outputTimeLastDump_(0)
+    timeControl_(ocTimeStep),
+    intervalSteps_(0),
+    interval_(-1),
+    executionIndex_(0)
 {
     read(dict);
 }
@@ -98,25 +98,25 @@ void Foam::outputFilterControl::read(const dictionary& dict)
 
     if (dict.found(controlName))
     {
-        writeControl_ = writeControlNames_.read(dict.lookup(controlName));
+        timeControl_ = timeControlNames_.read(dict.lookup(controlName));
     }
     else
     {
-        writeControl_ = ocTimeStep;
+        timeControl_ = ocTimeStep;
     }
 
-    switch (writeControl_)
+    switch (timeControl_)
     {
         case ocTimeStep:
         {
-            outputInterval_ = dict.lookupOrDefault<label>(intervalName, 0);
+            intervalSteps_ = dict.lookupOrDefault<label>(intervalName, 0);
             break;
         }
 
         case ocWriteTime:
         case ocOutputTime:
         {
-            outputInterval_ = dict.lookupOrDefault<label>(intervalName, 1);
+            intervalSteps_ = dict.lookupOrDefault<label>(intervalName, 1);
             break;
         }
 
@@ -125,7 +125,7 @@ void Foam::outputFilterControl::read(const dictionary& dict)
         case ocCpuTime:
         case ocAdjustableRunTime:
         {
-            writeInterval_ = readScalar(dict.lookup(intervalName));
+            interval_ = readScalar(dict.lookup(intervalName));
             break;
         }
 
@@ -137,16 +137,16 @@ void Foam::outputFilterControl::read(const dictionary& dict)
 }
 
 
-bool Foam::outputFilterControl::output()
+bool Foam::outputFilterControl::execute()
 {
-    switch (writeControl_)
+    switch (timeControl_)
     {
         case ocTimeStep:
         {
             return
             (
-                (outputInterval_ <= 1)
-             || !(time_.timeIndex() % outputInterval_)
+                (intervalSteps_ <= 1)
+             || !(time_.timeIndex() % intervalSteps_)
             );
             break;
         }
@@ -154,10 +154,10 @@ bool Foam::outputFilterControl::output()
         case ocWriteTime:
         case ocOutputTime:
         {
-            if (time_.outputTime())
+            if (time_.writeTime())
             {
-                outputTimeLastDump_++;
-                return !(outputTimeLastDump_ % outputInterval_);
+                executionIndex_++;
+                return !(executionIndex_ % intervalSteps_);
             }
             break;
         }
@@ -165,18 +165,18 @@ bool Foam::outputFilterControl::output()
         case ocRunTime:
         case ocAdjustableRunTime:
         {
-            label outputIndex = label
+            label executionIndex = label
             (
                 (
                     (time_.value() - time_.startTime().value())
                   + 0.5*time_.deltaTValue()
                 )
-               /writeInterval_
+               /interval_
             );
 
-            if (outputIndex > outputTimeLastDump_)
+            if (executionIndex > executionIndex_)
             {
-                outputTimeLastDump_ = outputIndex;
+                executionIndex_ = executionIndex;
                 return true;
             }
             break;
@@ -184,14 +184,14 @@ bool Foam::outputFilterControl::output()
 
         case ocCpuTime:
         {
-            label outputIndex = label
+            label executionIndex = label
             (
                 returnReduce(time_.elapsedCpuTime(), maxOp<double>())
-               /writeInterval_
+               /interval_
             );
-            if (outputIndex > outputTimeLastDump_)
+            if (executionIndex > executionIndex_)
             {
-                outputTimeLastDump_ = outputIndex;
+                executionIndex_ = executionIndex;
                 return true;
             }
             break;
@@ -199,14 +199,14 @@ bool Foam::outputFilterControl::output()
 
         case ocClockTime:
         {
-            label outputIndex = label
+            label executionIndex = label
             (
                 returnReduce(label(time_.elapsedClockTime()), maxOp<label>())
-               /writeInterval_
+               /interval_
             );
-            if (outputIndex > outputTimeLastDump_)
+            if (executionIndex > executionIndex_)
             {
-                outputTimeLastDump_ = outputIndex;
+                executionIndex_ = executionIndex;
                 return true;
             }
             break;
@@ -221,7 +221,7 @@ bool Foam::outputFilterControl::output()
         {
             FatalErrorInFunction
                 << "Undefined output control: "
-                << writeControlNames_[writeControl_] << nl
+                << timeControlNames_[timeControl_] << nl
                 << abort(FatalError);
             break;
         }
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.H b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.H
index 0efb6918b6..016922f862 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.H
@@ -54,15 +54,15 @@ class outputFilterControl
 public:
 
     //- The output control options
-    enum writeControls
+    enum timeControls
     {
         ocTimeStep,           //!< execution is coupled to the time-step
         ocWriteTime,          //!< execution is coupled to the write-time
         ocOutputTime,         //!< execution is coupled to the output-time
-        ocAdjustableRunTime,  //!< Adjust time step for dumping
-        ocRunTime,            //!< run time for dumping
-        ocClockTime,          //!< clock time for dumping
-        ocCpuTime,            //!< cpu time for dumping
+        ocAdjustableRunTime,  //!< Adjust time step for execution
+        ocRunTime,            //!< run time for execution
+        ocClockTime,          //!< clock time for execution
+        ocCpuTime,            //!< cpu time for execution
         ocNone                //!< no output
     };
 
@@ -77,28 +77,29 @@ private:
         //- Prefix
         const word prefix_;
 
-        //- String representation of writeControls enums
-        static const NamedEnum<writeControls, 8> writeControlNames_;
+        //- String representation of timeControls enums
+        static const NamedEnum<timeControls, 8> timeControlNames_;
 
         //- Type of output
-        writeControls writeControl_;
+        timeControls timeControl_;
 
-        //- The execution interval (in time steps) when using \c timeStep mode,
+        //- Execution interval steps for timeStep mode
         //  a value <= 1 means execute at every time step
-        label outputInterval_;
+        label intervalSteps_;
 
-        //- Dump each deltaT (adjust Ttime)
-        scalar writeInterval_;
+        //- Execution interval
+        scalar interval_;
 
-        //- Dumping counter for ocOutputTime or index dump
-        //  for ocAdjustableRunTime
-        label outputTimeLastDump_;
+        //- Index of previous execution
+        label executionIndex_;
 
 
     // Private Member Functions
 
         //- Disallow default bitwise copy construct and assignment
         outputFilterControl(const outputFilterControl&);
+
+        //- Disallow default bitwise assignment
         void operator=(const outputFilterControl&);
 
 
@@ -124,20 +125,20 @@ public:
         //- Read from dictionary
         void read(const dictionary&);
 
-        //- Return const access to the Time object
+        //- Return Time
         inline const Time& time() const;
 
-        //- Flag to indicate whether to output
-        bool output();
+        //- Flag to indicate whether to execute
+        bool execute();
 
-        //- Return writeControl
-        inline writeControls writeControl() const;
+        //- Return control
+        inline timeControls control() const;
 
-        //- Return writeInterval
-        inline scalar writeInterval() const;
+        //- Return interval
+        inline scalar interval() const;
 
-        //- Return outputTimeLastDump
-        inline label outputTimeLastDump() const;
+        //- Return the index of the previous execution
+        inline label executionIndex() const;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControlI.H b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControlI.H
index 8882977fc9..0469dac296 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControlI.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControlI.H
@@ -31,22 +31,22 @@ inline const Foam::Time& Foam::outputFilterControl::time() const
 }
 
 
-inline Foam::outputFilterControl::writeControls
-Foam::outputFilterControl::writeControl() const
+inline Foam::outputFilterControl::timeControls
+Foam::outputFilterControl::control() const
 {
-    return writeControl_;
+    return timeControl_;
 }
 
 
-inline Foam::scalar Foam::outputFilterControl::writeInterval() const
+inline Foam::scalar Foam::outputFilterControl::interval() const
 {
-    return writeInterval_;
+    return interval_;
 }
 
 
-inline Foam::label Foam::outputFilterControl::outputTimeLastDump() const
+inline Foam::label Foam::outputFilterControl::executionIndex() const
 {
-    return outputTimeLastDump_;
+    return executionIndex_;
 }
 
 
diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.C b/src/OpenFOAM/primitives/subModelBase/subModelBase.C
index 4a7c7017eb..dae1123696 100644
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.C
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ void Foam::subModelBase::cacheFields(const bool)
 {}
 
 
-bool Foam::subModelBase::outputTime() const
+bool Foam::subModelBase::writeTime() const
 {
     return active();
 }
diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.H b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
index c5f05c06c5..6ccfcb202f 100644
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.H
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
@@ -153,7 +153,7 @@ public:
             virtual void cacheFields(const bool store);
 
             //- Flag to indicate when to write a property
-            virtual bool outputTime() const;
+            virtual bool writeTime() const;
 
 
         // Edit
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
index ff87ca2e1d..207b06ff65 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
@@ -130,7 +130,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
         }
     }
 
-    if (debug && mesh_.time().outputTime())
+    if (debug && mesh_.time().writeTime())
     {
         volTensorField Dout
         (
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index 5883fcc72c..45348ae6cb 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -55,7 +55,7 @@ void Foam::fv::meanVelocityForce::writeProps
 ) const
 {
     // Only write on output time
-    if (mesh_.time().outputTime())
+    if (mesh_.time().writeTime())
     {
         IOdictionary propsDict
         (
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 840a29e70e..9b3648c31a 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -537,7 +537,7 @@ void Foam::fv::rotorDiskSource::addSup
     // Add source to rhs of eqn
     eqn -= force;
 
-    if (mesh_.time().outputTime())
+    if (mesh_.time().writeTime())
     {
         force.write();
     }
@@ -575,7 +575,7 @@ void Foam::fv::rotorDiskSource::addSup
     // Add source to rhs of eqn
     eqn -= force;
 
-    if (mesh_.time().outputTime())
+    if (mesh_.time().writeTime())
     {
         force.write();
     }
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index c60b60b530..5c536e5624 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -167,7 +167,7 @@ void Foam::fv::rotorDiskSource::writeField
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
 
-    if (mesh_.time().outputTime() || writeNow)
+    if (mesh_.time().writeTime() || writeNow)
     {
         tmp<fieldType> tfield
         (
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index cb29866afd..956e5bd6c0 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -209,7 +209,7 @@ void Foam::fv::interRegionHeatTransferModel::addSup
             << fvc::domainIntegrate(htc_).value()
             << endl;
 
-        if (mesh_.time().outputTime())
+        if (mesh_.time().writeTime())
         {
             Tmapped.write();
             htc_.write();
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 3560b93dbe..373875d095 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -233,7 +233,7 @@ void Foam::KinematicCloud<CloudType>::postEvolve()
 
     solution_.nextIter();
 
-    if (this->db().time().outputTime())
+    if (this->db().time().writeTime())
     {
         outputProperties_.writeObject
         (
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
index d761e5f17a..654bdcabd0 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,7 +202,7 @@ bool Foam::cloudSolution::solveThisStep() const
     return
         active_
      && (
-            mesh_.time().outputTime()
+            mesh_.time().writeTime()
          || (mesh_.time().timeIndex() % calcFrequency_ == 0)
         );
 }
@@ -225,7 +225,7 @@ bool Foam::cloudSolution::canEvolve()
 
 bool Foam::cloudSolution::output() const
 {
-    return active_ && mesh_.time().outputTime();
+    return active_ && mesh_.time().writeTime();
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
index bf79b15c21..b0e6c2b32e 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ void Foam::CloudFunctionObject<CloudType>::preEvolve()
 template<class CloudType>
 void Foam::CloudFunctionObject<CloudType>::postEvolve()
 {
-    if (this->owner().time().outputTime())
+    if (this->owner().time().writeTime())
     {
         this->write();
     }
@@ -158,7 +158,7 @@ const Foam::fileName& Foam::CloudFunctionObject<CloudType>::outputDir() const
 
 
 template<class CloudType>
-Foam::fileName Foam::CloudFunctionObject<CloudType>::outputTimeDir() const
+Foam::fileName Foam::CloudFunctionObject<CloudType>::writeTimeDir() const
 {
     return outputDir_/this->owner().time().timeName();
 }
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index c041cb809d..be6526c3cc 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -179,7 +179,7 @@ public:
             const fileName& outputDir() const;
 
             //- Return the output time path
-            fileName outputTimeDir() const;
+            fileName writeTimeDir() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
index ede2197649..adc6a30ca1 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
@@ -51,7 +51,7 @@ void Foam::FacePostProcessing<CloudType>::makeLogFile
         if (Pstream::master())
         {
             // Create directory if does not exist
-            mkDir(this->outputTimeDir());
+            mkDir(this->writeTimeDir());
 
             // Open new file at start up
             outputFilePtr_.set
@@ -59,7 +59,7 @@ void Foam::FacePostProcessing<CloudType>::makeLogFile
                 zoneI,
                 new OFstream
                 (
-                    this->outputTimeDir()/(type() + '_' + zoneName + ".dat")
+                    this->writeTimeDir()/(type() + '_' + zoneName + ".dat")
                 )
             );
 
@@ -202,7 +202,7 @@ void Foam::FacePostProcessing<CloudType>::write()
 
                 writer->write
                 (
-                    this->outputTimeDir(),
+                    this->writeTimeDir(),
                     fZone.name(),
                     allPoints,
                     allFaces,
@@ -213,7 +213,7 @@ void Foam::FacePostProcessing<CloudType>::write()
 
                 writer->write
                 (
-                    this->outputTimeDir(),
+                    this->writeTimeDir(),
                     fZone.name(),
                     allPoints,
                     allFaces,
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 6c8c1dde09..ce704984e5 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -52,12 +52,12 @@ void Foam::ParticleCollector<CloudType>::makeLogFile
         if (Pstream::master())
         {
             // Create directory if does not exist
-            mkDir(this->outputTimeDir());
+            mkDir(this->writeTimeDir());
 
             // Open new file at start up
             outputFilePtr_.reset
             (
-                new OFstream(this->outputTimeDir()/(type() + ".dat"))
+                new OFstream(this->writeTimeDir()/(type() + ".dat"))
             );
 
             outputFilePtr_()
@@ -457,7 +457,7 @@ void Foam::ParticleCollector<CloudType>::write()
 
             writer->write
             (
-                this->outputTimeDir(),
+                this->writeTimeDir(),
                 "collector",
                 points_,
                 faces_,
@@ -468,7 +468,7 @@ void Foam::ParticleCollector<CloudType>::write()
 
             writer->write
             (
-                this->outputTimeDir(),
+                this->writeTimeDir(),
                 "collector",
                 points_,
                 faces_,
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index 3535fc01ee..db22a58082 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -69,13 +69,13 @@ void Foam::PatchPostProcessing<CloudType>::write()
             const fvMesh& mesh = this->owner().mesh();
 
             // Create directory if it doesn't exist
-            mkDir(this->outputTimeDir());
+            mkDir(this->writeTimeDir());
 
             const word& patchName = mesh.boundaryMesh()[patchIDs_[i]].name();
 
             OFstream patchOutFile
             (
-                this->outputTimeDir()/patchName + ".post",
+                this->writeTimeDir()/patchName + ".post",
                 IOstream::ASCII,
                 IOstream::currentVersion,
                 mesh.time().writeCompression()
diff --git a/src/lagrangian/intermediate/submodels/CloudSubModelBase.C b/src/lagrangian/intermediate/submodels/CloudSubModelBase.C
index 83098ec87c..39bcb8da2f 100644
--- a/src/lagrangian/intermediate/submodels/CloudSubModelBase.C
+++ b/src/lagrangian/intermediate/submodels/CloudSubModelBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,12 +114,12 @@ CloudType& Foam::CloudSubModelBase<CloudType>::owner()
 
 
 template<class CloudType>
-bool Foam::CloudSubModelBase<CloudType>::outputTime() const
+bool Foam::CloudSubModelBase<CloudType>::writeTime() const
 {
     return
         active()
      && owner_.solution().transient()
-     && owner_.db().time().outputTime();
+     && owner_.db().time().writeTime();
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudSubModelBase.H b/src/lagrangian/intermediate/submodels/CloudSubModelBase.H
index f96b8f5d5d..dd7bb6b01e 100644
--- a/src/lagrangian/intermediate/submodels/CloudSubModelBase.H
+++ b/src/lagrangian/intermediate/submodels/CloudSubModelBase.H
@@ -105,7 +105,7 @@ public:
             const CloudType& owner() const;
 
             //- Flag to indicate when to write a property
-            virtual bool outputTime() const;
+            virtual bool writeTime() const;
 
 
         // Edit
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index acb710c85c..77c18d476e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -628,7 +628,7 @@ void Foam::InjectionModel<CloudType>::info(Ostream& os)
         << "        number of parcels added     = " << parcelsAddedTotal_ << nl
         << "        mass introduced             = " << massInjected_ << nl;
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setModelProperty("massInjected", massInjected_);
         this->setModelProperty("nInjections", nInjections_);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index cfca52fd77..4265100e74 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -316,7 +316,7 @@ void Foam::LocalInteraction<CloudType>::info(Ostream& os)
             << ", " << mps[i] << nl;
     }
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setModelProperty("nEscape", npe);
         nEscape_ = 0;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index da19861aa1..3842f9b5e3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -199,7 +199,7 @@ void Foam::StandardWallInteraction<CloudType>::info(Ostream& os)
         << "      - escape                      = " << npe << ", " << mpe << nl
         << "      - stick                       = " << nps << ", " << mps << nl;
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setModelProperty("nEscape", npe);
         this->setModelProperty("massEscape", mpe);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
index b521652124..d7be65546c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
@@ -269,7 +269,7 @@ void Foam::SurfaceFilmModel<CloudType>::info(Ostream& os)
     os  << "    Parcels absorbed into film      = " << nTransTotal << nl
         << "    New film detached parcels       = " << nInjectTotal << endl;
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setModelProperty("nParcelsTransferred", nTransTotal);
         this->setModelProperty("nParcelsInjected", nInjectTotal);
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index c06b79bd51..425236a295 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -170,7 +170,7 @@ void Foam::PhaseChangeModel<CloudType>::info(Ostream& os)
 
     Info<< "    Mass transfer phase change      = " << massTotal << nl;
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setBaseProperty("mass", massTotal);
         dMass_ = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
index 7d388ce119..6fff4352d6 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ void Foam::DevolatilisationModel<CloudType>::info(Ostream& os)
 
     Info<< "    Mass transfer devolatilisation  = " << massTotal << nl;
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setBaseProperty("mass", massTotal);
         dMass_ = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
index 5a890c7b63..04cc92cfea 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ void Foam::SurfaceReactionModel<CloudType>::info(Ostream& os)
 
     Info<< "    Mass transfer surface reaction  = " << massTotal << nl;
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setBaseProperty("mass", massTotal);
         dMass_ = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index d157d6836f..5654799dac 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -669,7 +669,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::info(Ostream& os)
 
     os  << "    New film splash parcels         = " << nSplashTotal << endl;
 
-    if (this->outputTime())
+    if (this->writeTime())
     {
         this->setModelProperty("nParcelsSplashed", nSplashTotal);
         nParcelsSplashed_ = 0;
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
index 61669d69d5..0546f30259 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
@@ -1,4 +1,4 @@
-if (runTime.outputTime())
+if (runTime.writeTime())
 {
     /*-----------------------------------------------------------------------*\
         Number density
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
index ddf96d1ef0..53aaa8f7a3 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
@@ -1,4 +1,4 @@
-if (runTime.outputTime())
+if (runTime.writeTime())
 {
     allSpeciesN_RU = List<scalarField>
     (
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
index 6f32f0ec13..0e311b2530 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
@@ -48,7 +48,7 @@ accumulatedNMols += singleStepNMols;
 
 accumulatedDOFs += singleStepDOFs;
 
-if (runTime.outputTime())
+if (runTime.writeTime())
 {
     if (accumulatedNMols)
     {
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H
index 78a1e42d9b..4f0ec8b58c 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-if (runTime.outputTime())
+if (runTime.writeTime())
 {
     molecules.applyConstraintsAndThermostats
     (
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index b00abc00c1..d8b20ad200 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -58,7 +58,7 @@ functions
         enabled         true;
 
         // When to output the average fields
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         // Fields to be averaged - runTime modifiable
         fields
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
index 50e9eadaa6..93081e26d1 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
@@ -28,7 +28,7 @@ functions
         enabled         true;
 
         // When to output the average fields
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         // Fields to be transformed - runTime modifiable
         fields
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index 58207e81a5..dd80dd785b 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -52,7 +52,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         // Output to log&file (true) or to file only
         log             true;
@@ -93,7 +93,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
         log             true;
         valueOutput     true;
         source          faceZone;
@@ -111,7 +111,7 @@ functions
         type            cellSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
         log             true;
         valueOutput     true;
         source          cellZone;
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/controlDict b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
index 71aea01795..f1d7d283cc 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/controlDict
+++ b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
@@ -54,7 +54,7 @@ functions
         type nearWallFields;
 
         // Output every
-        writeControl outputTime; //timeStep;
+        writeControl writeTime; //timeStep;
         //writeInterval 5;
 
         // Fields to be sampled. Per field original name and mapped field to
diff --git a/src/postProcessing/functionObjects/field/processorField/postProcessingDict b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
index cd537f669d..79463a0058 100644
--- a/src/postProcessing/functionObjects/field/processorField/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
@@ -28,7 +28,7 @@ functions
         enabled         true;
 
         // When to output the average fields
-        writeControl   outputTime;
+        writeControl   writeTime;
     }
 }
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/controlDict b/src/postProcessing/functionObjects/field/streamLine/controlDict
index cc0fb705e7..97ce6665c4 100644
--- a/src/postProcessing/functionObjects/field/streamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/streamLine/controlDict
@@ -54,7 +54,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Output every
-        writeControl   outputTime;
+        writeControl   writeTime;
         // writeInterval 10;
 
         setFormat       vtk; //gnuplot, raw etc. See sampleDict.
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
index 202a33a216..fbba54842d 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
@@ -63,7 +63,7 @@ functions
         type nearWallFields;
 
         // Output every
-        writeControl   outputTime;
+        writeControl   writeTime;
         //writeInterval  1;
 
         // Fields to be sampled. Per field original name and mapped field to
@@ -86,7 +86,7 @@ functions
         type            wallBoundedStreamLine;
 
         // Output every
-        writeControl   timeStep;   //outputTime;
+        writeControl   timeStep;   //writeTime;
         // writeInterval 10;
 
         setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
index 53ac6c2e2d..4ddf310200 100644
--- a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
@@ -66,19 +66,19 @@ functions
 
         // Execute upon options:
         //  timeStep
-        //  outputTime
+        //  writeTime
         //  adjustableRunTime
         //  runTime
         //  clockTime
         //  cpuTime
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         // Objects (fields or lagrangian fields in any of the clouds)
-        // to write every outputTime
+        // to write every writeTime
         objectNames    (p positions nParticle);
 
-        // Write as normal every writeInterval'th outputTime.
-        writeInterval  1; // (timeStep, outputTime)
+        // Write as normal every writeInterval'th writeTime.
+        writeInterval  1; // (timeStep, writeTime)
 
         // Interval of time (sec) to write down(
         writeInterval   10.5 //(adjustableRunTime, runTime, clockTime, cpuTime)
@@ -95,14 +95,14 @@ functions
 
         // When to write:
         //  timeStep            (with optional writeInterval)
-        //  outputTime          (with optional writeInterval)
+        //  writeTime          (with optional writeInterval)
         //  adjustableRunTime
         //  runTime
         //  clockTime
         //  cpuTime
-        writeControl   outputTime;
+        writeControl   writeTime;
 
-         // Write every writeInterval (only valid for timeStemp, outputTime)
+         // Write every writeInterval (only valid for timeStemp, writeTime)
         writeInterval  1;
 
          // Interval of time (valid for adjustableRunTime, runTime, clockTime,
diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
index 4a4a801e4f..c9eb349bc8 100644
--- a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
@@ -74,7 +74,7 @@ void Foam::functionObjects::partialWrite::read(const dictionary& dict)
 
     Info<< type() << " " << name() << ":" << nl
         << "    dumping every " << writeInterval_
-        << " th outputTime : " << nl << endl ;
+        << " th writeTime : " << nl << endl ;
 
     forAllConstIter(HashSet<word>, objectNames_, iter)
     {
@@ -123,7 +123,7 @@ void Foam::functionObjects::partialWrite::end()
 
 void Foam::functionObjects::partialWrite::timeSet()
 {
-    if (obr_.time().outputTime())
+    if (obr_.time().writeTime())
     {
         writeInstance_++;
 
diff --git a/src/postProcessing/functionObjects/utilities/systemCall/controlDict b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
index 8289a12593..abed2d748f 100644
--- a/src/postProcessing/functionObjects/utilities/systemCall/controlDict
+++ b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
@@ -51,7 +51,7 @@ functions
         type            systemCall;
         functionObjectLibs ("libsystemCall.so");
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         // called every time step
         executeCalls
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
index 53ac6c2e2d..4ddf310200 100644
--- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
@@ -66,19 +66,19 @@ functions
 
         // Execute upon options:
         //  timeStep
-        //  outputTime
+        //  writeTime
         //  adjustableRunTime
         //  runTime
         //  clockTime
         //  cpuTime
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         // Objects (fields or lagrangian fields in any of the clouds)
-        // to write every outputTime
+        // to write every writeTime
         objectNames    (p positions nParticle);
 
-        // Write as normal every writeInterval'th outputTime.
-        writeInterval  1; // (timeStep, outputTime)
+        // Write as normal every writeInterval'th writeTime.
+        writeInterval  1; // (timeStep, writeTime)
 
         // Interval of time (sec) to write down(
         writeInterval   10.5 //(adjustableRunTime, runTime, clockTime, cpuTime)
@@ -95,14 +95,14 @@ functions
 
         // When to write:
         //  timeStep            (with optional writeInterval)
-        //  outputTime          (with optional writeInterval)
+        //  writeTime          (with optional writeInterval)
         //  adjustableRunTime
         //  runTime
         //  clockTime
         //  cpuTime
-        writeControl   outputTime;
+        writeControl   writeTime;
 
-         // Write every writeInterval (only valid for timeStemp, outputTime)
+         // Write every writeInterval (only valid for timeStemp, writeTime)
         writeInterval  1;
 
          // Interval of time (valid for adjustableRunTime, runTime, clockTime,
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
index 0bd41ea93d..012b35f670 100644
--- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
@@ -33,7 +33,7 @@ Description
     as the main time database through the writeControl setting:
 
     \li \c timeStep
-    \li \c outputTime
+    \li \c writeTime
     \li \c adjustableRunTime
     \li \c runTime
     \li \c clockTime
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 282d976ba8..f1c21e778b 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -527,7 +527,7 @@ void Foam::regionModels::regionModel::evolve()
             Info<< endl << decrIndent;
         }
 
-        if (time_.outputTime())
+        if (time_.writeTime())
         {
             outputProperties().writeObject
             (
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
index 182258b637..121ab4a3e9 100644
--- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::regionModels::regionModelFunctionObject::preEvolveRegion()
 
 void Foam::regionModels::regionModelFunctionObject::postEvolveRegion()
 {
-    if (owner_.regionMesh().time().outputTime())
+    if (owner_.regionMesh().time().writeTime())
     {
         write();
     }
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 2634e50aa0..99625d1bdc 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -149,7 +149,7 @@ void kinematicSingleLayer::transferPrimaryRegionSourceFields()
     pSp_.correctBoundaryConditions();
 
     // update addedMassTotal counter
-    if (time().outputTime())
+    if (time().writeTime())
     {
         scalar addedMassTotal = 0.0;
         outputProperties().readIfPresent("addedMassTotal", addedMassTotal);
diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C
index bb2b9753fe..88bef475a6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C
+++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ filmSubModelBase::~filmSubModelBase()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-bool filmSubModelBase::outputTime() const
+bool filmSubModelBase::writeTime() const
 {
-    return active() && owner_.time().outputTime();
+    return active() && owner_.time().writeTime();
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H
index 76d85d3059..cc4e3c090b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H
+++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
         // Access
 
             //- Flag to indicate when to write a property
-            virtual bool outputTime() const;
+            virtual bool writeTime() const;
 
             //- Return const access to the owner surface film model
             inline const surfaceFilmModel& owner() const;
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
index 8e2fa0e4f5..9e6c790540 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
@@ -221,7 +221,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
 
     force /= magSf;
 
-    if (owner_.regionMesh().time().outputTime())
+    if (owner_.regionMesh().time().writeTime())
     {
         tForce().write();
     }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index cb46796ffe..72d49c774c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -101,7 +101,7 @@ tmp<volScalarField> curvatureSeparation::calcInvR1
         }
     }
 
-    if (debug && mesh.time().outputTime())
+    if (debug && mesh.time().writeTime())
     {
         tinvR1().write();
     }
@@ -192,7 +192,7 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
     }
 */
     // checks
-    if (debug && mesh.time().outputTime())
+    if (debug && mesh.time().writeTime())
     {
         volScalarField volCosAngle
         (
@@ -334,7 +334,7 @@ void curvatureSeparation::correct
 
     addToInjectedMass(sum(separated*availableMass));
 
-    if (debug && mesh.time().outputTime())
+    if (debug && mesh.time().writeTime())
     {
         volScalarField volFnet
         (
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
index ceac59285e..12656a7300 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ injectionModel::~injectionModel()
 
 void injectionModel::correct()
 {
-    if (outputTime())
+    if (writeTime())
     {
         scalar injectedMass0 = getModelProperty<scalar>("injectedMass");
         injectedMass0 += returnReduce(injectedMass_, sumOp<scalar>());
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
index 132106a3a5..f860276b7a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,7 @@ void injectionModelList::info(Ostream& os)
             << mass[i] << endl;
     }
 
-    if (owner().time().outputTime())
+    if (owner().time().writeTime())
     {
         setBaseProperty("massInjected", mass);
         massInjected_ = 0.0;
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
index 0cc15d2954..cd0e6a2fb8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ void patchInjection::correct
 
     injectionModel::correct();
 
-    if (outputTime())
+    if (writeTime())
     {
         scalarField patchInjectedMasses0
         (
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
index 7152139181..33a124b0f1 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ void thixotropicViscosity::correct
     // Shear rate
     volScalarField gDot("gDot", alpha*mag(U - Uw)/(delta + film.deltaSmall()));
 
-    if (debug && runTime.outputTime())
+    if (debug && runTime.writeTime())
     {
         gDot.write();
     }
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
index d35cdfb544..44325cc0b2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
@@ -100,7 +100,7 @@ void phaseChangeModel::correct
     availableMass -= dMass;
     dMass.correctBoundaryConditions();
 
-    if (outputTime())
+    if (writeTime())
     {
         scalar phaseChangeMass = getModelProperty<scalar>("phaseChangeMass");
         phaseChangeMass += returnReduce(totalMassPC_, sumOp<scalar>());
diff --git a/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
index 3024370154..3150c179fa 100644
--- a/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
+++ b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
@@ -15,7 +15,7 @@ functions
 
         functionObjectLibs ("libsampling.so");
 
-        writeControl   outputTime;
+        writeControl   writeTime;
         setFormat       gnuplot;
         fields          (p U);
         interpolationScheme cellPoint;
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
index fc131d876c..0ef1f22a5d 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
@@ -11,7 +11,7 @@ cuttingPlane
     type            surfaces;
     functionObjectLibs ("libsampling.so");
 
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
index 0eba37a5e4..6abdc3053e 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
@@ -56,7 +56,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         fields
         (
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
index fc131d876c..0ef1f22a5d 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
@@ -11,7 +11,7 @@ cuttingPlane
     type            surfaces;
     functionObjectLibs ("libsampling.so");
 
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index 9da666cb64..d435604913 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         fields
         (
@@ -118,7 +118,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
     }
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 89674629bd..704666f029 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         restartOnOutput   off;
 
         fields
@@ -119,7 +119,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
     }
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 6c7a28c1bf..450664dc79 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         fields
         (
@@ -118,7 +118,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
     }
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 12d011335f..9131af9669 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         fields
         (
@@ -119,7 +119,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
     }
 
     forces1
@@ -127,7 +127,7 @@ functions
         type            forces;
         enabled         true;
         functionObjectLibs ( "libforces.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         patches         ( obstacle );
         directForceDensity true;
         fDName          fDMean;
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
index fc131d876c..0ef1f22a5d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
@@ -11,7 +11,7 @@ cuttingPlane
     type            surfaces;
     functionObjectLibs ("libsampling.so");
 
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
index 13cc868421..325a3bff1d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
@@ -15,7 +15,7 @@ Q
     type Q;
 
     // Output every
-    writeControl outputTime;
+    writeControl writeTime;
 }
 
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
index e017f1fa2a..528b363f63 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
@@ -10,7 +10,7 @@ surfaces
 {
     type            surfaces;
     functionObjectLibs ("libsampling.so");
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     surfaceFormat   vtk;
     fields          (p U Q);
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
index ff898037e1..03793cbc50 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
@@ -62,7 +62,7 @@ functions
         name            probes;
 
         // Write at same frequency as fields
-        writeControl   outputTime;
+        writeControl   writeTime;
         writeInterval  1;
 
         // Fields to be probed
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
index e6a77b6b24..4a43a60f28 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
@@ -62,7 +62,7 @@ functions
         name            probes;
 
         // Write at same frequency as fields
-        writeControl   outputTime;
+        writeControl   writeTime;
         writeInterval  1;
 
         // Fields to be probed
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
index 056f78965c..d4070fbb9d 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
@@ -52,7 +52,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         fields
         (
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
index 652f9641e7..95a1ad13c2 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
@@ -52,7 +52,7 @@ functions
     streamLines
     {
         type            streamLine;
-        writeControl   outputTime;
+        writeControl   writeTime;
         setFormat       vtk;
         UName           U;
         trackForward    true;
@@ -74,7 +74,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ( "libsampling.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         surfaceFormat   vtk;
         fields          ( p U );
         interpolationScheme cellPoint;
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
index 0734dddbfd..befc1336c3 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
@@ -10,7 +10,7 @@ cuttingPlane
 {
     type            surfaces;
     functionObjectLibs ("libsampling.so");
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
index df6155539f..477ced82cd 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
@@ -11,7 +11,7 @@ streamLines
     type            streamLine;
 
     // Output every
-    writeControl   outputTime;
+    writeControl   writeTime;
     // writeInterval 10;
 
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index b14bfb6e25..855473e58c 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -78,7 +78,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         fields
         (
@@ -107,7 +107,7 @@ functions
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libsampling.so");
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         interpolationScheme cellPoint;
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
index b14bfb6e25..855473e58c 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
@@ -78,7 +78,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         fields
         (
@@ -107,7 +107,7 @@ functions
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libsampling.so");
         enabled         true;
-        writeControl   outputTime;
+        writeControl   writeTime;
 
         interpolationScheme cellPoint;
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 93ae229687..cd7ed81cd5 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -32,13 +32,6 @@ writeInterval   100;
 
 purgeWrite      0;
 
-
-//- Uncomment to have regular (every 2 hours of run time) restart files
-//secondaryWriteControl    cpuTime; // runtime
-//secondaryWriteInterval   7200;    // seconds
-//secondaryPurgeWrite      1;       // keep all but last dump
-
-
 writeFormat     binary;
 
 writePrecision  6;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
index 0734dddbfd..befc1336c3 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
@@ -10,7 +10,7 @@ cuttingPlane
 {
     type            surfaces;
     functionObjectLibs ("libsampling.so");
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index e03db10013..1a7184fb86 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -14,7 +14,7 @@ streamLines
     type            streamLine;
 
     // Output every
-    writeControl   outputTime;
+    writeControl   writeTime;
     // writeInterval 10;
 
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index a5c31d4ff0..a6dccc6705 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -15,7 +15,7 @@ near
     type nearWallFields;
 
     // Output every
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     // Fields to be sampled. Per field original name and mapped field to
     // create.
@@ -40,7 +40,7 @@ wallBoundedStreamLines
     type            wallBoundedStreamLine;
 
     // Output every
-    writeControl   outputTime;
+    writeControl   writeTime;
 
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index fdad9ab8b4..71d42db917 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -55,7 +55,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Output every
-        writeControl   outputTime;
+        writeControl   writeTime;
         // writeInterval 10;
 
         setFormat       vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index f7e5c216cf..d8032efee5 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -55,7 +55,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Output every
-        writeControl   outputTime;
+        writeControl   writeTime;
         // writeInterval 10;
 
         setFormat       vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
index 4421c236ad..357bbc962e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
@@ -58,7 +58,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        writeControl   outputTime;
+        writeControl   writeTime;
         log             yes;
         valueOutput     no;
         source          patch;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
index c75428cf30..c0b5659ff1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
@@ -53,7 +53,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        writeControl   outputTime;
+        writeControl   writeTime;
         log             yes;
         valueOutput     no;
         source          patch;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
index 38aa97f087..b547bcf0c3 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
@@ -53,7 +53,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        writeControl   outputTime;
+        writeControl   writeTime;
         log             yes;
         valueOutput     no;
         source          patch;
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
index ad9c76e9fc..e98b3c14ac 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
@@ -33,13 +33,6 @@ writeInterval   1;
 
 purgeWrite      0;
 
-
-//- Uncomment to have regular (every 2 hours of run time) restart files
-//secondaryWriteControl    cpuTime; // runtime
-//secondaryWriteInterval   7200;    // seconds
-//secondaryPurgeWrite      1;       // keep all but last dump
-
-
 writeFormat     binary;
 
 writePrecision  8;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 3da7d76dcd..ee6b8267ff 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -56,7 +56,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index 6daf316aaa..f495ec0e7f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -56,7 +56,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
index 79c542f0bd..6ebd8cd2fe 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -58,7 +58,7 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         probeLocations
         (
             (0 9.95 19.77)
@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ("libsampling.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index 9f39c9d393..8dcc4a5034 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -58,7 +58,7 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         probeLocations
         (
             (0 9.95 19.77)
@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ("libsampling.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index a680109603..d7f803717c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         probeLocations
         (
             (0 9.95 19.77)
@@ -74,7 +74,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ("libsampling.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
index 5d8e2c587d..ef183ae9f8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
index 8df78e372c..a7682133ac 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            forces;
         functionObjectLibs ("libforces.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         patches         (floatingObject);
         pName           p;
         UName           U;
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index cb8fdb90bd..f14f836958 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            forces;
         functionObjectLibs ("libforces.so");
-        writeControl   outputTime;
+        writeControl   writeTime;
         patches         (floatingObject);
         pName           p;
         UName           U;
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 0d60606d49..cea35079ef 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions0
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index ca4b6c409b..1a0a73e343 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index ca4b6c409b..1a0a73e343 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index 78983c43c1..8f109eb589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.particles
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index ca4b6c409b..1a0a73e343 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index ca4b6c409b..1a0a73e343 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 6267df6d6b..6b261193bd 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.particles
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 5335b6c03c..1f7f969de7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 5335b6c03c..1f7f969de7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index f9d47130f3..e987039e57 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.particles
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 5335b6c03c..1f7f969de7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 5335b6c03c..1f7f969de7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 10ddeb9399..4d2ae22021 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        writeControl   outputTime;
+        writeControl   writeTime;
         fields
         (
             U.particles