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: Added support for internal vol fields

Browse Source
This commit is contained in:
Andrew Heather
2020-06-08 13:59:24 +01:00
parent 4032ab5e15
commit 8a27989cbf
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
View File

@ -37,9 +37,14 @@ bool Foam::functionObjects::fieldValues::volFieldValue::validField
const word& fieldName const word& fieldName
) const ) const
{ {
typedef GeometricField<Type, fvPatchField, volMesh> vf; typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
typedef typename VolFieldType::Internal IntVolFieldType;
if (obr_.foundObject<vf>(fieldName)) if
(
obr_.foundObject<VolFieldType>(fieldName)
|| obr_.foundObject<IntVolFieldType>(fieldName)
)
{ {
return true; return true;
} }
@ -56,11 +61,16 @@ Foam::functionObjects::fieldValues::volFieldValue::getFieldValues
const bool mustGet const bool mustGet
) const ) const
{ {
typedef GeometricField<Type, fvPatchField, volMesh> vf; typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
typedef typename VolFieldType::Internal IntVolFieldType;
if (obr_.foundObject<vf>(fieldName)) if (obr_.foundObject<VolFieldType>(fieldName))
{ {
return filterField(obr_.lookupObject<vf>(fieldName)); return filterField(obr_.lookupObject<VolFieldType>(fieldName));
}
else if (obr_.foundObject<IntVolFieldType>(fieldName))
{
return filterField(obr_.lookupObject<IntVolFieldType>(fieldName));
} }
if (mustGet) if (mustGet)

24
src/functionObjects/field/readFields/readFieldsTemplates.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd. Copyright (C) 2015-2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -37,6 +37,7 @@ template<class Type>
bool Foam::functionObjects::readFields::loadField(const word& fieldName) bool Foam::functionObjects::readFields::loadField(const word& fieldName)
{ {
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType; typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
typedef typename VolFieldType::Internal IntVolFieldType;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> SurfaceFieldType; typedef GeometricField<Type, fvsPatchField, surfaceMesh> SurfaceFieldType;
/// typedef DimensionedField<Type, surfGeoMesh> SurfFieldType; /// typedef DimensionedField<Type, surfGeoMesh> SurfFieldType;
@ -47,6 +48,13 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
<< " " << fieldName << " already in database" << " " << fieldName << " already in database"
<< endl; << endl;
} }
else if (foundObject<IntVolFieldType>(fieldName))
{
DebugInfo
<< "readFields : " << IntVolFieldType::typeName
<< " " << fieldName << " already in database"
<< endl;
}
else if (foundObject<SurfaceFieldType>(fieldName)) else if (foundObject<SurfaceFieldType>(fieldName))
{ {
DebugInfo DebugInfo
@ -76,7 +84,15 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
{ {
// Store field on mesh database // Store field on mesh database
Log << " Reading " << fieldName << endl; Log << " Reading " << fieldName << endl;
VolFieldType* fldPtr(new VolFieldType(fieldHeader, mesh_)); auto* fldPtr(new VolFieldType(fieldHeader, mesh_));
mesh_.objectRegistry::store(fldPtr);
return true;
}
else if (fieldHeader.typeHeaderOk<IntVolFieldType>(true, true, false))
{
// Store field on mesh database
Log << " Reading " << fieldName << endl;
auto* fldPtr(new IntVolFieldType(fieldHeader, mesh_));
mesh_.objectRegistry::store(fldPtr); mesh_.objectRegistry::store(fldPtr);
return true; return true;
} }
@ -84,7 +100,7 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
{ {
// Store field on mesh database // Store field on mesh database
Log << " Reading " << fieldName << endl; Log << " Reading " << fieldName << endl;
SurfaceFieldType* fldPtr(new SurfaceFieldType(fieldHeader, mesh_)); auto* fldPtr(new SurfaceFieldType(fieldHeader, mesh_));
mesh_.objectRegistry::store(fldPtr); mesh_.objectRegistry::store(fldPtr);
return true; return true;
} }
@ -97,7 +113,7 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
/// ///
/// // Store field on surfMesh database /// // Store field on surfMesh database
/// Log << " Reading " << fieldName << endl; /// Log << " Reading " << fieldName << endl;
/// SurfFieldType* fldPtr(new SurfFieldType(fieldHeader, s)); /// auto* fldPtr(new SurfFieldType(fieldHeader, s));
/// s.store(fldPtr); /// s.store(fldPtr);
/// return true; /// return true;
/// } /// }