zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: avoid spurious ddt warning about unknown field (#1643)

Browse Source
This commit is contained in:
Mark Olesen
2020-03-23 12:21:32 +01:00
parent 89c21888a9
commit 11a4a659cb
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/functionObjects/field/ddt/ddt.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -53,15 +54,14 @@ bool Foam::functionObjects::ddt::calc()
return false;
}
bool processed = false;
processed = processed || calcDdt<scalar>();
processed = processed || calcDdt<vector>();
processed = processed || calcDdt<sphericalTensor>();
processed = processed || calcDdt<symmTensor>();
processed = processed || calcDdt<tensor>();
return processed;
return
(
calcDdt<scalar>()
|| calcDdt<vector>()
|| calcDdt<sphericalTensor>()
|| calcDdt<symmTensor>()
|| calcDdt<tensor>()
);
}
@ -80,10 +80,4 @@ Foam::functionObjects::ddt::ddt
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::ddt::~ddt()
{}
// ************************************************************************* //

11
src/functionObjects/field/ddt/ddt.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -40,6 +41,7 @@ See also
SourceFiles
ddt.C
ddtTemplates.C
\*---------------------------------------------------------------------------*/
@ -65,12 +67,13 @@ class ddt
{
// Private Member Functions
//- Calculate the magnitude of the field and register the result
//- Calculate and store the result
// \return true if fieldName_ was known and had the correct type
template<class Type>
bool calcDdt();
//- Calculate the time derivative of the field and return
// true if successful
//- Calculate time derivative of the field
// \return true on success
virtual bool calc();
@ -92,7 +95,7 @@ public:
//- Destructor
virtual ~ddt();
virtual ~ddt() = default;
};

4
src/functionObjects/field/ddt/ddtTemplates.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -35,7 +35,7 @@ bool Foam::functionObjects::ddt::calcDdt()
{
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
if (foundObject<VolFieldType>(fieldName_))
if (foundObject<VolFieldType>(fieldName_, false))
{
return store
(