From a744f7d126411c12f19868c37c20f2a226e386cd Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 3 Nov 2011 15:29:28 +0000 Subject: [PATCH] STYLE: fieldSources - changed fieldData -> injectionRate --- .../basicSource/explicitSetValue/ExplicitSetValue.C | 8 ++++---- .../basicSource/explicitSetValue/ExplicitSetValue.H | 4 ++-- .../basicSource/explicitSetValue/ExplicitSetValueIO.C | 2 +- .../basicSource/explicitSource/ExplicitSource.C | 8 ++++---- .../basicSource/explicitSource/ExplicitSource.H | 8 ++++---- .../basicSource/explicitSource/ExplicitSourceI.H | 8 ++++---- .../basicSource/explicitSource/ExplicitSourceIO.C | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C index 6a14cb2bff..4ec825da34 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C @@ -34,7 +34,7 @@ template void Foam::ExplicitSetValue::setFieldData(const dictionary& dict) { fieldNames_.setSize(dict.toc().size()); - fieldData_.setSize(fieldNames_.size()); + injectionRate_.setSize(fieldNames_.size()); applied_.setSize(fieldNames_.size(), false); @@ -42,7 +42,7 @@ void Foam::ExplicitSetValue::setFieldData(const dictionary& dict) forAllConstIter(dictionary, dict, iter) { fieldNames_[i] = iter().keyword(); - dict.lookup(iter().keyword()) >> fieldData_[i]; + dict.lookup(iter().keyword()) >> injectionRate_[i]; i++; } } @@ -60,7 +60,7 @@ Foam::ExplicitSetValue::ExplicitSetValue ) : basicSource(name, modelType, dict, mesh), - fieldData_() + injectionRate_() { read(dict); } @@ -105,7 +105,7 @@ void Foam::ExplicitSetValue::setValue forAll(values, i) { - values[i] = fieldData_[fieldI]; + values[i] = injectionRate_[fieldI]; } eqn.setValues(cells_, values); diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H index 58a50ea75c..ec0a9d2ce1 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H @@ -31,7 +31,7 @@ Description ExplicitSetValueCoeffs { - fieldData + injectionRate { k 30.7; epsilon 1.5; @@ -70,7 +70,7 @@ protected: // Protected data //- Source value per field - List fieldData_; + List injectionRate_; // Protected functions diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C index 7fd1d45592..a27190ea49 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C @@ -40,7 +40,7 @@ bool Foam::ExplicitSetValue::read(const dictionary& dict) { if (basicSource::read(dict)) { - setFieldData(coeffs_.subDict("fieldData")); + setFieldData(coeffs_.subDict("injectionRate")); return true; } else diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C index b95cd7ba0e..b9f8204d87 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C @@ -88,7 +88,7 @@ template void Foam::ExplicitSource::setFieldData(const dictionary& dict) { fieldNames_.setSize(dict.toc().size()); - fieldData_.setSize(fieldNames_.size()); + injectionRate_.setSize(fieldNames_.size()); applied_.setSize(fieldNames_.size(), false); @@ -96,7 +96,7 @@ void Foam::ExplicitSource::setFieldData(const dictionary& dict) forAllConstIter(dictionary, dict, iter) { fieldNames_[i] = iter().keyword(); - dict.lookup(iter().keyword()) >> fieldData_[i]; + dict.lookup(iter().keyword()) >> injectionRate_[i]; i++; } @@ -122,7 +122,7 @@ Foam::ExplicitSource::ExplicitSource basicSource(name, modelType, dict, mesh), volumeMode_(vmAbsolute), VDash_(1.0), - fieldData_() + injectionRate_() { read(dict); } @@ -165,7 +165,7 @@ void Foam::ExplicitSource::addSup forAll(cells_, i) { - Su[cells_[i]] = fieldData_[fieldI]/VDash_; + Su[cells_[i]] = injectionRate_[fieldI]/VDash_; } eqn -= Su; diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.H index 7248b5ef26..e53e6004be 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.H +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.H @@ -32,7 +32,7 @@ Description ExplicitSourceCoeffs { volumeMode absolute; // specific - fieldData + injectionRate { k 30.7; epsilon 1.5; @@ -111,7 +111,7 @@ protected: scalar VDash_; //- Source field values - List fieldData_; + List injectionRate_; // Protected functions @@ -152,7 +152,7 @@ public: inline const volumeModeType& volumeMode() const; //- Return const access to the source field values - inline const List& fieldData() const; + inline const List& injectionRate() const; // Edit @@ -161,7 +161,7 @@ public: inline volumeModeType& volumeMode(); //- Return access to the source field values - inline List& fieldData(); + inline List& injectionRate(); // Evaluation diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceI.H index 14276e0197..e3f4b8aa63 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceI.H +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceI.H @@ -36,9 +36,9 @@ Foam::ExplicitSource::volumeMode() const template -inline const Foam::List& Foam::ExplicitSource::fieldData() const +inline const Foam::List& Foam::ExplicitSource::injectionRate() const { - return fieldData_; + return injectionRate_; } @@ -51,9 +51,9 @@ Foam::ExplicitSource::volumeMode() template -inline Foam::List& Foam::ExplicitSource::fieldData() +inline Foam::List& Foam::ExplicitSource::injectionRate() { - return fieldData_; + return injectionRate_; } diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C index d181f3f207..d59c3f35cf 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C @@ -40,7 +40,7 @@ bool Foam::ExplicitSource::read(const dictionary& dict) { if (basicSource::read(dict)) { - setFieldData(coeffs_.subDict("fieldData")); + setFieldData(coeffs_.subDict("injectionRate")); volumeMode_ = wordToVolumeModeType(coeffs_.lookup("volumeMode")); return true;