zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced inconsistently named local typedefs with VolField, SurfaceField and PointField

Browse Source 
making the code more consistent and readable.
This commit is contained in:
Henry Weller
2022-12-02 10:54:21 +00:00
parent 73c5624acf
commit 5f7993dab4
26 changed files with 225 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
View File

@ -43,16 +43,14 @@ void processField
return;
}
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
const word timeName(mesh.time().name());
IOobjectList fieldObjbjects(objects.lookupClass(fieldType::typeName));
IOobjectList fieldObjbjects(objects.lookupClass(VolField<Type>::typeName));
if (fieldObjbjects.lookup(fieldName) != nullptr)
{
fieldType vtf(*fieldObjbjects.lookup(fieldName), mesh);
const typename fieldType::Boundary& bf =
VolField<Type> vtf(*fieldObjbjects.lookup(fieldName), mesh);
const typename VolField<Type>::Boundary& bf =
vtf.boundaryField();
forAll(bf, patchi)

12
applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
View File

@ -43,12 +43,10 @@ void MapConsistentVolFields
const meshToMesh0::order& mapOrder
)
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
const fvMesh& meshSource = meshToMesh0Interp.fromMesh();
const fvMesh& meshTarget = meshToMesh0Interp.toMesh();
IOobjectList fields = objects.lookupClass(fieldType::typeName);
IOobjectList fields = objects.lookupClass(VolField<Type>::typeName);
forAllIter(IOobjectList, fields, fieldIter)
{
@ -56,9 +54,9 @@ void MapConsistentVolFields
<< endl;
// Read field
fieldType fieldSource(*fieldIter(), meshSource);
VolField<Type> fieldSource(*fieldIter(), meshSource);
typeIOobject<fieldType> fieldTargetIOobject
typeIOobject<VolField<Type>> fieldTargetIOobject
(
fieldIter()->name(),
meshTarget.time().name(),
@ -70,7 +68,7 @@ void MapConsistentVolFields
if (fieldTargetIOobject.headerOk())
{
// Read fieldTarget
fieldType fieldTarget
VolField<Type> fieldTarget
(
fieldTargetIOobject,
meshTarget
@ -92,7 +90,7 @@ void MapConsistentVolFields
fieldTargetIOobject.readOpt() = IOobject::NO_READ;
// Interpolate field
fieldType fieldTarget
VolField<Type> fieldTarget
(
fieldTargetIOobject,
meshToMesh0Interp.interpolate

10
applications/utilities/preProcessing/mapFields/MapVolFields.H
View File

@ -43,16 +43,14 @@ void MapVolFields
const meshToMesh0::order& mapOrder
)
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
const fvMesh& meshSource = meshToMesh0Interp.fromMesh();
const fvMesh& meshTarget = meshToMesh0Interp.toMesh();
IOobjectList fields = objects.lookupClass(fieldType::typeName);
IOobjectList fields = objects.lookupClass(VolField<Type>::typeName);
forAllIter(IOobjectList, fields, fieldIter)
{
typeIOobject<fieldType> fieldTargetIOobject
typeIOobject<VolField<Type>> fieldTargetIOobject
(
fieldIter()->name(),
meshTarget.time().name(),
@ -66,10 +64,10 @@ void MapVolFields
Info<< " interpolating " << fieldIter()->name() << endl;
// Read field fieldSource
fieldType fieldSource(*fieldIter(), meshSource);
VolField<Type> fieldSource(*fieldIter(), meshSource);
// Read fieldTarget
fieldType fieldTarget
VolField<Type> fieldTarget
(
fieldTargetIOobject,
meshTarget

26
applications/utilities/preProcessing/setFields/setFields.C
View File

@ -50,9 +50,7 @@ bool setCellFieldType
Istream& fieldValueStream
)
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
if (fieldTypeDesc != fieldType::typeName + "Value")
if (fieldTypeDesc != VolField<Type>::typeName + "Value")
{
return false;
}
@ -60,7 +58,7 @@ bool setCellFieldType
word fieldName(fieldValueStream);
// Check the current time directory
typeIOobject<fieldType> fieldHeader
typeIOobject<VolField<Type>> fieldHeader
(
fieldName,
mesh.time().name(),
@ -71,7 +69,7 @@ bool setCellFieldType
// Check the "constant" directory
if (!fieldHeader.headerOk())
{
fieldHeader = typeIOobject<fieldType>
fieldHeader = typeIOobject<VolField<Type>>
(
fieldName,
mesh.time().constant(),
@ -87,7 +85,7 @@ bool setCellFieldType
<< fieldHeader.headerClassName()
<< " " << fieldName << endl;
fieldType field(fieldHeader, mesh);
VolField<Type> field(fieldHeader, mesh);
const Type value = pTraits<Type>(fieldValueStream);
@ -196,9 +194,7 @@ bool setFaceFieldType
Istream& fieldValueStream
)
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
if (fieldTypeDesc != fieldType::typeName + "Value")
if (fieldTypeDesc != VolField<Type>::typeName + "Value")
{
return false;
}
@ -206,7 +202,7 @@ bool setFaceFieldType
word fieldName(fieldValueStream);
// Check the current time directory
typeIOobject<fieldType> fieldHeader
typeIOobject<VolField<Type>> fieldHeader
(
fieldName,
mesh.time().name(),
@ -217,7 +213,7 @@ bool setFaceFieldType
// Check the "constant" directory
if (!fieldHeader.headerOk())
{
fieldHeader = typeIOobject<fieldType>
fieldHeader = typeIOobject<VolField<Type>>
(
fieldName,
mesh.time().constant(),
@ -234,8 +230,8 @@ bool setFaceFieldType
<< " " << fieldName << endl;
// Read the field
fieldType field(fieldHeader, mesh);
typename fieldType::Boundary& fieldBf = field.boundaryFieldRef();
VolField<Type> field(fieldHeader, mesh);
typename VolField<Type>::Boundary& fieldBf = field.boundaryFieldRef();
// Read the value
const Type value = pTraits<Type>(fieldValueStream);
@ -252,9 +248,9 @@ bool setFaceFieldType
}
// Create a copy of the boundary field
typename fieldType::Boundary fieldBfCopy
typename VolField<Type>::Boundary fieldBfCopy
(
fieldType::Internal::null(),
VolField<Type>::Internal::null(),
fieldBf
);