mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
- 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.
305 lines
7.7 KiB
C
305 lines
7.7 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
| Copyright (C) 2012-2016 OpenFOAM Foundation
|
|
-------------------------------------------------------------------------------
|
|
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/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "codedFixedValuePointPatchField.H"
|
|
#include "addToRunTimeSelectionTable.H"
|
|
#include "pointPatchFieldMapper.H"
|
|
#include "pointFields.H"
|
|
#include "dynamicCode.H"
|
|
|
|
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
|
|
|
template<class Type>
|
|
const Foam::IOdictionary& Foam::codedFixedValuePointPatchField<Type>::dict()
|
|
const
|
|
{
|
|
const objectRegistry& obr = this->db();
|
|
|
|
const IOdictionary* dictptr = obr.cfindObject<IOdictionary>("codeDict");
|
|
if (dictptr)
|
|
{
|
|
return *dictptr;
|
|
}
|
|
|
|
return obr.store
|
|
(
|
|
new IOdictionary
|
|
(
|
|
IOobject
|
|
(
|
|
"codeDict",
|
|
this->db().time().system(),
|
|
this->db(),
|
|
IOobject::MUST_READ_IF_MODIFIED,
|
|
IOobject::NO_WRITE
|
|
)
|
|
)
|
|
);
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
Foam::dlLibraryTable& Foam::codedFixedValuePointPatchField<Type>::libs() const
|
|
{
|
|
return const_cast<dlLibraryTable&>(this->db().time().libs());
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
void Foam::codedFixedValuePointPatchField<Type>::prepare
|
|
(
|
|
dynamicCode& dynCode,
|
|
const dynamicCodeContext& context
|
|
) const
|
|
{
|
|
// Take no chances - typeName must be identical to name_
|
|
dynCode.setFilterVariable("typeName", name_);
|
|
|
|
// Set TemplateType and FieldType filter variables
|
|
dynCode.setFieldTemplates<Type>();
|
|
|
|
// Compile filtered C template
|
|
dynCode.addCompileFile(codeTemplateC);
|
|
|
|
// Copy filtered H template
|
|
dynCode.addCopyFile(codeTemplateH);
|
|
|
|
// Debugging: make verbose
|
|
// dynCode.setFilterVariable("verbose", "true");
|
|
// DetailInfo
|
|
// <<"compile " << name_ << " sha1: "
|
|
// << context.sha1() << endl;
|
|
|
|
// Define Make/options
|
|
dynCode.setMakeOptions
|
|
(
|
|
"EXE_INC = -g \\\n"
|
|
"-I$(LIB_SRC)/finiteVolume/lnInclude \\\n"
|
|
+ context.options()
|
|
+ "\n\nLIB_LIBS = \\\n"
|
|
" -lOpenFOAM \\\n"
|
|
" -lfiniteVolume \\\n"
|
|
+ context.libs()
|
|
);
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
const Foam::dictionary& Foam::codedFixedValuePointPatchField<Type>::codeDict()
|
|
const
|
|
{
|
|
// Use system/codeDict or in-line
|
|
return
|
|
(
|
|
dict_.found("code")
|
|
? dict_
|
|
: this->dict().subDict(name_)
|
|
);
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
Foam::string Foam::codedFixedValuePointPatchField<Type>::description() const
|
|
{
|
|
return
|
|
"patch "
|
|
+ this->patch().name()
|
|
+ " on field "
|
|
+ this->internalField().name();
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
void Foam::codedFixedValuePointPatchField<Type>::clearRedirect() const
|
|
{
|
|
// Remove instantiation of pointPatchField provided by library
|
|
redirectPatchFieldPtr_.clear();
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
template<class Type>
|
|
Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
|
|
(
|
|
const pointPatch& p,
|
|
const DimensionedField<Type, pointMesh>& iF
|
|
)
|
|
:
|
|
fixedValuePointPatchField<Type>(p, iF),
|
|
codedBase(),
|
|
redirectPatchFieldPtr_()
|
|
{}
|
|
|
|
|
|
template<class Type>
|
|
Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
|
|
(
|
|
const codedFixedValuePointPatchField<Type>& ptf,
|
|
const pointPatch& p,
|
|
const DimensionedField<Type, pointMesh>& iF,
|
|
const pointPatchFieldMapper& mapper
|
|
)
|
|
:
|
|
fixedValuePointPatchField<Type>(ptf, p, iF, mapper),
|
|
codedBase(),
|
|
dict_(ptf.dict_),
|
|
name_(ptf.name_),
|
|
redirectPatchFieldPtr_()
|
|
{}
|
|
|
|
|
|
template<class Type>
|
|
Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
|
|
(
|
|
const pointPatch& p,
|
|
const DimensionedField<Type, pointMesh>& iF,
|
|
const dictionary& dict,
|
|
const bool valueRequired
|
|
)
|
|
:
|
|
fixedValuePointPatchField<Type>(p, iF, dict, valueRequired),
|
|
codedBase(),
|
|
dict_(dict),
|
|
name_(dict.getCompat<word>("name", {{"redirectType", 1706}})),
|
|
redirectPatchFieldPtr_()
|
|
{
|
|
updateLibrary(name_);
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
|
|
(
|
|
const codedFixedValuePointPatchField<Type>& ptf
|
|
)
|
|
:
|
|
fixedValuePointPatchField<Type>(ptf),
|
|
codedBase(),
|
|
dict_(ptf.dict_),
|
|
name_(ptf.name_),
|
|
redirectPatchFieldPtr_()
|
|
{}
|
|
|
|
|
|
template<class Type>
|
|
Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
|
|
(
|
|
const codedFixedValuePointPatchField<Type>& ptf,
|
|
const DimensionedField<Type, pointMesh>& iF
|
|
)
|
|
:
|
|
fixedValuePointPatchField<Type>(ptf, iF),
|
|
codedBase(),
|
|
dict_(ptf.dict_),
|
|
name_(ptf.name_),
|
|
redirectPatchFieldPtr_()
|
|
{}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
|
|
template<class Type>
|
|
const Foam::pointPatchField<Type>&
|
|
Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
|
|
{
|
|
if (!redirectPatchFieldPtr_.valid())
|
|
{
|
|
// Construct a patch
|
|
// Make sure to construct the patchfield with up-to-date value
|
|
|
|
OStringStream os;
|
|
os.writeEntry("type", name_);
|
|
static_cast<const Field<Type>&>(*this).writeEntry("value", os);
|
|
IStringStream is(os.str());
|
|
dictionary dict(is);
|
|
|
|
redirectPatchFieldPtr_.reset
|
|
(
|
|
pointPatchField<Type>::New
|
|
(
|
|
this->patch(),
|
|
this->internalField(),
|
|
dict
|
|
).ptr()
|
|
);
|
|
}
|
|
return *redirectPatchFieldPtr_;
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
void Foam::codedFixedValuePointPatchField<Type>::updateCoeffs()
|
|
{
|
|
if (this->updated())
|
|
{
|
|
return;
|
|
}
|
|
|
|
// Make sure library containing user-defined pointPatchField is up-to-date
|
|
updateLibrary(name_);
|
|
|
|
const pointPatchField<Type>& fvp = redirectPatchField();
|
|
|
|
const_cast<pointPatchField<Type>&>(fvp).updateCoeffs();
|
|
|
|
// Copy through value
|
|
this->operator==(fvp);
|
|
|
|
fixedValuePointPatchField<Type>::updateCoeffs();
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
void Foam::codedFixedValuePointPatchField<Type>::evaluate
|
|
(
|
|
const Pstream::commsTypes commsType
|
|
)
|
|
{
|
|
// Make sure library containing user-defined pointPatchField is up-to-date
|
|
updateLibrary(name_);
|
|
|
|
const pointPatchField<Type>& fvp = redirectPatchField();
|
|
|
|
const_cast<pointPatchField<Type>&>(fvp).evaluate(commsType);
|
|
|
|
fixedValuePointPatchField<Type>::evaluate(commsType);
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
void Foam::codedFixedValuePointPatchField<Type>::write(Ostream& os) const
|
|
{
|
|
fixedValuePointPatchField<Type>::write(os);
|
|
os.writeEntry("name", name_);
|
|
|
|
codedBase::writeCodeDict(os, dict_);
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|