songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: consistent UniformDimensionedField naming

Browse Source 
- construct from components, or use word::null to ensure
  consistent avoid naming between IOobject vs dimensioned type.

- support construct with parameter ordering as per DimensionedField

ENH: instantiate a uniformDimensionedLabelField

- eg, for registering standalone integer counters
This commit is contained in:
Mark Olesen 2023-04-19 14:09:49 +02:00
parent 1d39cdaa17
commit 5042d1296f
14 changed files with 70 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
View File

@ -108,7 +108,7 @@ forAll(fluidRegions, i)
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE
),
dimensionedScalar("hRef", dimLength, Zero) // uses name
dimensionedScalar(word::null, dimLength, Zero)
)
);

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/createFluidFields.H
View File

@ -221,7 +221,7 @@ forAll(fluidRegions, i)
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE
),
dimensionedScalar("hRef", dimLength, Zero)
dimensionedScalar(word::null, dimLength, Zero)
)
);

4
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/initContinuityErrs.H
View File

@ -13,11 +13,11 @@ forAll(cumulativeContErrIO, i)
"cumulativeContErr",
runTime.timeName(),
"uniform",
mesh,
mesh.thisDb(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
dimensionedScalar(dimless, Zero)
dimensionedScalar(word::null, dimless, Zero)
)
);
}

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
View File

@ -112,7 +112,7 @@ forAll(fluidRegions, i)
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE
),
dimensionedScalar("hRef", dimLength, Zero) // uses name
dimensionedScalar(word::null, dimLength, Zero)
)
);

4
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H
View File

@ -13,11 +13,11 @@ forAll(cumulativeContErrIO, i)
"cumulativeContErr",
runTime.timeName(),
"uniform",
mesh,
mesh.thisDb(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
dimensionedScalar(dimless, Zero)
dimensionedScalar(word::null, dimless, Zero)
)
);
}

16
src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
View File

@ -66,6 +66,22 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
}
template<class Type>
Foam::UniformDimensionedField<Type>::UniformDimensionedField
(
const IOobject& io,
const Type& val,
const dimensionSet& dims
)
:
regIOobject(io),
dimensioned<Type>(regIOobject::name(), dims, val)
{
// Read value
readHeaderOk(IOstreamOption::BINARY, typeName);
}
template<class Type>
Foam::UniformDimensionedField<Type>::UniformDimensionedField
(

22
src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
View File

@ -79,6 +79,7 @@ public:
//- Construct from components. Either reads or uses supplied value.
// The name of the IOobject defines the name of the field.
// Parameter ordering as per dimensioned\<Type\>
UniformDimensionedField
(
const IOobject& io,
@ -86,6 +87,16 @@ public:
const Type& val
);
//- Construct from components. Either reads or uses supplied value.
// The name of the IOobject defines the name of the field.
// Parameter ordering as per DimensionedField\<Type\>
UniformDimensionedField
(
const IOobject& io,
const Type& val,
const dimensionSet& dims
);
//- Construct as copy
UniformDimensionedField(const UniformDimensionedField<Type>&);
@ -99,17 +110,16 @@ public:
// Member Functions
//- Name function provided to resolve the ambiguity between the
//- name functions in regIOobject and dimensioned<Type>
//- Use name from dimensioned\<Type\>, not from regIOobject
virtual const word& name() const
{
return dimensioned<Type>::name();
}
//- ReadData function required for regIOobject read operation
//- The readData method required for regIOobject read operation
virtual bool readData(Istream&);
//- WriteData function required for regIOobject write operation
//- The writeData method required for regIOobject write operation
bool writeData(Ostream&) const;
//- Is object global
@ -128,10 +138,10 @@ public:
// Member Operators
//- Assign name, dimensions and value.
//- Assign name, dimensions and value of the dimensioned\<Type\>
void operator=(const UniformDimensionedField<Type>& rhs);
//- Assign name, dimensions and value.
//- Assign name, dimensions and value to the dimensioned\<Type\>
void operator=(const dimensioned<Type>& rhs);
//- Return value

2
src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -34,6 +35,7 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTemplateTypeNameAndDebug(uniformDimensionedLabelField, 0);
defineTemplateTypeNameAndDebug(uniformDimensionedScalarField, 0);
defineTemplateTypeNameAndDebug(uniformDimensionedVectorField, 0);
defineTemplateTypeNameAndDebug(uniformDimensionedSphericalTensorField, 0);

11
src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFieldsFwd.H
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -48,6 +48,10 @@ template<class Type> class UniformDimensionedField;
// Typedefs
typedef
UniformDimensionedField<label>
uniformDimensionedLabelField;
typedef
UniformDimensionedField<scalar>
uniformDimensionedScalarField;
@ -71,6 +75,11 @@ typedef
// Global file status
template<>
inline bool typeGlobal<uniformDimensionedLabelField>()
{
return true;
}
template<>
inline bool typeGlobal<uniformDimensionedScalarField>()
{

6
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
View File

@ -271,11 +271,7 @@ void Foam::hexRef8Data::sync(const IOobject& io)
rio.readOpt(IOobject::NO_READ);
level0EdgePtr_.reset
(
new uniformDimensionedScalarField
(
rio,
dimensionedScalar(rio.name(), dimLength, masterLen)
)
new uniformDimensionedScalarField(rio, dimLength, masterLen)
);
}
}

4
src/finiteVolume/cfdTools/general/include/initContinuityErrs.H
View File

@ -44,11 +44,11 @@ uniformDimensionedScalarField cumulativeContErrIO
"cumulativeContErr",
runTime.timeName(),
"uniform",
mesh,
mesh.thisDb(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
dimensionedScalar(dimless, Zero)
dimensionedScalar(word::null, dimless, Zero)
);
scalar& cumulativeContErr = cumulativeContErrIO.value();

4
src/finiteVolume/cfdTools/general/include/readhRef.H
View File

@ -5,9 +5,9 @@
(
"hRef",
runTime.constant(),
mesh,
mesh.thisDb(),
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE
),
dimensionedScalar(dimLength, Zero)
dimensionedScalar(word::null, dimLength, Zero)
);

4
src/finiteVolume/cfdTools/general/include/readpRef.H
View File

@ -5,9 +5,9 @@
(
"pRef",
runTime.constant(),
mesh,
mesh.thisDb(),
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE
),
dimensionedScalar(dimPressure, Zero)
dimensionedScalar(word::null, dimPressure, Zero)
);

20
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
View File

@ -203,19 +203,21 @@ Foam::mappedPatchBase::updateSampleMeshTime() const
{
const auto& mesh = sampleMesh();
updateSampleMeshTimePtr_ =
autoPtr<uniformDimensionedScalarField>::New
updateSampleMeshTimePtr_.reset
(
new uniformDimensionedScalarField
(
IOobject
(
"updateSampleMeshTime",
mesh.pointsInstance(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE,
IOobject::NO_REGISTER
)
);
)
);
}
return updateSampleMeshTimePtr_();
@ -229,19 +231,21 @@ Foam::mappedPatchBase::updateMeshTime() const
{
const auto& mesh = patch_.boundaryMesh().mesh();
updateMeshTimePtr_ =
autoPtr<uniformDimensionedScalarField>::New
updateMeshTimePtr_.reset
(
new uniformDimensionedScalarField
(
IOobject
(
"updateMeshTime",
mesh.pointsInstance(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE,
IOobject::NO_REGISTER
)
);
)
);
}
return updateMeshTimePtr_();