diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C index 6171c38582..46ac633350 100644 --- a/applications/utilities/postProcessing/noise/noise.C +++ b/applications/utilities/postProcessing/noise/noise.C @@ -161,7 +161,8 @@ int main(int argc, char *argv[]) Function1s::Table pData ( "pressure", - {dimTime, dimPressure}, + dimTime, + dimPressure, dict.subDict("pressureData") ); diff --git a/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs b/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs index d60ead1e82..fa4e90f1d2 100644 --- a/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs +++ b/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs @@ -59,7 +59,8 @@ codeRead const Function1s::Table initialDistribution ( "initialDistribution", - {dimLength, dimless}, + dimLength, + dimless, dictionary ( "format", "foam", diff --git a/src/OpenFOAM/primitives/functions/Function1/None/None.C b/src/OpenFOAM/primitives/functions/Function1/None/None.C index d2b560bd65..a17993d19f 100644 --- a/src/OpenFOAM/primitives/functions/Function1/None/None.C +++ b/src/OpenFOAM/primitives/functions/Function1/None/None.C @@ -27,6 +27,14 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +template +Foam::Function1s::None::None(const word& name) +: + FieldFunction1>(name), + dictName_("unknown") +{} + + template Foam::Function1s::None::None ( diff --git a/src/OpenFOAM/primitives/functions/Function1/None/None.H b/src/OpenFOAM/primitives/functions/Function1/None/None.H index 2c36c1efef..4534dac837 100644 --- a/src/OpenFOAM/primitives/functions/Function1/None/None.H +++ b/src/OpenFOAM/primitives/functions/Function1/None/None.H @@ -64,6 +64,9 @@ public: // Constructors + //- Construct from name + None(const word& name); + //- Construct from name and dictionary None ( diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C index 7e8b598309..fd64538b7d 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C +++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C @@ -95,8 +95,8 @@ void Foam::Function1s::Scale::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_()); } diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C index f7e5a14ff7..79943275e5 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C +++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C @@ -180,6 +180,19 @@ Foam::Function1s::Table::Table } +template +Foam::Function1s::Table::Table +( + const word& name, + const unitConversion& xUnits, + const unitConversion& valueUnits, + const dictionary& dict +) +: + Table(name, {xUnits, valueUnits}, dict) +{} + + template Foam::Function1s::Table::Table ( diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H index 004ac33cf3..e3ef57422b 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H @@ -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 ( diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C index 0477c0c7b1..854eb8999a 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C +++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C @@ -27,6 +27,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +template +Foam::Function1s::ZeroConstant::ZeroConstant(const word& name) +: + FieldFunction1>(name) +{} + + template Foam::Function1s::ZeroConstant::ZeroConstant ( diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H index de8f002534..878f5a05b3 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H +++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H @@ -67,6 +67,9 @@ public: // Constructors + //- Construct from name + ZeroConstant(const word& name); + //- Construct from name and dictionary ZeroConstant ( diff --git a/src/OpenFOAM/primitives/functions/Function2/None/None2.C b/src/OpenFOAM/primitives/functions/Function2/None/None2.C index c18200dcdb..a085890781 100644 --- a/src/OpenFOAM/primitives/functions/Function2/None/None2.C +++ b/src/OpenFOAM/primitives/functions/Function2/None/None2.C @@ -27,6 +27,14 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +template +Foam::Function2s::None::None(const word& name) +: + FieldFunction2>(name), + dictName_("unknown") +{} + + template Foam::Function2s::None::None ( diff --git a/src/OpenFOAM/primitives/functions/Function2/None/None2.H b/src/OpenFOAM/primitives/functions/Function2/None/None2.H index d6a3422554..f97a1fcaea 100644 --- a/src/OpenFOAM/primitives/functions/Function2/None/None2.H +++ b/src/OpenFOAM/primitives/functions/Function2/None/None2.H @@ -64,6 +64,9 @@ public: // Constructors + //- Construct from name + None(const word& name); + //- Construct from name and dictionary None ( diff --git a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C index 594af9c048..53440295da 100644 --- a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C +++ b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C @@ -86,9 +86,9 @@ void Foam::Function2s::Scale::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_()); } diff --git a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C index 6ff5a66269..ec255ec3f9 100644 --- a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C +++ b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C @@ -27,6 +27,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +template +Foam::Function2s::ZeroConstant::ZeroConstant(const word& name) +: + FieldFunction2>(name) +{} + + template Foam::Function2s::ZeroConstant::ZeroConstant ( diff --git a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H index d6b454ef2d..88b5ba4b11 100644 --- a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H +++ b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H @@ -67,6 +67,9 @@ public: // Constructors + //- Construct from name + ZeroConstant(const word& name); + //- Construct from name and dictionary ZeroConstant ( diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lumpedMassTemperature/lumpedMassTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lumpedMassTemperature/lumpedMassTemperatureFvPatchScalarField.C index dce0ac022c..5cc3ab3831 100644 --- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lumpedMassTemperature/lumpedMassTemperatureFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lumpedMassTemperature/lumpedMassTemperatureFvPatchScalarField.C @@ -75,15 +75,7 @@ lumpedMassTemperatureFvPatchScalarField dimPower, dict ) - : autoPtr> - ( - new Function1s::ZeroConstant - ( - "Q", - {db().time().userUnits(), dimPower}, - dict - ) - ) + : autoPtr>(new Function1s::ZeroConstant("Q")) ), V_(NaN) { diff --git a/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C index a5329bac98..d5063496f5 100644 --- a/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C +++ b/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C @@ -237,7 +237,8 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate Function1s::Table ( word::null, - {mesh().time().userUnits(), dimLength}, + mesh().time().userUnits(), + dimLength, dict ).value(mesh().time().value()); } diff --git a/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C b/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C index 6472a24eae..02403631f1 100644 --- a/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C +++ b/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C @@ -53,7 +53,7 @@ Foam::saturationModels::function1Temperature::function1Temperature saturationTemperatureModel(), function_ ( - Function1::New("function", {dimPressure, dimTemperature}, dict) + Function1::New("function", dimPressure, dimTemperature, dict) ) {} diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C index 7f39889019..73001ade0b 100644 --- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C +++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C @@ -50,14 +50,11 @@ Foam::autoPtr> Foam::liquid::New { if (dict.isDict(name)) { - return Function1::New(name, {dimTemperature, dims}, dict); + return Function1::New(name, dimTemperature, dims, dict); } else { - return autoPtr> - ( - new Function1s::None(name, {dimTemperature, dims}, dict) - ); + return autoPtr>(new Function1s::None(name)); } } diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H index 4cd5ac7a4d..6a6a52dd04 100644 --- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H +++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H @@ -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); }