From b4a94650c9a5d25c2390e62eca755af25454e1c8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 31 May 2015 17:14:32 +0100
Subject: [PATCH] fvOption: Rationalize read to support re-reading
writeData is not yet completely consistent with read.
---
src/fvOptions/cellSetOption/cellSetOption.H | 8 +-------
src/fvOptions/cellSetOption/cellSetOptionIO.C | 13 -------------
.../fixedTemperatureConstraint.C | 4 ++--
.../fixedTemperatureConstraint.H | 2 +-
.../temperatureLimitsConstraint.C | 4 ++--
.../temperatureLimitsConstraint.H | 5 ++---
.../general/explicitSetValue/ExplicitSetValue.H | 2 +-
.../general/explicitSetValue/ExplicitSetValueIO.C | 4 ++--
src/fvOptions/fvOption/fvOption.H | 2 +-
src/fvOptions/fvOption/fvOptionList.H | 2 +-
src/fvOptions/interRegionOption/interRegionOption.H | 4 ++--
.../actuationDiskSource/actuationDiskSource.C | 4 ++--
.../actuationDiskSource/actuationDiskSource.H | 2 +-
.../effectivenessHeatExchangerSource.C | 4 ++--
.../effectivenessHeatExchangerSource.H | 2 +-
.../explicitPorositySource/explicitPorositySource.C | 4 ++--
.../explicitPorositySource/explicitPorositySource.H | 2 +-
.../pressureGradientExplicitSource.H | 2 +-
.../radialActuationDiskSource.C | 6 +-----
.../radialActuationDiskSource.H | 2 +-
.../derived/rotorDiskSource/rotorDiskSource.C | 4 ++--
.../derived/rotorDiskSource/rotorDiskSource.H | 2 +-
.../solidificationMeltingSource.H | 2 +-
.../solidificationMeltingSourceIO.C | 4 ++--
.../tabulatedAccelerationSource.C | 2 +-
.../sources/general/codedSource/CodedSource.H | 2 +-
.../sources/general/codedSource/CodedSourceIO.C | 4 ++--
.../general/semiImplicitSource/SemiImplicitSource.H | 2 +-
.../semiImplicitSource/SemiImplicitSourceIO.C | 4 ++--
.../interRegionExplicitPorositySource.C | 4 ++--
.../interRegionExplicitPorositySource.H | 2 +-
.../constantHeatTransfer/constantHeatTransfer.C | 11 ++---------
.../constantHeatTransfer/constantHeatTransfer.H | 2 +-
.../interRegionHeatTransferModel.H | 2 +-
.../interRegionHeatTransferModelIO.C | 2 +-
.../tabulatedHeatTransfer/tabulatedHeatTransfer.C | 8 +-------
.../tabulatedHeatTransfer/tabulatedHeatTransfer.H | 2 +-
.../variableHeatTransfer/variableHeatTransfer.C | 9 +--------
.../variableHeatTransfer/variableHeatTransfer.H | 2 +-
39 files changed, 52 insertions(+), 96 deletions(-)
diff --git a/src/fvOptions/cellSetOption/cellSetOption.H b/src/fvOptions/cellSetOption/cellSetOption.H
index ff3d534d2d1..e391ce60d46 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.H
+++ b/src/fvOptions/cellSetOption/cellSetOption.H
@@ -190,13 +190,7 @@ public:
virtual bool isActive();
- // I-O
-
- //- Write the source header information
- virtual void writeHeader(Ostream&) const;
-
- //- Write the source footer information
- virtual void writeFooter(Ostream&) const;
+ // IO
//- Write the source properties
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/cellSetOption/cellSetOptionIO.C b/src/fvOptions/cellSetOption/cellSetOptionIO.C
index 6555bb1d95c..534472eb7d7 100644
--- a/src/fvOptions/cellSetOption/cellSetOptionIO.C
+++ b/src/fvOptions/cellSetOption/cellSetOptionIO.C
@@ -27,19 +27,6 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::fv::cellSetOption::writeHeader(Ostream& os) const
-{
- os << indent << name_ << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
-}
-
-
-void Foam::fv::cellSetOption::writeFooter(Ostream& os) const
-{
- os << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
void Foam::fv::cellSetOption::writeData(Ostream& os) const
{
option::writeData(os);
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index cee1702e0d2..9cb7fbdf6d2 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -150,14 +150,14 @@ void Foam::fv::fixedTemperatureConstraint::setValue
void Foam::fv::fixedTemperatureConstraint::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
if (coeffs_.found(Tuniform_->name()))
{
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 3392a087af1..c33bc8a164b 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -145,7 +145,7 @@ public:
virtual void setValue(fvMatrix<scalar>& eqn, const label fieldI);
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
index c30ecaad40f..b2b09cbd97e 100644
--- a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
+++ b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
@@ -127,14 +127,14 @@ void Foam::fv::temperatureLimitsConstraint::correct(volScalarField& he)
void Foam::fv::temperatureLimitsConstraint::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::temperatureLimitsConstraint::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
coeffs_.readIfPresent("Tmin", Tmin_);
coeffs_.readIfPresent("Tmax", Tmax_);
diff --git a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
index 4da16aac45e..f3e178c4dc5 100644
--- a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
+++ b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
@@ -36,9 +36,8 @@ Description
maximum 500;
}
-
SourceFiles
- fvOption.C
+ temperatureLimitsConstraint.C
\*---------------------------------------------------------------------------*/
@@ -119,7 +118,7 @@ public:
virtual void correct(volScalarField& he);
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
index c1c7da2d6eb..59e3c6f34ea 100644
--- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
+++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
@@ -111,7 +111,7 @@ public:
virtual void setValue(fvMatrix<Type>& eqn, const label fieldI);
- // I-O
+ // IO
//- Write the source properties
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
index 2df213772f5..fdb4fed63ff 100644
--- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
+++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
@@ -30,7 +30,7 @@ License
template<class Type>
void Foam::fv::ExplicitSetValue<Type>::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
@@ -38,7 +38,7 @@ void Foam::fv::ExplicitSetValue<Type>::writeData(Ostream& os) const
template<class Type>
bool Foam::fv::ExplicitSetValue<Type>::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
setFieldData(coeffs_.subDict("injectionRate"));
return true;
diff --git a/src/fvOptions/fvOption/fvOption.H b/src/fvOptions/fvOption/fvOption.H
index 3b63a505ac1..63ba718a7b8 100644
--- a/src/fvOptions/fvOption/fvOption.H
+++ b/src/fvOptions/fvOption/fvOption.H
@@ -414,7 +414,7 @@ public:
);
- // I-O
+ // IO
//- Write the source header information
virtual void writeHeader(Ostream&) const;
diff --git a/src/fvOptions/fvOption/fvOptionList.H b/src/fvOptions/fvOption/fvOptionList.H
index 725019880b3..d0d6ab0b4ca 100644
--- a/src/fvOptions/fvOption/fvOptionList.H
+++ b/src/fvOptions/fvOption/fvOptionList.H
@@ -175,7 +175,7 @@ public:
void constrain(fvMatrix<Type>& eqn);
- // I-O
+ // IO
//- Read dictionary
virtual bool read(const dictionary& dict);
diff --git a/src/fvOptions/interRegionOption/interRegionOption.H b/src/fvOptions/interRegionOption/interRegionOption.H
index e6808750ebb..b7a45c02c14 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.H
+++ b/src/fvOptions/interRegionOption/interRegionOption.H
@@ -25,7 +25,7 @@ Class
Foam::fv::interRegionOption
Description
- Base class for inter region exchange.
+ Base class for inter-region exchange.
\*---------------------------------------------------------------------------*/
@@ -106,7 +106,7 @@ public:
inline const meshToMesh& meshInterp() const;
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
index adb0470aa70..955dd159435 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
@@ -160,14 +160,14 @@ void Foam::fv::actuationDiskSource::addSup
void Foam::fv::actuationDiskSource::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::actuationDiskSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
coeffs_.readIfPresent("diskDir", diskDir_);
coeffs_.readIfPresent("Cp", Cp_);
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
index 26c4a3084fd..2563e5bb219 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
@@ -205,7 +205,7 @@ public:
);
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index 5bd5c3a0c14..24cea47efe1 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -310,14 +310,14 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
void Foam::fv::effectivenessHeatExchangerSource::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
coeffs_.lookup("secondaryMassFlowRate") >> secondaryMassFlowRate_;
coeffs_.lookup("secondaryInletT") >> secondaryInletT_;
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index a52a8363a91..5b736b5985e 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -276,7 +276,7 @@ public:
);
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
index 11606998d0c..688e047d09a 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
@@ -125,14 +125,14 @@ void Foam::fv::explicitPorositySource::addSup
void Foam::fv::explicitPorositySource::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
if (coeffs_.found("UNames"))
{
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
index dd7f49ebada..5e0d611df12 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
@@ -159,7 +159,7 @@ public:
);
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
index 1851548da60..aa6b083b472 100644
--- a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
+++ b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
@@ -153,7 +153,7 @@ public:
);
- // I-O
+ // IO
//- Write the source properties
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
index 4db0484d31e..f55a2b53541 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
@@ -119,12 +119,8 @@ void Foam::fv::radialActuationDiskSource::writeData(Ostream& os) const
bool Foam::fv::radialActuationDiskSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (actuationDiskSource::read(dict))
{
- coeffs_.readIfPresent("diskDir", diskDir_);
- coeffs_.readIfPresent("Cp", Cp_);
- coeffs_.readIfPresent("Ct", Ct_);
- coeffs_.readIfPresent("diskArea", diskArea_);
coeffs_.lookup("coeffs") >> radialCoeffs_;
return true;
}
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
index 33cd215ce9b..36ea37883b3 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
@@ -161,7 +161,7 @@ public:
);
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 8c343f85a8e..86f4dfa8ba7 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -589,14 +589,14 @@ void Foam::fv::rotorDiskSource::addSup
void Foam::fv::rotorDiskSource::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
coeffs_.lookup("fieldNames") >> fieldNames_;
applied_.setSize(fieldNames_.size(), false);
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index 357f3bee575..818baec617f 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -305,7 +305,7 @@ public:
);
- // I-O
+ // IO
//- Write the source properties
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index a9453ab87fe..23228f39c8f 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -253,7 +253,7 @@ public:
);
- // I-O
+ // IO
//- Write the source properties
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
index 2d3da1734d2..dfe141cf361 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
@@ -29,14 +29,14 @@ License
void Foam::fv::solidificationMeltingSource::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
coeffs_.lookup("Tmelt") >> Tmelt_;
coeffs_.lookup("L") >> L_;
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
index 914e751e71a..3635d6b3532 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
@@ -96,7 +96,7 @@ void Foam::fv::tabulatedAccelerationSource::addSup
void Foam::fv::tabulatedAccelerationSource::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ option::writeData(os);
dict_.write(os);
}
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.H b/src/fvOptions/sources/general/codedSource/CodedSource.H
index 5249cc95497..ccd2c52a54f 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.H
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.H
@@ -224,7 +224,7 @@ public:
);
- // I-O
+ // IO
//- Write the source properties
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
index 89e6205ceff..7d34ca92356 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
@@ -31,7 +31,7 @@ License
template<class Type>
void Foam::fv::CodedSource<Type>::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
@@ -39,7 +39,7 @@ void Foam::fv::CodedSource<Type>::writeData(Ostream& os) const
template<class Type>
bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
coeffs_.lookup("fieldNames") >> fieldNames_;
applied_.setSize(fieldNames_.size(), false);
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
index 802a279b7d6..be925d9a8e1 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
@@ -200,7 +200,7 @@ public:
);
- // I-O
+ // IO
//- Write the source properties
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
index 17968ae0b78..5b6286c0668 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
@@ -30,7 +30,7 @@ License
template<class Type>
void Foam::fv::SemiImplicitSource<Type>::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ cellSetOption::writeData(os);
dict_.write(os);
}
@@ -38,7 +38,7 @@ void Foam::fv::SemiImplicitSource<Type>::writeData(Ostream& os) const
template<class Type>
bool Foam::fv::SemiImplicitSource<Type>::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (cellSetOption::read(dict))
{
volumeMode_ = wordToVolumeModeType(coeffs_.lookup("volumeMode"));
setFieldData(coeffs_.subDict("injectionRateSuSp"));
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index b7ebb5f3468..7fc64585950 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -290,14 +290,14 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
void Foam::fv::interRegionExplicitPorositySource::writeData(Ostream& os) const
{
- os << indent << name_ << endl;
+ interRegionOption::writeData(os);
dict_.write(os);
}
bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (interRegionOption::read(dict))
{
coeffs_.readIfPresent("UName", UName_);
coeffs_.readIfPresent("muName", muName_);
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
index 36f07415d64..23bc40a6c0d 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
@@ -162,7 +162,7 @@ public:
);
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C
index dfe06311ad9..7d2d4c80d8d 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C
@@ -105,27 +105,20 @@ Foam::fv::constantHeatTransfer::~constantHeatTransfer()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::fv::constantHeatTransfer::calculateHtc()
-{
- // do nothing
-}
+{}
void Foam::fv::constantHeatTransfer::writeData(Ostream& os) const
{
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
interRegionHeatTransferModel::writeData(os);
-
os << indent << type() + "Coeffs" << nl;
-
coeffs_.write(os);
-
- os << decrIndent << indent << token::END_BLOCK << endl;
}
bool Foam::fv::constantHeatTransfer::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (interRegionHeatTransferModel::read(dict))
{
return true;
}
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H
index 24abe78bb05..288ef7f3418 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H
@@ -90,7 +90,7 @@ public:
virtual void calculateHtc();
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
index b91e8fc57bd..101eec319bd 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
@@ -186,7 +186,7 @@ public:
virtual void calculateHtc() = 0;
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C
index cbe79101c29..f678cd43b06 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C
@@ -40,7 +40,7 @@ void Foam::fv::interRegionHeatTransferModel::writeData(Ostream& os) const
bool Foam::fv::interRegionHeatTransferModel::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (interRegionOption::read(dict))
{
return true;
}
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
index 8795e4bf04d..fa5955d2a9e 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
@@ -135,20 +135,14 @@ void Foam::fv::tabulatedHeatTransfer::calculateHtc()
void Foam::fv::tabulatedHeatTransfer::writeData(Ostream& os) const
{
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
interRegionHeatTransferModel::writeData(os);
-
- os << indent << type() + "Coeffs" << nl;
-
coeffs_.write(os);
-
- os << decrIndent << indent << token::END_BLOCK << endl;
}
bool Foam::fv::tabulatedHeatTransfer::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (interRegionHeatTransferModel::read(dict))
{
return true;
}
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
index 2f7b4a59600..95a5a1be1a5 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
@@ -107,7 +107,7 @@ public:
virtual void calculateHtc();
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
index a9fc1e27963..5d1f07346c0 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
@@ -128,21 +128,14 @@ void Foam::fv::variableHeatTransfer::calculateHtc()
void Foam::fv::variableHeatTransfer::writeData(Ostream& os) const
{
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
-
interRegionHeatTransferModel::writeData(os);
-
- os << indent << type() + "Coeffs" << nl;
-
coeffs_.write(os);
-
- os << decrIndent << indent << token::END_BLOCK << endl;
}
bool Foam::fv::variableHeatTransfer::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (interRegionHeatTransferModel::read(dict))
{
coeffs_.readIfPresent("UNbrName", UNbrName_);
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
index 306abc5546e..6f801003bc1 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
@@ -111,7 +111,7 @@ public:
virtual void calculateHtc();
- // I-O
+ // IO
//- Write data
virtual void writeData(Ostream&) const;
--
GitLab