From a38d55881a6146f86a4350e2b0f0d25d73f0ecda Mon Sep 17 00:00:00 2001 From: henry <Henry Weller h.weller@opencfd.co.uk> Date: Tue, 3 Jun 2008 15:18:49 +0100 Subject: [PATCH] Slightly massaged. --- ...timeVaryingUniformFixedValueFvPatchField.C | 57 ++++++++----------- ...timeVaryingUniformFixedValueFvPatchField.H | 7 ++- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.C index 1f52bde670d..d13224de3a6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.C @@ -28,13 +28,10 @@ License #include "Time.H" #include "IFstream.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template<class Type> -Foam:: -timeVaryingUniformFixedValueFvPatchField<Type>:: +Foam::timeVaryingUniformFixedValueFvPatchField<Type>:: timeVaryingUniformFixedValueFvPatchField ( const fvPatch& p, @@ -46,25 +43,7 @@ timeVaryingUniformFixedValueFvPatchField template<class Type> -Foam:: -timeVaryingUniformFixedValueFvPatchField<Type>:: -timeVaryingUniformFixedValueFvPatchField -( - const timeVaryingUniformFixedValueFvPatchField<Type>& ptf, - const fvPatch& p, - const DimensionedField<Type, volMesh>& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchField<Type>(ptf, p, iF, mapper), - timeDataFile_(ptf.timeDataFile_), - timeSeries_(ptf.timeBounding()) -{} - - -template<class Type> -Foam:: -timeVaryingUniformFixedValueFvPatchField<Type>:: +Foam::timeVaryingUniformFixedValueFvPatchField<Type>:: timeVaryingUniformFixedValueFvPatchField ( const fvPatch& p, @@ -88,8 +67,23 @@ timeVaryingUniformFixedValueFvPatchField template<class Type> -Foam:: -timeVaryingUniformFixedValueFvPatchField<Type>:: +Foam::timeVaryingUniformFixedValueFvPatchField<Type>:: +timeVaryingUniformFixedValueFvPatchField +( + const timeVaryingUniformFixedValueFvPatchField<Type>& ptf, + const fvPatch& p, + const DimensionedField<Type, volMesh>& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchField<Type>(ptf, p, iF, mapper), + timeDataFile_(ptf.timeDataFile_), + timeSeries_(ptf.timeBounding()) +{} + + +template<class Type> +Foam::timeVaryingUniformFixedValueFvPatchField<Type>:: timeVaryingUniformFixedValueFvPatchField ( const timeVaryingUniformFixedValueFvPatchField<Type>& ptf @@ -102,8 +96,7 @@ timeVaryingUniformFixedValueFvPatchField template<class Type> -Foam:: -timeVaryingUniformFixedValueFvPatchField<Type>:: +Foam::timeVaryingUniformFixedValueFvPatchField<Type>:: timeVaryingUniformFixedValueFvPatchField ( const timeVaryingUniformFixedValueFvPatchField<Type>& ptf, @@ -119,8 +112,7 @@ timeVaryingUniformFixedValueFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<class Type> -Type -Foam::timeVaryingUniformFixedValueFvPatchField<Type>:: +Type Foam::timeVaryingUniformFixedValueFvPatchField<Type>:: currentValue() { if (timeSeries_.size() == 0) @@ -186,7 +178,10 @@ void Foam::timeVaryingUniformFixedValueFvPatchField<Type>::updateCoeffs() template<class Type> -void Foam::timeVaryingUniformFixedValueFvPatchField<Type>::write(Ostream& os) const +void Foam::timeVaryingUniformFixedValueFvPatchField<Type>::write +( + Ostream& os +) const { fvPatchField<Type>::write(os); os.writeKeyword("timeDataFile") @@ -197,6 +192,4 @@ void Foam::timeVaryingUniformFixedValueFvPatchField<Type>::write(Ostream& os) co } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.H index 23850c78621..81e20720f2e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFvPatchField.H @@ -72,15 +72,16 @@ class timeVaryingUniformFixedValueFvPatchField { // Private data - //- file containing time/uniformFixedValue + //- File containing time/uniformFixedValue fileName timeDataFile_; - //- the time series being used, including the bounding treatment + //- The time series being used, including the bounding treatment timeSeries<Type> timeSeries_; - //- interpolate the value at the current time + //- Interpolate the value at the current time Type currentValue(); + public: //- Runtime type information -- GitLab