diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C index 6a14cb2bffcd8ff711f5da8b79df0ac77d899c71..4ec825da340b25633ca5fd89403350ab51149559 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<class Type> void Foam::ExplicitSetValue<Type>::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<Type>::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<Type>::ExplicitSetValue ) : basicSource(name, modelType, dict, mesh), - fieldData_() + injectionRate_() { read(dict); } @@ -105,7 +105,7 @@ void Foam::ExplicitSetValue<Type>::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 58a50ea75c96fd15112b8bffb22619c20f99e042..ec0a9d2ce1a18047d1b2d2dc3b305360907fa076 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 <Type>ExplicitSetValueCoeffs { - fieldData + injectionRate { k 30.7; epsilon 1.5; @@ -70,7 +70,7 @@ protected: // Protected data //- Source value per field - List<Type> fieldData_; + List<Type> 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 7fd1d4559264f757e3c88d05c080946d11909ff2..a27190ea49cb7de06d7637a5fc83fc1d1a69bfdd 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<Type>::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 b95cd7ba0ef00e3335b653528f3f7b27667d11f4..b9f8204d87aa57c669f24315c02a902aeeff3ba2 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<class Type> void Foam::ExplicitSource<Type>::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<Type>::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<Type>::ExplicitSource basicSource(name, modelType, dict, mesh), volumeMode_(vmAbsolute), VDash_(1.0), - fieldData_() + injectionRate_() { read(dict); } @@ -165,7 +165,7 @@ void Foam::ExplicitSource<Type>::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 7248b5ef264400b5294bc7e7f3ca1e04c88dc6c3..e53e6004be65d807467c72d25934f22b626ae637 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 <Type>ExplicitSourceCoeffs { volumeMode absolute; // specific - fieldData + injectionRate { k 30.7; epsilon 1.5; @@ -111,7 +111,7 @@ protected: scalar VDash_; //- Source field values - List<Type> fieldData_; + List<Type> injectionRate_; // Protected functions @@ -152,7 +152,7 @@ public: inline const volumeModeType& volumeMode() const; //- Return const access to the source field values - inline const List<Type>& fieldData() const; + inline const List<Type>& injectionRate() const; // Edit @@ -161,7 +161,7 @@ public: inline volumeModeType& volumeMode(); //- Return access to the source field values - inline List<Type>& fieldData(); + inline List<Type>& 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 14276e0197b9ce60b7c264da8dfce20e0ca430ff..e3f4b8aa63b1ac3ec5107c1f4384d4ca0849dad2 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<Type>::volumeMode() const template<class Type> -inline const Foam::List<Type>& Foam::ExplicitSource<Type>::fieldData() const +inline const Foam::List<Type>& Foam::ExplicitSource<Type>::injectionRate() const { - return fieldData_; + return injectionRate_; } @@ -51,9 +51,9 @@ Foam::ExplicitSource<Type>::volumeMode() template<class Type> -inline Foam::List<Type>& Foam::ExplicitSource<Type>::fieldData() +inline Foam::List<Type>& Foam::ExplicitSource<Type>::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 d181f3f20796e23df8ce6d556b71359ab2671b07..d59c3f35cfcd1f404090c9581f33efcabc1ee332 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<Type>::read(const dictionary& dict) { if (basicSource::read(dict)) { - setFieldData(coeffs_.subDict("fieldData")); + setFieldData(coeffs_.subDict("injectionRate")); volumeMode_ = wordToVolumeModeType(coeffs_.lookup("volumeMode")); return true;