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

Function1: Preferentially construct from separate unit conversion arguments

Browse Source
This commit is contained in:
Will Bainbridge
2024-05-21 12:40:14 +01:00
parent 30afcdc331
commit f8b5d71e25
19 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/postProcessing/noise/noise.C
View File

@ -161,7 +161,8 @@ int main(int argc, char *argv[])
Function1s::Table<scalar> pData
(
"pressure",
{dimTime, dimPressure},
dimTime,
dimPressure,
dict.subDict("pressureData")
);

3
etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs
View File

@ -59,7 +59,8 @@ codeRead
const Function1s::Table<scalar> initialDistribution
(
"initialDistribution",
{dimLength, dimless},
dimLength,
dimless,
dictionary
(
"format", "foam",

8
src/OpenFOAM/primitives/functions/Function1/None/None.C
View File

@ -27,6 +27,14 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::Function1s::None<Type>::None(const word& name)
:
FieldFunction1<Type, None<Type>>(name),
dictName_("unknown")
{}
template<class Type>
Foam::Function1s::None<Type>::None
(

3
src/OpenFOAM/primitives/functions/Function1/None/None.H
View File

@ -64,6 +64,9 @@ public:
// Constructors
//- Construct from name
None(const word& name);
//- Construct from name and dictionary
None
(

4
src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
View File

@ -95,8 +95,8 @@ void Foam::Function1s::Scale<Type>::write
const unitConversions& units
) const
{
writeEntry(os, {units.x, unitless}, scale_());
writeEntry(os, {units.x, units.x}, xScale_());
writeEntry(os, units.x, unitless, scale_());
writeEntry(os, units.x, units.x, xScale_());
writeEntry(os, units, value_());
}

13
src/OpenFOAM/primitives/functions/Function1/Table/Table.C
View File

@ -180,6 +180,19 @@ Foam::Function1s::Table<Type>::Table
}
template<class Type>
Foam::Function1s::Table<Type>::Table
(
const word& name,
const unitConversion& xUnits,
const unitConversion& valueUnits,
const dictionary& dict
)
:
Table(name, {xUnits, valueUnits}, dict)
{}
template<class Type>
Foam::Function1s::Table<Type>::Table
(

9
src/OpenFOAM/primitives/functions/Function1/Table/Table.H
View File

@ -188,6 +188,15 @@ public:
const dictionary& dict
);
//- Construct from name and dictionary
Table
(
const word& name,
const unitConversion& xUnits,
const unitConversion& valueUnits,
const dictionary& dict
);
//- Construct from name and Istream
Table
(

7
src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
View File

@ -27,6 +27,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::Function1s::ZeroConstant<Type>::ZeroConstant(const word& name)
:
FieldFunction1<Type, ZeroConstant<Type>>(name)
{}
template<class Type>
Foam::Function1s::ZeroConstant<Type>::ZeroConstant
(

3
src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
View File

@ -67,6 +67,9 @@ public:
// Constructors
//- Construct from name
ZeroConstant(const word& name);
//- Construct from name and dictionary
ZeroConstant
(

8
src/OpenFOAM/primitives/functions/Function2/None/None2.C
View File

@ -27,6 +27,14 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::Function2s::None<Type>::None(const word& name)
:
FieldFunction2<Type, None<Type>>(name),
dictName_("unknown")
{}
template<class Type>
Foam::Function2s::None<Type>::None
(

3
src/OpenFOAM/primitives/functions/Function2/None/None2.H
View File

@ -64,6 +64,9 @@ public:
// Constructors
//- Construct from name
None(const word& name);
//- Construct from name and dictionary
None
(

6
src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
View File

@ -86,9 +86,9 @@ void Foam::Function2s::Scale<Type>::write
const unitConversions& units
) const
{
writeEntry(os, {units.x, units.y, unitless}, scale_());
writeEntry(os, {units.x, units.x}, xScale_());
writeEntry(os, {units.y, units.y}, yScale_());
writeEntry(os, units.x, units.y, unitless, scale_());
writeEntry(os, units.x, units.x, xScale_());
writeEntry(os, units.y, units.y, yScale_());
writeEntry(os, units, value_());
}

7
src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C
View File

@ -27,6 +27,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::Function2s::ZeroConstant<Type>::ZeroConstant(const word& name)
:
FieldFunction2<Type, ZeroConstant<Type>>(name)
{}
template<class Type>
Foam::Function2s::ZeroConstant<Type>::ZeroConstant
(

3
src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
View File

@ -67,6 +67,9 @@ public:
// Constructors
//- Construct from name
ZeroConstant(const word& name);
//- Construct from name and dictionary
ZeroConstant
(

10
src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lumpedMassTemperature/lumpedMassTemperatureFvPatchScalarField.C
View File

@ -75,15 +75,7 @@ lumpedMassTemperatureFvPatchScalarField
dimPower,
dict
)
: autoPtr<Function1<scalar>>
(
new Function1s::ZeroConstant<scalar>
(
"Q",
{db().time().userUnits(), dimPower},
dict
)
)
: autoPtr<Function1<scalar>>(new Function1s::ZeroConstant<scalar>("Q"))
),
V_(NaN)
{

3
src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
View File

@ -237,7 +237,8 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
Function1s::Table<vector>
(
word::null,
{mesh().time().userUnits(), dimLength},
mesh().time().userUnits(),
dimLength,
dict
).value(mesh().time().value());
}

2
src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C
View File

@ -53,7 +53,7 @@ Foam::saturationModels::function1Temperature::function1Temperature
saturationTemperatureModel(),
function_
(
Function1<scalar>::New("function", {dimPressure, dimTemperature}, dict)
Function1<scalar>::New("function", dimPressure, dimTemperature, dict)
)
{}

7
src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
View File

@ -50,14 +50,11 @@ Foam::autoPtr<Foam::Function1<Foam::scalar>> Foam::liquid::New
{
if (dict.isDict(name))
{
return Function1<scalar>::New(name, {dimTemperature, dims}, dict);
return Function1<scalar>::New(name, dimTemperature, dims, dict);
}
else
{
return autoPtr<Function1<scalar>>
(
new Function1s::None<scalar>(name, {dimTemperature, dims}, dict)
);
return autoPtr<Function1<scalar>>(new Function1s::None<scalar>(name));
}
}

4
src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
View File

@ -203,7 +203,7 @@ inline void Foam::liquidProperties::write
Ostream& os
) const
{
writeEntry(os, {dimTemperature, dims}, f);
writeEntry(os, dimTemperature, dims, f);
}
@ -216,7 +216,7 @@ inline void Foam::liquidProperties::write
Ostream& os
) const
{
writeEntry(os, {dimPressure, dimTemperature, dims}, f);
writeEntry(os, dimPressure, dimTemperature, dims, f);
}