diff --git a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C index daeae4a111d79f7db916f705063e7f27f04961b7..a011455ef275fe2c35105f8092eb75fd3a8ced8e 100644 --- a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C @@ -137,4 +137,14 @@ void Foam::emptyFaPatchField<Type>::updateCoeffs() } +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class Type> +void Foam::emptyFaPatchField<Type>::write(Ostream& os) const +{ + faPatchField<Type>::write(os); + // Never write "value" +} + + // ************************************************************************* // diff --git a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H index ef6b2d9e36a5be2d31501aecaf64f748eb3f2be0..cd7d1febbe040c97e5df5e05d1dc22c98a2c35f5 100644 --- a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H +++ b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H @@ -186,6 +186,12 @@ public: { return tmp<Field<Type>>::New(); } + + + // Member Functions + + //- Write without "value" entry! + virtual void write(Ostream&) const; }; diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C index 9f0e1818aba6766a5e505c405171a6523ce3b0b4..4439efada22dee9580d5714c266adb76d188109d 100644 --- a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C +++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C @@ -131,4 +131,14 @@ Foam::slicedFaePatchField<Type>::~slicedFaePatchField() } +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class Type> +void Foam::slicedFaePatchField<Type>::write(Ostream& os) const +{ + faePatchField<Type>::write(os); + faePatchField<Type>::writeValueEntry(os); +} + + // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H index 17302930ee5943108fcf26a2668be74a6cc7a431..3dd671d7644285ff3c60ef3a1e2f2288462884cb 100644 --- a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H +++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H @@ -141,6 +141,9 @@ public: //- True: this patch field fixes a value. virtual bool fixesValue() const { return true; } + //- Write includes "value" entry + virtual void write(Ostream&) const; + // Member Operators diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C index d77ef591d5dac8d81c087a01bad6f9669c4de222..233c58881298ccb550952c1a97d904decb11d823 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C +++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C @@ -108,4 +108,14 @@ Foam::emptyFaePatchField<Type>::emptyFaePatchField {} +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class Type> +void Foam::emptyFaePatchField<Type>::write(Ostream& os) const +{ + faePatchField<Type>::write(os); + // Never write "value" +} + + // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H index 3d9afcace4677eb67bc5b92f92069a7e305547ae..1d26f2b788173d90578c62ee5560ecb62b709de3 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H +++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H @@ -124,9 +124,9 @@ public: virtual ~emptyFaePatchField() = default; - // Member functions + // Member Functions - // Mapping functions + // Mapping Functions //- Map (and resize as needed) from self given a mapping object virtual void autoMap @@ -142,6 +142,12 @@ public: const labelList& ) {} + + + // Member Functions + + //- Write without "value" entry! + virtual void write(Ostream&) const; }; diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C index 5bbc2ddd6f20dde9ff378aaccdd7f87ad8179c2a..3a7da4963b03a1074a2c4fe6b8c6f94db6be7e20 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C @@ -123,4 +123,12 @@ void Foam::emptyFvPatchField<Type>::updateCoeffs() } +template<class Type> +void Foam::emptyFvPatchField<Type>::write(Ostream& os) const +{ + fvPatchField<Type>::write(os); + // Never write "value" +} + + // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H index b22e96584c71584740db2aa6f2fe0179dc3ce4ec..3cf910fc07297c6e7f1daeb749a9050ff91af10c 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H @@ -42,7 +42,7 @@ Usage \verbatim <patchName> { - type empty; + type empty; } \endverbatim @@ -194,6 +194,12 @@ public: { return tmp<Field<Type>>::New(); } + + + // Member Functions + + //- Write without "value" entry! + virtual void write(Ostream&) const; }; diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H index 1e8914fd2503101f2235928c020efda18a94681c..4b629cba9841c7afbc78d520b8416bb7ca7d162f 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H @@ -43,8 +43,8 @@ Usage \verbatim <patchName> { - type calculated; - value uniform (0 0 0); // Required value entry + type calculated; + value uniform (0 0 0); // Required value entry } \endverbatim @@ -88,6 +88,7 @@ public: ); //- Construct from patch, internal field and dictionary + //- The "value" entry is MUST_READ. calculatedFvsPatchField ( const fvPatch&, diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H index b6ce0ea9f0c99f58c5104cf91aeb7ce22afbd383..ddb826956257998a10d75ff49e82daf74aacf64c 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H @@ -123,7 +123,7 @@ public: // Member Functions - //- True if this patch field is derived from coupledFvsPatchField + //- True: this patch field is derived from coupledFvsPatchField virtual bool coupled() const { return true; diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H index 5934499fe0861b84697f6a4c5db9034bbd12d95e..600abc3ba6ca726673e8189458e3b8fe48ade93d 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H @@ -43,8 +43,8 @@ Usage \verbatim <patchName> { - type fixedValue; - value uniform 0; // Example for scalar field usage + type fixedValue; + value uniform 0; // Example for scalar field usage } \endverbatim @@ -151,7 +151,7 @@ public: virtual void write(Ostream&) const; - // Evaluation functions + // Evaluation Functions //- Return the matrix diagonal coefficients corresponding to the // evaluation of the value of this patchField with given weights diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H index 384638a754749bacf31d2c449651d2911c25f8b5..8678370201cee58da286f409123a9212aeaf9811 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H @@ -88,7 +88,7 @@ public: ); //- Construct from patch, internal field and dictionary. - //- The "value" entry is NO_READ. + //- The "value" entry is MUST_READ. cyclicFvsPatchField ( const fvPatch&, diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H index 09833a088eae6a5eaca635d29ce7545adeb211b6..023beff5b41e9e39cdca11bf497b014f5392f4d8 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H @@ -54,7 +54,6 @@ class cyclicSlipFvsPatchField : public cyclicFvsPatchField<Type> { - public: //- Runtime type information diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C index 5c1d93d7d531b24bdb89e9173714c7daa7b5e0cf..4ad2d350be91a8256e15017934c16c928af25960 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C @@ -110,4 +110,14 @@ Foam::emptyFvsPatchField<Type>::emptyFvsPatchField {} +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class Type> +void Foam::emptyFvsPatchField<Type>::write(Ostream& os) const +{ + fvsPatchField<Type>::write(os); + // Never write "value" +} + + // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H index 6a703550751c1e37d8985418f3d79e670df2dc8e..f736e76d2b4ba9d408827f976d0669886beeb67c 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H @@ -37,7 +37,7 @@ Usage \verbatim <patchName> { - type empty; + type empty; } \endverbatim @@ -146,6 +146,12 @@ public: const labelList& ) {} + + + // Member Functions + + //- Write without "value" entry! + virtual void write(Ostream&) const; }; diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H index 6f5fdd7d718cb7048f5a9e7698aebd3e7180bc11..8c78a68aa1ac55a3420abc6b7ddf1fba452d214e 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H @@ -54,7 +54,6 @@ class nonuniformTransformCyclicFvsPatchField : public cyclicFvsPatchField<Type> { - public: //- Runtime type information diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C index 071abfefee309d289eecc4b21c6ede9154b5a4eb..fb604eabd4495b793b52064c7de9a88727c4611e 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C @@ -49,7 +49,7 @@ Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField const dictionary& dict ) : - fvsPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ) + fvsPatchField<Type>(p, iF, dict, IOobjectOption::MUST_READ) { if (!isType<symmetryFvPatch>(p)) { @@ -105,4 +105,14 @@ Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField {} +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class Type> +void Foam::symmetryFvsPatchField<Type>::write(Ostream& os) const +{ + fvsPatchField<Type>::write(os); + fvsPatchField<Type>::writeValueEntry(os); +} + + // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H index 4142b0d70fa3702008f95119ca6656c576b7e674..03269966a170cbd08f6c43b71ef68a1da7dc62f9 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H @@ -30,14 +30,15 @@ Class Description This boundary condition enforces a symmetry constraint - The "value" entry is NO_READ, NO_WRITE. + The "value" entry is MUST_READ. Usage Example of the boundary condition specification: \verbatim <patchName> { - type symmetry; + type symmetry; + value ...; } \endverbatim @@ -82,7 +83,7 @@ public: ); //- Construct from patch, internal field and dictionary - //- The "value" entry is NO_READ. + //- The "value" entry is MUST_READ. symmetryFvsPatchField ( const fvPatch&, @@ -126,6 +127,12 @@ public: { return fvsPatchField<Type>::Clone(*this, iF); } + + + // Member Functions + + //- Write includes "value" entry + virtual void write(Ostream&) const; }; diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C index 80d4b9378d41b0448cfbf2a5b4484a45b523710b..c12a280cb33f836f557c763a41658981a41a8d19 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C @@ -49,7 +49,7 @@ Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField const dictionary& dict ) : - fvsPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ) + fvsPatchField<Type>(p, iF, dict, IOobjectOption::MUST_READ) { if (!isType<symmetryPlaneFvPatch>(p)) { @@ -105,4 +105,14 @@ Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField {} +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class Type> +void Foam::symmetryPlaneFvsPatchField<Type>::write(Ostream& os) const +{ + fvsPatchField<Type>::write(os); + fvsPatchField<Type>::writeValueEntry(os); +} + + // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H index 717506e082aa03f44d61423c7c59d5593d6f74ad..515f1bdbecfc17b2dbcbe7e7af7e3d82525f3e73 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H @@ -29,14 +29,15 @@ Class Description This boundary condition enforces a symmetryPlane constraint - The "value" entry is NO_READ, NO_WRITE. + The "value" entry is MUST_READ. Usage Example of the boundary condition specification: \verbatim <patchName> { - type symmetryPlane; + type symmetryPlane; + value ...; } \endverbatim @@ -81,7 +82,7 @@ public: ); //- Construct from patch, internal field and dictionary. - //- The "value" entry is NO_READ. + //- The "value" entry is MUST_READ. symmetryPlaneFvsPatchField ( const fvPatch&, @@ -125,6 +126,12 @@ public: { return fvsPatchField<Type>::Clone(*this, iF); } + + + // Member Functions + + //- Write includes "value" entry + virtual void write(Ostream&) const; }; diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C index df57e01f614edd85d5b04eb2988f371879a6211a..013a628b5339c61d8c3c463b8bb915193d2f2a2b 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C @@ -49,7 +49,7 @@ Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField const dictionary& dict ) : - fvsPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ) + fvsPatchField<Type>(p, iF, dict, IOobjectOption::MUST_READ) { if (!isType<wedgeFvPatch>(p)) { @@ -105,4 +105,14 @@ Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField {} +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class Type> +void Foam::wedgeFvsPatchField<Type>::write(Ostream& os) const +{ + fvsPatchField<Type>::write(os); + fvsPatchField<Type>::writeValueEntry(os); +} + + // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H index aeb04ff0bc3f6d92b46f808fd94abccf019a06d2..1325dd9a42290aff1bf0525635e7a1951ef30494 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H @@ -31,14 +31,15 @@ Description This boundary condition is similar to the cyclic condition, except that it is applied to 2-D geometries. - The "value" entry is NO_READ, NO_WRITE. + The "value" entry is MUST_READ. Usage Example of the boundary condition specification: \verbatim <patchName> { - type wedge; + type wedge; + value uniform ...; // Required value entry } \endverbatim @@ -83,7 +84,7 @@ public: ); //- Construct from patch, internal field and dictionary. - //- The "value" entry is NO_READ. + //- The "value" entry is MUST_READ. wedgeFvsPatchField ( const fvPatch&, @@ -127,6 +128,12 @@ public: { return fvsPatchField<Type>::Clone(*this, iF); } + + + // Member Functions + + //- Write includes "value" entry + virtual void write(Ostream&) const; };