zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2021-08-30 10:31:30 +01:00
parent e6d7b7aa3f d002a4de50
commit 61174d8fa8
2 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/fvModels/derived/massSource/massSource.C
View File

@ -74,38 +74,17 @@ void Foam::fv::massSource::readCoeffs()
const dictionary& fieldCoeffs = coeffs().subDict("fieldValues");
forAllConstIter(dictionary, fieldCoeffs, iter)
{
fieldValues_.set(iter().keyword(), nullptr);
fieldValues_.set
(
iter().keyword(),
new unknownTypeFunction1(iter().keyword(), fieldCoeffs)
);
}
#define callReadFieldValues(Type, nullArg) readFieldValues<Type>();
FOR_ALL_FIELD_TYPES(callReadFieldValues);
#undef callReadFieldValues
massFlowRate_.reset(Function1<scalar>::New("massFlowRate", coeffs()).ptr());
}
template<class Type>
void Foam::fv::massSource::readFieldValues()
{
const dictionary& fieldCoeffs = coeffs().subDict("fieldValues");
forAllConstIter(dictionary, fieldCoeffs, iter)
{
const word& fieldName = iter().keyword();
if (mesh().foundObject<VolField<Type>>(fieldName))
{
fieldValues_.set
(
fieldName,
new unknownTypeFunction1(fieldName, fieldCoeffs)
);
}
}
}
template<class Type>
void Foam::fv::massSource::addGeneralSupType
(

4
src/fvModels/derived/massSource/massSource.H
View File

@ -112,10 +112,6 @@ class massSource
//- Non-virtual read
void readCoeffs();
//- Read field values for a given primitive type
template<class Type>
void readFieldValues();
// Sources