- for codedFunctionObject and CodedSource the main code snippets were not included in the SHA1 calculation, which meant that many changes would not be noticed and no new library would be compiled. As a workaround, a dummy 'code' entry could be used solely for the purposes of generating a SHA1, but this is easily forgotten. We now allow tracking of the dynamicCodeContext for the coded objects and append to the SHA1 hasher with specific entries. This should solve the previous misbehaviour. We additionally add information about the ordering of the code sections. Suppose we have a coded function object (all code segments are optional) with the following: codeExecute ""; codeWrite #{ Info<< "Called\n"; #}; which we subsequently change to this: codeExecute #{ Info<< "Called\n"; #}; codeWrite ""; If the code strings are simply concatenated together, the SHA1 hashes will be identical. We thus 'salt' with their semantic locations, choosing tags that are unlikely to occur within the code strings themselves. - simplify the coded templates with constexpr for the SHA1sum information. - Correct the CodedSource to use 'codeConstrain' instead of 'codeSetValue' for consistency with the underlying functions.
195 lines
4.9 KiB
C++
195 lines
4.9 KiB
C++
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
| Copyright (C) YEAR AUTHOR,AFFILIATION
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
Description
|
|
Template for use with dynamic code generation of a source.
|
|
The hook functions take the following arguments:
|
|
|
|
\verbatim
|
|
codeCorrect
|
|
(
|
|
GeometricField<Type, fvPatchField, volMesh>& fld
|
|
)
|
|
|
|
codeAddSup
|
|
(
|
|
fvMatrix<Type}>& eqn,
|
|
const label fieldi
|
|
)
|
|
|
|
codeConstrain
|
|
(
|
|
fvMatrix<Type>& eqn,
|
|
const label fieldi
|
|
)
|
|
\endverbatim
|
|
|
|
where :
|
|
fieldi is the index in the fields entry
|
|
eqn is the fvMatrix
|
|
|
|
\verbatim
|
|
energySource
|
|
{
|
|
type scalarCodedSource;
|
|
|
|
active true;
|
|
selectionMode all;
|
|
|
|
scalarCodedSourceCoeffs
|
|
{
|
|
fields (h);
|
|
name sourceTime;
|
|
|
|
codeInclude
|
|
#{
|
|
#};
|
|
|
|
codeCorrect
|
|
#{
|
|
Pout<< "**codeCorrect**" << endl;
|
|
#};
|
|
|
|
codeAddSup
|
|
#{
|
|
const Time& time = mesh().time();
|
|
const scalarField& V = mesh_.V();
|
|
scalarField& heSource = eqn.source();
|
|
heSource -= 0.1*sqr(time.value())*V;
|
|
#};
|
|
|
|
codeConstrain
|
|
#{
|
|
Pout<< "**codeConstrain**" << endl;
|
|
#};
|
|
}
|
|
|
|
sourceTimeCoeffs
|
|
{
|
|
// Dummy entry
|
|
}
|
|
}
|
|
\endverbatim
|
|
|
|
SourceFiles
|
|
codedFvOptionTemplate.C
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#ifndef codedFvOptionTemplate_H
|
|
#define codedFvOptionTemplate_H
|
|
|
|
#include "cellSetOption.H"
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
namespace Foam
|
|
{
|
|
namespace fv
|
|
{
|
|
|
|
/*---------------------------------------------------------------------------*\
|
|
A templated CodedFvOption
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
class ${typeName}FvOption${SourceType}
|
|
:
|
|
public cellSetOption
|
|
{
|
|
// Private Member Functions
|
|
|
|
//- Report a message with the SHA1sum
|
|
inline static void printMessage(const char* message)
|
|
{
|
|
Info<< message << " sha1: " << SHA1sum << '\n';
|
|
}
|
|
|
|
public:
|
|
|
|
//- SHA1 representation of the code content
|
|
static constexpr const char* const SHA1sum = "${SHA1sum}";
|
|
|
|
//- Runtime type information
|
|
TypeName("${typeName}");
|
|
|
|
|
|
// Constructors
|
|
|
|
//- Construct from patch and internal field
|
|
${typeName}FvOption${SourceType}
|
|
(
|
|
const word& name,
|
|
const word& modelType,
|
|
const dictionary& dict,
|
|
const fvMesh& mesh
|
|
);
|
|
|
|
//- Destructor
|
|
virtual ~${typeName}FvOption${SourceType}();
|
|
|
|
|
|
// Member Functions
|
|
|
|
//- Correct field
|
|
virtual void correct
|
|
(
|
|
GeometricField<${TemplateType}, fvPatchField, volMesh>& fld
|
|
);
|
|
|
|
//- Explicit/implicit matrix contributions
|
|
virtual void addSup
|
|
(
|
|
fvMatrix<${TemplateType}>& eqn,
|
|
const label fieldi
|
|
);
|
|
|
|
//- Explicit/implicit matrix contributions for compressible equations
|
|
virtual void addSup
|
|
(
|
|
const volScalarField& rho,
|
|
fvMatrix<${TemplateType}>& eqn,
|
|
const label fieldi
|
|
);
|
|
|
|
//- Set value
|
|
virtual void constrain
|
|
(
|
|
fvMatrix<${TemplateType}>& eqn,
|
|
const label fieldi
|
|
);
|
|
};
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
} // End namespace fv
|
|
} // End namespace Foam
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
#endif
|
|
|
|
// ************************************************************************* //
|