diff --git a/src/fvOptions/cellSetOption/cellSetOption.H b/src/fvOptions/cellSetOption/cellSetOption.H
index e391ce60d..6dcbe1788 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.H
+++ b/src/fvOptions/cellSetOption/cellSetOption.H
@@ -192,9 +192,6 @@ public:
 
         // IO
 
-            //- Write the source properties
-            virtual void writeData(Ostream&) const;
-
             //- Read source dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/cellSetOption/cellSetOptionIO.C b/src/fvOptions/cellSetOption/cellSetOptionIO.C
index 534472eb7..90e30a221 100644
--- a/src/fvOptions/cellSetOption/cellSetOptionIO.C
+++ b/src/fvOptions/cellSetOption/cellSetOptionIO.C
@@ -27,50 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::fv::cellSetOption::writeData(Ostream& os) const
-{
-    option::writeData(os);
-
-    os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl;
-    os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl;
-    os.writeKeyword("selectionMode")
-        << selectionModeTypeNames_[selectionMode_] << nl;
-
-    switch (selectionMode_)
-    {
-        case smPoints:
-        {
-            os.writeKeyword("points") << points_
-                << token::END_STATEMENT << nl;
-            break;
-        }
-        case smCellSet:
-        {
-            os.writeKeyword("cellSet") << cellSetName_
-                << token::END_STATEMENT << nl;
-            break;
-        }
-        case smCellZone:
-        {
-            os.writeKeyword("cellZone") << cellSetName_
-                << token::END_STATEMENT << nl;
-            break;
-        }
-        case smAll:
-        {
-            break;
-        }
-        default:
-        {
-            FatalErrorIn("option::writeData(Ostream&) const")
-                << "Unknown selectionMode "
-                << selectionMode_
-                << abort(FatalError);
-        }
-    }
-}
-
-
 bool Foam::fv::cellSetOption::read(const dictionary& dict)
 {
     if (option::read(dict))
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 9cb7fbdf6..422e6725d 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -107,7 +107,7 @@ bool Foam::fv::fixedTemperatureConstraint::alwaysApply() const
 }
 
 
-void Foam::fv::fixedTemperatureConstraint::setValue
+void Foam::fv::fixedTemperatureConstraint::constrain
 (
     fvMatrix<scalar>& eqn,
     const label
@@ -148,13 +148,6 @@ void Foam::fv::fixedTemperatureConstraint::setValue
 }
 
 
-void Foam::fv::fixedTemperatureConstraint::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index c33bc8a16..0337ef31e 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -142,14 +142,11 @@ public:
         // Set values directly
 
             //- Scalar
-            virtual void setValue(fvMatrix<scalar>& eqn, const label fieldI);
+            virtual void constrain(fvMatrix<scalar>& eqn, const label fieldI);
 
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
index b2b09cbd9..724548e06 100644
--- a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
+++ b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
@@ -125,13 +125,6 @@ void Foam::fv::temperatureLimitsConstraint::correct(volScalarField& he)
 }
 
 
-void Foam::fv::temperatureLimitsConstraint::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::temperatureLimitsConstraint::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
diff --git a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
index f3e178c4d..c1490da32 100644
--- a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
+++ b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
@@ -120,9 +120,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C
index 6dc030c68..cf48f43fd 100644
--- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C
+++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C
@@ -69,7 +69,7 @@ Foam::fv::ExplicitSetValue<Type>::ExplicitSetValue
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::fv::ExplicitSetValue<Type>::setValue
+void Foam::fv::ExplicitSetValue<Type>::constrain
 (
     fvMatrix<Type>& eqn,
     const label fieldI
@@ -78,7 +78,7 @@ void Foam::fv::ExplicitSetValue<Type>::setValue
     if (debug)
     {
         Info<< "ExplicitSetValue<"<< pTraits<Type>::typeName
-            << ">::setValue for source " << name_ << endl;
+            << ">::constrain for source " << name_ << endl;
     }
 
     List<Type> values(cells_.size(), injectionRate_[fieldI]);
diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
index 59e3c6f34..7e3bb15c3 100644
--- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
+++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
@@ -108,14 +108,11 @@ public:
         // Evaluation
 
             //- Set value on field
-            virtual void setValue(fvMatrix<Type>& eqn, const label fieldI);
+            virtual void constrain(fvMatrix<Type>& eqn, const label fieldI);
 
 
         // IO
 
-            //- Write the source properties
-            virtual void writeData(Ostream&) const;
-
             //- Read source dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
index c0c7c2c3b..0f1c2f9d4 100644
--- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
+++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
@@ -27,14 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-void Foam::fv::ExplicitSetValue<Type>::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 template<class Type>
 bool Foam::fv::ExplicitSetValue<Type>::read(const dictionary& dict)
 {
diff --git a/src/fvOptions/fvOption/fvOption.C b/src/fvOptions/fvOption/fvOption.C
index 7c180b172..547d2f396 100644
--- a/src/fvOptions/fvOption/fvOption.C
+++ b/src/fvOptions/fvOption/fvOption.C
@@ -61,7 +61,7 @@ Foam::fv::option::option
     mesh_(mesh),
     dict_(dict),
     coeffs_(dict.subDict(modelType + "Coeffs")),
-    active_(dict_.lookupOrDefault<bool>("active", true)),
+    active_(dict_.lookupOrDefault<Switch>("active", true)),
     fieldNames_(),
     applied_()
 {
@@ -304,15 +304,15 @@ void Foam::fv::option::addSup
 }
 
 
-void Foam::fv::option::setValue(fvMatrix<scalar>& eqn, const label fieldI)
+void Foam::fv::option::constrain(fvMatrix<scalar>& eqn, const label fieldI)
 {}
 
 
-void Foam::fv::option::setValue(fvMatrix<vector>& eqn, const label fieldI)
+void Foam::fv::option::constrain(fvMatrix<vector>& eqn, const label fieldI)
 {}
 
 
-void Foam::fv::option::setValue
+void Foam::fv::option::constrain
 (
     fvMatrix<sphericalTensor>& eqn,
     const label fieldI
@@ -320,7 +320,7 @@ void Foam::fv::option::setValue
 {}
 
 
-void Foam::fv::option::setValue
+void Foam::fv::option::constrain
 (
     fvMatrix<symmTensor>& eqn,
     const label fieldI
@@ -328,7 +328,7 @@ void Foam::fv::option::setValue
 {}
 
 
-void Foam::fv::option::setValue(fvMatrix<tensor>& eqn, const label fieldI)
+void Foam::fv::option::constrain(fvMatrix<tensor>& eqn, const label fieldI)
 {}
 
 
diff --git a/src/fvOptions/fvOption/fvOption.H b/src/fvOptions/fvOption/fvOption.H
index 63ba718a7..d7b431b12 100644
--- a/src/fvOptions/fvOption/fvOption.H
+++ b/src/fvOptions/fvOption/fvOption.H
@@ -46,6 +46,7 @@ SourceFiles
 #include "fvMatricesFwd.H"
 #include "volFieldsFwd.H"
 #include "dictionary.H"
+#include "Switch.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -84,7 +85,7 @@ protected:
         dictionary coeffs_;
 
         //- Source active flag
-        bool active_;
+        Switch active_;
 
         //- Field names to apply source to - populated by derived models
         wordList fieldNames_;
@@ -212,7 +213,7 @@ public:
         // Edit
 
             //- Return access to the source active flag
-            inline bool& active();
+            inline Switch& active();
 
 
         // Checks
@@ -376,38 +377,38 @@ public:
                 );
 
 
-            // Set values directly
+            // Constraints
 
                 //- Scalar
-                virtual void setValue
+                virtual void constrain
                 (
                     fvMatrix<scalar>& eqn,
                     const label fieldI
                 );
 
                 //- Vector
-                virtual void setValue
+                virtual void constrain
                 (
                     fvMatrix<vector>& eqn,
                     const label fieldI
                 );
 
                 //- Spherical tensor
-                virtual void setValue
+                virtual void constrain
                 (
                     fvMatrix<sphericalTensor>& eqn,
                     const label fieldI
                 );
 
                 //- Symmetric tensor
-                virtual void setValue
+                virtual void constrain
                 (
                     fvMatrix<symmTensor>& eqn,
                     const label fieldI
                 );
 
                 //- Tensor
-                virtual void setValue
+                virtual void constrain
                 (
                     fvMatrix<tensor>& eqn,
                     const label fieldI
diff --git a/src/fvOptions/fvOption/fvOptionI.H b/src/fvOptions/fvOption/fvOptionI.H
index 042f7c2bb..5a1a4319d 100644
--- a/src/fvOptions/fvOption/fvOptionI.H
+++ b/src/fvOptions/fvOption/fvOptionI.H
@@ -55,7 +55,7 @@ inline void Foam::fv::option::setApplied(const label fieldI)
 }
 
 
-inline bool& Foam::fv::option::active()
+inline Foam::Switch& Foam::fv::option::active()
 {
     return active_;
 }
diff --git a/src/fvOptions/fvOption/fvOptionIO.C b/src/fvOptions/fvOption/fvOptionIO.C
index 21550d5cd..0f6c45322 100644
--- a/src/fvOptions/fvOption/fvOptionIO.C
+++ b/src/fvOptions/fvOption/fvOptionIO.C
@@ -42,7 +42,11 @@ void Foam::fv::option::writeFooter(Ostream& os) const
 
 void Foam::fv::option::writeData(Ostream& os) const
 {
-    os.writeKeyword("active") << active_ << token::END_STATEMENT << nl;
+    os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+    os.writeKeyword("active") << active_ << token::END_STATEMENT << nl << nl;
+
+    os << indent << word(type() + "Coeffs");
+    coeffs_.write(os);
 }
 
 
diff --git a/src/fvOptions/fvOption/fvOptionList.C b/src/fvOptions/fvOption/fvOptionList.C
index 94d1b2c34..33720d426 100644
--- a/src/fvOptions/fvOption/fvOptionList.C
+++ b/src/fvOptions/fvOption/fvOptionList.C
@@ -148,7 +148,9 @@ bool Foam::fv::optionList::writeData(Ostream& os) const
     forAll(*this, i)
     {
         os  << nl;
+        this->operator[](i).writeHeader(os);
         this->operator[](i).writeData(os);
+        this->operator[](i).writeFooter(os);
     }
 
     // Check state of IOstream
@@ -158,17 +160,10 @@ bool Foam::fv::optionList::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-namespace Foam
+Foam::Ostream& Foam::operator<<(Ostream& os, const fv::optionList& options)
 {
-    Ostream& operator<<
-    (
-        Ostream& os,
-        const fv::optionList& options
-    )
-    {
-        options.writeData(os);
-        return os;
-    }
+    options.writeData(os);
+    return os;
 }
 
 
diff --git a/src/fvOptions/fvOption/fvOptionList.H b/src/fvOptions/fvOption/fvOptionList.H
index d0d6ab0b4..b29beddda 100644
--- a/src/fvOptions/fvOption/fvOptionList.H
+++ b/src/fvOptions/fvOption/fvOptionList.H
@@ -44,6 +44,16 @@ SourceFile
 
 namespace Foam
 {
+
+// Forward declaration of friend functions and operators
+
+namespace fv
+{
+    class optionList;
+}
+
+Ostream& operator<<(Ostream& os, const fv::optionList& options);
+
 namespace fv
 {
 
@@ -191,6 +201,7 @@ public:
             );
 };
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace fv
diff --git a/src/fvOptions/fvOption/fvOptionListTemplates.C b/src/fvOptions/fvOption/fvOptionListTemplates.C
index 3b199e316..16e722e3f 100644
--- a/src/fvOptions/fvOption/fvOptionListTemplates.C
+++ b/src/fvOptions/fvOption/fvOptionListTemplates.C
@@ -241,7 +241,7 @@ void Foam::fv::optionList::constrain(fvMatrix<Type>& eqn)
                         << " to field " << eqn.psi().name() << endl;
                 }
 
-                source.setValue(eqn, fieldI);
+                source.constrain(eqn, fieldI);
             }
         }
     }
diff --git a/src/fvOptions/interRegionOption/interRegionOption.H b/src/fvOptions/interRegionOption/interRegionOption.H
index b7a45c02c..5b8e33492 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.H
+++ b/src/fvOptions/interRegionOption/interRegionOption.H
@@ -108,9 +108,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/interRegionOption/interRegionOptionIO.C b/src/fvOptions/interRegionOption/interRegionOptionIO.C
index 8c65ecd62..158ffc07e 100644
--- a/src/fvOptions/interRegionOption/interRegionOptionIO.C
+++ b/src/fvOptions/interRegionOption/interRegionOptionIO.C
@@ -27,15 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::fv::interRegionOption::writeData(Ostream& os) const
-{
-    option::writeData(os);
-    os.writeKeyword("master") << master_ << token::END_STATEMENT << nl;
-    os.writeKeyword("nbrRegionName") << nbrRegionName_
-        << token::END_STATEMENT << nl;
-}
-
-
 bool Foam::fv::interRegionOption::read(const dictionary& dict)
 {
     if (option::read(dict))
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
index 955dd1594..304f7c619 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
@@ -158,13 +158,6 @@ void Foam::fv::actuationDiskSource::addSup
 }
 
 
-void Foam::fv::actuationDiskSource::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::actuationDiskSource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
index 2563e5bb2..45ae16693 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
@@ -207,9 +207,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index 24cea47ef..44969e43f 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -308,13 +308,6 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
 }
 
 
-void Foam::fv::effectivenessHeatExchangerSource::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index 5b736b598..b6904701c 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -278,9 +278,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
index 688e047d0..e3c8d8a94 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
@@ -123,13 +123,6 @@ void Foam::fv::explicitPorositySource::addSup
 }
 
 
-void Foam::fv::explicitPorositySource::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
index 5e0d611df..8fa468916 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
@@ -161,9 +161,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
index dd152dce3..1ea7f1c71 100644
--- a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
@@ -214,7 +214,7 @@ void Foam::fv::pressureGradientExplicitSource::addSup
 }
 
 
-void Foam::fv::pressureGradientExplicitSource::setValue
+void Foam::fv::pressureGradientExplicitSource::constrain
 (
     fvMatrix<vector>& eqn,
     const label
diff --git a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
index aa6b083b4..fd94e4f09 100644
--- a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
+++ b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
@@ -146,7 +146,7 @@ public:
             );
 
             //- Set 1/A coefficient
-            virtual void setValue
+            virtual void constrain
             (
                 fvMatrix<vector>& eqn,
                 const label fieldI
@@ -155,9 +155,6 @@ public:
 
         // IO
 
-            //- Write the source properties
-            virtual void writeData(Ostream&) const;
-
             //- Read source dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
index ff639d776..c9f3ab345 100644
--- a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
+++ b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.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-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,18 +27,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::fv::pressureGradientExplicitSource::writeData(Ostream& os) const
-{
-    notImplemented
-    (
-        "void Foam::fv::pressureGradientExplicitSource::writeData"
-        "("
-            "Ostream&"
-        ") const"
-    );
-}
-
-
 bool Foam::fv::pressureGradientExplicitSource::read(const dictionary& dict)
 {
     notImplemented
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
index cab38d4fe..39250a9ee 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
@@ -111,12 +111,6 @@ void Foam::fv::radialActuationDiskSource::addSup
 }
 
 
-void Foam::fv::radialActuationDiskSource::writeData(Ostream& os) const
-{
-    actuationDiskSource::writeData(os);
-}
-
-
 bool Foam::fv::radialActuationDiskSource::read(const dictionary& dict)
 {
     if (actuationDiskSource::read(dict))
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
index e2c43776f..92e619999 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
@@ -163,9 +163,6 @@ public:
 
     // IO
 
-        //- Write data
-        virtual void writeData(Ostream&) const;
-
         //- Read dictionary
         virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 86f4dfa8b..c638d06ad 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -587,13 +587,6 @@ void Foam::fv::rotorDiskSource::addSup
 }
 
 
-void Foam::fv::rotorDiskSource::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index 818baec61..1640c313b 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -307,9 +307,6 @@ public:
 
         // IO
 
-            //- Write the source properties
-            virtual void writeData(Ostream&) const;
-
             //- Read source dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 23228f39c..ef963cdf7 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -255,9 +255,6 @@ public:
 
         // IO
 
-            //- Write the source properties
-            virtual void writeData(Ostream&) const;
-
             //- Read source dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
index da5aa79cc..9ead11778 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
@@ -27,13 +27,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::fv::solidificationMeltingSource::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
index 3635d6b35..6c23ae848 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
@@ -94,13 +94,6 @@ void Foam::fv::tabulatedAccelerationSource::addSup
 }
 
 
-void Foam::fv::tabulatedAccelerationSource::writeData(Ostream& os) const
-{
-    option::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::tabulatedAccelerationSource::read(const dictionary& dict)
 {
     if (option::read(dict))
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H
index 08de40adc..6127d0bff 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H
@@ -145,9 +145,6 @@ public:
             const label fieldi
         );
 
-        //- Write data
-        virtual void writeData(Ostream&) const;
-
         //- Read dictionary
         virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
index a42fb2c18..3573ae3ef 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.C
@@ -201,7 +201,7 @@ void Foam::fv::CodedSource<Type>::addSup
 
 
 template<class Type>
-void Foam::fv::CodedSource<Type>::setValue
+void Foam::fv::CodedSource<Type>::constrain
 (
     fvMatrix<Type>& eqn,
     const label fieldI
@@ -210,11 +210,11 @@ void Foam::fv::CodedSource<Type>::setValue
     if (debug)
     {
         Info<< "CodedSource<"<< pTraits<Type>::typeName
-            << ">::setValue for source " << name_ << endl;
+            << ">::constrain for source " << name_ << endl;
     }
 
     updateLibrary(redirectType_);
-    redirectFvOption().setValue(eqn, fieldI);
+    redirectFvOption().constrain(eqn, fieldI);
 }
 
 
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.H b/src/fvOptions/sources/general/codedSource/CodedSource.H
index ccd2c52a5..0de0d2e98 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.H
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.H
@@ -40,7 +40,7 @@ Description
         const label fieldI
     )
 
-    setValue
+    constrain
     (
         fvMatrix<Type}>& eqn,
         const label fieldI
@@ -217,7 +217,7 @@ public:
             );
 
             //- Set value
-            virtual void setValue
+            virtual void constrain
             (
                 fvMatrix<Type>& eqn,
                 const label fieldI
@@ -226,9 +226,6 @@ public:
 
         // IO
 
-            //- Write the source properties
-            virtual void writeData(Ostream&) const;
-
             //- Read source dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
index 14fa3ce8a..b605302b9 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
@@ -28,14 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-void Foam::fv::CodedSource<Type>::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 template<class Type>
 bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
 {
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
index be925d9a8..ce0df4a70 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
@@ -202,9 +202,6 @@ public:
 
         // IO
 
-            //- Write the source properties
-            virtual void writeData(Ostream&) const;
-
             //- Read source dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
index c64023a71..6d232b85c 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
@@ -27,14 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-void Foam::fv::SemiImplicitSource<Type>::writeData(Ostream& os) const
-{
-    cellSetOption::writeData(os);
-    dict_.write(os);
-}
-
-
 template<class Type>
 bool Foam::fv::SemiImplicitSource<Type>::read(const dictionary& dict)
 {
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 7fc645859..545214294 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -288,13 +288,6 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
 }
 
 
-void Foam::fv::interRegionExplicitPorositySource::writeData(Ostream& os) const
-{
-    interRegionOption::writeData(os);
-    dict_.write(os);
-}
-
-
 bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict)
 {
     if (interRegionOption::read(dict))
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
index 23bc40a6c..eafb1b384 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
@@ -164,9 +164,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C
index 7d2d4c80d..7422b11ef 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C
@@ -108,14 +108,6 @@ void Foam::fv::constantHeatTransfer::calculateHtc()
 {}
 
 
-void Foam::fv::constantHeatTransfer::writeData(Ostream& os) const
-{
-    interRegionHeatTransferModel::writeData(os);
-    os << indent << type() + "Coeffs" << nl;
-    coeffs_.write(os);
-}
-
-
 bool Foam::fv::constantHeatTransfer::read(const dictionary& dict)
 {
     if (interRegionHeatTransferModel::read(dict))
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H
index 288ef7f34..e3bd2830a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H
@@ -92,9 +92,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
index 101eec319..9066ce40e 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
@@ -188,9 +188,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C
index f678cd43b..72283e61a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C
@@ -27,17 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::fv::interRegionHeatTransferModel::writeData(Ostream& os) const
-{
-    interRegionOption::writeData(os);
-
-    os.writeKeyword("nbrModelName") << nbrModelName_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("semiImplicit") << semiImplicit_ << token::END_STATEMENT
-        << nl;
-}
-
-
 bool Foam::fv::interRegionHeatTransferModel::read(const dictionary& dict)
 {
     if (interRegionOption::read(dict))
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
index fa5955d2a..420032983 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
@@ -133,13 +133,6 @@ void Foam::fv::tabulatedHeatTransfer::calculateHtc()
 }
 
 
-void Foam::fv::tabulatedHeatTransfer::writeData(Ostream& os) const
-{
-    interRegionHeatTransferModel::writeData(os);
-    coeffs_.write(os);
-}
-
-
 bool Foam::fv::tabulatedHeatTransfer::read(const dictionary& dict)
 {
     if (interRegionHeatTransferModel::read(dict))
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
index 95a5a1be1..3f2be053f 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
@@ -109,9 +109,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
index 5d1f07346..f3852e82a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
@@ -126,13 +126,6 @@ void Foam::fv::variableHeatTransfer::calculateHtc()
 }
 
 
-void Foam::fv::variableHeatTransfer::writeData(Ostream& os) const
-{
-    interRegionHeatTransferModel::writeData(os);
-    coeffs_.write(os);
-}
-
-
 bool Foam::fv::variableHeatTransfer::read(const dictionary& dict)
 {
     if (interRegionHeatTransferModel::read(dict))
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
index 6f801003b..3b9d0f66f 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
@@ -113,9 +113,6 @@ public:
 
         // IO
 
-            //- Write data
-            virtual void writeData(Ostream&) const;
-
             //- Read dictionary
             virtual bool read(const dictionary& dict) ;
 };