diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C index 2f0da244cf..33f7c5ada8 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C @@ -112,7 +112,7 @@ Foam::label Foam::actuationDiskSource::applyToField void Foam::actuationDiskSource::addSup ( fvMatrix& eqn, - const label + const label fieldI ) { bool compressible = false; @@ -150,6 +150,8 @@ void Foam::actuationDiskSource::addSup ); } } + + basicSource::addSup(eqn, fieldI); } diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C index 9a8ea3015e..2b10f3236c 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C @@ -201,6 +201,7 @@ Foam::basicSource::basicSource dict_(dict), coeffs_(dict.subDict(modelType + "Coeffs")), active_(readBool(dict_.lookup("active"))), + applied_(false), timeStart_(readScalar(dict_.lookup("timeStart"))), duration_(readScalar(dict_.lookup("duration"))), selectionMode_ @@ -276,13 +277,13 @@ bool Foam::basicSource::isActive() void Foam::basicSource::addSup(fvMatrix& eqn, const label fieldI) { - // do nothing + applied_ = true; } void Foam::basicSource::addSup(fvMatrix& eqn, const label fieldI) { - // do nothing + applied_ = true; } @@ -292,31 +293,31 @@ void Foam::basicSource::addSup const label fieldI ) { - // do nothing + applied_ = true; } void Foam::basicSource::addSup(fvMatrix& eqn, const label fieldI) { - // do nothing + applied_ = true; } void Foam::basicSource::addSup(fvMatrix& eqn, const label fieldI) { - // do nothing + applied_ = true; } void Foam::basicSource::setValue(fvMatrix& eqn, const label fieldI) { - // do nothing + applied_ = true; } void Foam::basicSource::setValue(fvMatrix& eqn, const label fieldI) { - // do nothing + applied_ = true; } @@ -326,7 +327,7 @@ void Foam::basicSource::setValue const label fieldI ) { - // do nothing + applied_ = true; } @@ -336,13 +337,13 @@ void Foam::basicSource::setValue const label fieldI ) { - // do nothing + applied_ = true; } void Foam::basicSource::setValue(fvMatrix& eqn, const label fieldI) { - // do nothing + applied_ = true; } diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H index 563f997629..5abc7e5808 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H @@ -98,7 +98,7 @@ protected: bool active_; //- Flag to indicate whether or not the source has been applied -// bool applied_; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + bool applied_; //- Time start scalar timeStart_; diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C index 3a3c372d17..6e96011c0f 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C @@ -124,6 +124,8 @@ void Foam::ExplicitSetValue::setValue } eqn.setValues(cells_, values); + + basicSource::setValue(eqn, fieldI); } diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C index 1e9c15fbc7..fa6d9d3b8b 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C @@ -184,6 +184,8 @@ void Foam::ExplicitSource::addSup } eqn -= Su; + + basicSource::addSup(eqn, fieldI); } diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C index 7019d3ae2d..b43c00d2a0 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C @@ -64,7 +64,7 @@ Foam::radialActuationDiskSource::radialActuationDiskSource void Foam::radialActuationDiskSource::addSup ( fvMatrix& eqn, - const label + const label fieldI ) { bool compressible = false; @@ -102,6 +102,8 @@ void Foam::radialActuationDiskSource::addSup ); } } + + basicSource::addSup(eqn, fieldI); } diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C index 4e9dccd440..6309f450db 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C @@ -411,7 +411,7 @@ Foam::label Foam::rotorDiskSource::applyToField(const word& fieldName) const } -void Foam::rotorDiskSource::addSup(fvMatrix& eqn) +void Foam::rotorDiskSource::addSup(fvMatrix& eqn, const label fieldI) { // add source to lhs of eqn @@ -440,6 +440,8 @@ void Foam::rotorDiskSource::addSup(fvMatrix& eqn) dimForce/dimVolume/dimDensity ); } + + basicSource::addSup(eqn, fieldI); } diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H index dabdcfaee7..4113463d4b 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H @@ -273,7 +273,7 @@ public: // Source term addition //- Source term to fvMatrix - virtual void addSup(fvMatrix& eqn); + virtual void addSup(fvMatrix& eqn, const label fieldI); // I-O