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

ENH: use GeometricField type aliases in sampling and expressions

Browse Source
This commit is contained in:
Mark Olesen
2022-02-14 21:21:15 +01:00
parent a67f6bf7ae
commit 2a25b356b9
26 changed files with 311 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sampling/functions/Function1/Sample/SampleFunction1.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2021 OpenCFD Ltd.
Copyright (C) 2021-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -43,7 +43,7 @@ void Foam::Function1Types::Sample<Type>::setSampleCell() const
{
pointEventNo_ = points.eventNo();
celli_ = this->template mesh<fvMesh>().findCell(position_);
celli_ = mesh.findCell(position_);
if (!returnReduce(celli_ != -1, orOp<bool>()))
{
@ -104,18 +104,17 @@ Foam::Function1Types::Sample<Type>::Sample(const Sample& s)
template<class Type>
Type Foam::Function1Types::Sample<Type>::value(const scalar x) const
{
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
const auto& mesh = this->template mesh<fvMesh>();
const auto* fieldPtr = mesh.template cfindObject<VolFieldType>(fieldName_);
const auto* fieldPtr =
mesh.template cfindObject<VolumeField<Type>>(fieldName_);
if (!fieldPtr)
{
FatalErrorInFunction
<< "Unable to find field " << fieldName_ << " on the mesh database"
<< ". Valid " << VolFieldType::typeName << " fields are:"
<< mesh.names(VolFieldType::typeName)
<< ". Valid " << VolumeField<Type>::typeName << " fields are:"
<< mesh.template sortedNames<VolumeField<Type>>()
<< exit(FatalError);
}