diff --git a/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index da3e823c13..f41d3c6ebb 100644
--- a/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,9 +53,12 @@ activeBaffleVelocityFvPatchVectorField
             p.boundaryMesh()[cyclicPatchLabel_]
         ).neighbFvPatch().Sf()
     ),
-    openFraction_(dict.lookup<scalar>("openFraction")),
-    openingTime_(dict.lookup<scalar>("openingTime")),
-    maxOpenFractionDelta_(dict.lookup<scalar>("maxOpenFractionDelta")),
+    openFraction_(dict.lookup<scalar>("openFraction", unitFraction)),
+    openingTime_(dict.lookup<scalar>("openingTime", dimTime)),
+    maxOpenFractionDelta_
+    (
+        dict.lookup<scalar>("maxOpenFractionDelta", unitFraction)
+    ),
     curTimeIndex_(-1)
 {
     fvPatchVectorField::operator=(Zero);
diff --git a/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index db2d1af3b0..605886b01b 100644
--- a/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/applications/legacy/combustion/PDRFoam/derivedFvPatchFields/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,12 +47,15 @@ activePressureForceBaffleVelocityFvPatchVectorField
     initWallSf_(0),
     initCyclicSf_(0),
     nbrCyclicSf_(0),
-    openFraction_(dict.lookup<scalar>("openFraction")),
-    openingTime_(dict.lookup<scalar>("openingTime")),
-    maxOpenFractionDelta_(dict.lookup<scalar>("maxOpenFractionDelta")),
+    openFraction_(dict.lookup<scalar>("openFraction", unitFraction)),
+    openingTime_(dict.lookup<scalar>("openingTime", dimTime)),
+    maxOpenFractionDelta_
+    (
+        dict.lookup<scalar>("maxOpenFractionDelta", unitFraction)
+    ),
     curTimeIndex_(-1),
-    minThresholdValue_(dict.lookup<scalar>("minThresholdValue")),
-    fBased_(readBool(dict.lookup("forceBased"))),
+    minThresholdValue_(dict.lookup<scalar>("minThresholdValue", dimPressure)),
+    fBased_(dict.lookup<bool>("forceBased")),
     baffleActivated_(0)
 {
     fvPatchVectorField::operator=(Zero);
diff --git a/applications/legacy/electromagnetics/mhdFoam/createFields.H b/applications/legacy/electromagnetics/mhdFoam/createFields.H
index 98cf31431f..bfff09cbda 100644
--- a/applications/legacy/electromagnetics/mhdFoam/createFields.H
+++ b/applications/legacy/electromagnetics/mhdFoam/createFields.H
@@ -22,7 +22,7 @@ dimensionedScalar rho
 dimensionedScalar nu
 (
     "nu",
-    dimViscosity,
+    dimKinematicViscosity,
     physicalProperties
 );
 
diff --git a/applications/legacy/incompressible/icoFoam/createFields.H b/applications/legacy/incompressible/icoFoam/createFields.H
index 9fd7a2983c..cd14e51bc9 100644
--- a/applications/legacy/incompressible/icoFoam/createFields.H
+++ b/applications/legacy/incompressible/icoFoam/createFields.H
@@ -15,7 +15,7 @@ IOdictionary physicalProperties
 dimensionedScalar nu
 (
     "nu",
-    dimViscosity,
+    dimKinematicViscosity,
     physicalProperties.lookup("nu")
 );
 
diff --git a/applications/legacy/incompressible/shallowWaterFoam/readGravitationalAcceleration.H b/applications/legacy/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
index d8a8bf8d06..7e6638b58f 100644
--- a/applications/legacy/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
+++ b/applications/legacy/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
@@ -15,7 +15,8 @@ IOdictionary gravitationalProperties
 const dimensionedVector g(gravitationalProperties.lookup("g"));
 const Switch rotating(gravitationalProperties.lookup("rotating"));
 const dimensionedVector Omega =
-    rotating ? gravitationalProperties.lookup("Omega")
-             : dimensionedVector("Omega", -dimTime, vector(0,0,0));
+    rotating
+  ? gravitationalProperties.lookup("Omega")
+  : dimensionedVector("Omega", dimless/dimTime, vector::zero);
 const dimensionedScalar magg = mag(g);
 const dimensionedVector gHat = g/magg;
diff --git a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C
index c6c6fa8e18..559c1b8d24 100644
--- a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C
+++ b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C
@@ -59,11 +59,20 @@ namespace Foam
 
 void Foam::fv::VoFSolidificationMelting::readCoeffs()
 {
-    alphaSolidT_.reset(Function1<scalar>::New("alphaSolidT", coeffs()).ptr());
+    alphaSolidT_.reset
+    (
+        Function1<scalar>::New
+        (
+            "alphaSolidT",
+            dimTemperature,
+            unitFraction,
+            coeffs()
+        ).ptr()
+    );
     L_ = dimensionedScalar("L", dimEnergy/dimMass, coeffs());
-    relax_ = coeffs().lookupOrDefault<scalar>("relax", 0.9);
-    Cu_ = coeffs().lookupOrDefault<scalar>("Cu", 100000);
-    q_ = coeffs().lookupOrDefault<scalar>("q", 0.001);
+    relax_ = coeffs().lookupOrDefault<scalar>("relax", dimless, 0.9);
+    Cu_ = coeffs().lookupOrDefault<scalar>("Cu", dimless/dimTime, 100000);
+    q_ = coeffs().lookupOrDefault<scalar>("q", dimless, 0.001);
 }
 
 
diff --git a/applications/modules/fluidSolver/fluidSolver.C b/applications/modules/fluidSolver/fluidSolver.C
index 5696574bb3..b68704433b 100644
--- a/applications/modules/fluidSolver/fluidSolver.C
+++ b/applications/modules/fluidSolver/fluidSolver.C
@@ -57,10 +57,7 @@ bool Foam::solvers::fluidSolver::read()
 
     maxDeltaT_ =
         runTime.controlDict().found("maxDeltaT")
-      ? runTime.userTimeToTime
-        (
-            runTime.controlDict().lookup<scalar>("maxDeltaT")
-        )
+      ? runTime.controlDict().lookup<scalar>("maxDeltaT", runTime.userUnits())
       : vGreat;
 
     correctPhi = pimple.dict().lookupOrDefault
diff --git a/applications/modules/fluidSolver/functionObjects/fluidMaxDeltaT/fluidMaxDeltaT.C b/applications/modules/fluidSolver/functionObjects/fluidMaxDeltaT/fluidMaxDeltaT.C
index 4cdd923a55..ac1cc24eeb 100644
--- a/applications/modules/fluidSolver/functionObjects/fluidMaxDeltaT/fluidMaxDeltaT.C
+++ b/applications/modules/fluidSolver/functionObjects/fluidMaxDeltaT/fluidMaxDeltaT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,8 +72,22 @@ bool Foam::functionObjects::fluidMaxDeltaT::read(const dictionary& dict)
 {
     fvMeshFunctionObject::read(dict);
 
-    maxCoPtr_ = Function1<scalar>::New("maxCo", dict);
-    maxDeltaTPtr_ = Function1<scalar>::New("maxDeltaT", dict);
+    maxCoPtr_ =
+        Function1<scalar>::New
+        (
+            "maxCo",
+            time_.userUnits(),
+            dimless,
+            dict
+        );
+    maxDeltaTPtr_ =
+        Function1<scalar>::New
+        (
+            "maxDeltaT",
+            time_.userUnits(),
+            time_.userUnits(),
+            dict
+        );
 
     return true;
 }
@@ -93,15 +107,14 @@ bool Foam::functionObjects::fluidMaxDeltaT::write()
 
 Foam::scalar Foam::functionObjects::fluidMaxDeltaT::maxDeltaT() const
 {
-    scalar deltaT =
-        time_.userTimeToTime(maxDeltaTPtr_().value(time_.userTimeValue()));
+    scalar deltaT = maxDeltaTPtr_().value(time_.value());
 
     const scalar CoNum =
         mesh_.lookupObject<solvers::fluidSolver>(solver::typeName).CoNum;
 
     if (CoNum > small)
     {
-        const scalar maxCo = maxCoPtr_().value(time_.userTimeValue());
+        const scalar maxCo = maxCoPtr_().value(time_.value());
 
         deltaT = min(deltaT, maxCo/CoNum*time_.deltaTValue());
     }
diff --git a/applications/modules/incompressibleDriftFlux/incompressibleDriftFluxMixture/incompressibleDriftFluxMixture.C b/applications/modules/incompressibleDriftFlux/incompressibleDriftFluxMixture/incompressibleDriftFluxMixture.C
index 5347d910e3..4c511b9929 100644
--- a/applications/modules/incompressibleDriftFlux/incompressibleDriftFluxMixture/incompressibleDriftFluxMixture.C
+++ b/applications/modules/incompressibleDriftFlux/incompressibleDriftFluxMixture/incompressibleDriftFluxMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ Foam::incompressibleDriftFluxMixture::incompressibleDriftFluxMixture
             mesh
         ),
         mesh,
-        dimensionedScalar(dimViscosity, 0),
+        dimensionedScalar(dimKinematicViscosity, 0),
         calculatedFvPatchScalarField::typeName
     ),
 
diff --git a/applications/modules/incompressibleMultiphaseVoF/incompressibleMultiphaseVoFMixture/incompressibleMultiphaseVoFMixture.C b/applications/modules/incompressibleMultiphaseVoF/incompressibleMultiphaseVoFMixture/incompressibleMultiphaseVoFMixture.C
index 58b8e7a717..d3c7c0d3b3 100644
--- a/applications/modules/incompressibleMultiphaseVoF/incompressibleMultiphaseVoFMixture/incompressibleMultiphaseVoFMixture.C
+++ b/applications/modules/incompressibleMultiphaseVoF/incompressibleMultiphaseVoFMixture/incompressibleMultiphaseVoFMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::incompressibleMultiphaseVoFMixture::incompressibleMultiphaseVoFMixture
             mesh
         ),
         mesh,
-        dimensionedScalar(dimViscosity, 0),
+        dimensionedScalar(dimKinematicViscosity, 0),
         calculatedFvPatchScalarField::typeName
     )
 {
diff --git a/applications/modules/incompressibleVoF/incompressibleTwoPhaseVoFMixture/incompressibleTwoPhaseVoFMixture.C b/applications/modules/incompressibleVoF/incompressibleTwoPhaseVoFMixture/incompressibleTwoPhaseVoFMixture.C
index d1877812c6..4dd47ddbaa 100644
--- a/applications/modules/incompressibleVoF/incompressibleTwoPhaseVoFMixture/incompressibleTwoPhaseVoFMixture.C
+++ b/applications/modules/incompressibleVoF/incompressibleTwoPhaseVoFMixture/incompressibleTwoPhaseVoFMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Foam::incompressibleTwoPhaseVoFMixture::incompressibleTwoPhaseVoFMixture
             mesh
         ),
         mesh,
-        dimensionedScalar(dimViscosity, 0),
+        dimensionedScalar(dimKinematicViscosity, 0),
         calculatedFvPatchScalarField::typeName
     )
 {
diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C b/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C
index bf1ff5b823..b8b47ad4ce 100644
--- a/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C
+++ b/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ filmSurfaceVelocityFvPatchVectorField
 )
 :
     mixedFvPatchField<vector>(p, iF, dict, false),
-    Cs_(dict.lookupOrDefault<scalar>("Cs", 0))
+    Cs_(dict.lookupOrDefault<scalar>("Cs", dimless, 0))
 {
     refValue() = Zero;
     refGrad() = Zero;
@@ -49,7 +49,7 @@ filmSurfaceVelocityFvPatchVectorField
     {
         fvPatchVectorField::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/applications/modules/isothermalFilm/isothermalFilm.C b/applications/modules/isothermalFilm/isothermalFilm.C
index fb65659957..44f97f84ae 100644
--- a/applications/modules/isothermalFilm/isothermalFilm.C
+++ b/applications/modules/isothermalFilm/isothermalFilm.C
@@ -235,10 +235,7 @@ bool Foam::solvers::isothermalFilm::read()
 
     maxDeltaT_ =
         runTime.controlDict().found("maxDeltaT")
-      ? runTime.userTimeToTime
-        (
-            runTime.controlDict().lookup<scalar>("maxDeltaT")
-        )
+      ? runTime.controlDict().lookup<scalar>("maxDeltaT", runTime.userUnits())
       : vGreat;
 
     return true;
diff --git a/applications/modules/movingMesh/movingMesh.C b/applications/modules/movingMesh/movingMesh.C
index 90eab62302..fb0e976b9f 100644
--- a/applications/modules/movingMesh/movingMesh.C
+++ b/applications/modules/movingMesh/movingMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,10 +46,7 @@ Foam::solvers::movingMesh::movingMesh(fvMesh& mesh)
     maxDeltaT_
     (
         runTime.controlDict().found("maxDeltaT")
-      ? runTime.userTimeToTime
-        (
-            runTime.controlDict().lookup<scalar>("maxDeltaT")
-        )
+      ? runTime.controlDict().lookup<scalar>("maxDeltaT", runTime.userUnits())
       : vGreat
     )
 {}
diff --git a/applications/modules/multiphaseEuler/cellPressureCorrector.C b/applications/modules/multiphaseEuler/cellPressureCorrector.C
index 09dda630b0..a36c75ab6c 100644
--- a/applications/modules/multiphaseEuler/cellPressureCorrector.C
+++ b/applications/modules/multiphaseEuler/cellPressureCorrector.C
@@ -284,7 +284,7 @@ void Foam::solvers::multiphaseEuler::cellPressureCorrector()
                 mesh
             ),
             mesh,
-            dimensionedScalar(dimFlux, 0)
+            dimensionedScalar(dimVolumetricFlux, 0)
         );
 
         forAll(movingPhases, movingPhasei)
diff --git a/applications/modules/multiphaseEuler/facePressureCorrector.C b/applications/modules/multiphaseEuler/facePressureCorrector.C
index 5290ab0e7a..b1427609bf 100644
--- a/applications/modules/multiphaseEuler/facePressureCorrector.C
+++ b/applications/modules/multiphaseEuler/facePressureCorrector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -226,7 +226,7 @@ void Foam::solvers::multiphaseEuler::facePressureCorrector()
                 IOobject::AUTO_WRITE
             ),
             mesh,
-            dimensionedScalar(dimFlux, 0)
+            dimensionedScalar(dimVolumetricFlux, 0)
         );
 
         forAll(movingPhases, movingPhasei)
diff --git a/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C b/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C
index d979256675..0c9621f819 100644
--- a/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C
+++ b/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C
@@ -52,7 +52,13 @@ void Foam::fv::homogeneousLiquidPhaseSeparation::readCoeffs()
 {
     solubilityCurve_.reset
     (
-        Function1<scalar>::New("solubility", coeffs()).ptr()
+        Function1<scalar>::New
+        (
+            "solubility",
+            dimTemperature,
+            unitFraction,
+            coeffs()
+        ).ptr()
     );
 }
 
diff --git a/applications/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C b/applications/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C
index a18c4fefdd..8fad43c56f 100644
--- a/applications/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C
+++ b/applications/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::SaffmanMei::Cl() const
        *sqr(interface_.dispersed().d())
        /(
             interface_.continuous().fluidThermo().nu()
-          + dimensionedScalar(dimViscosity, small)
+          + dimensionedScalar(dimKinematicViscosity, small)
         )
     );
 
diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 0d59cd97ea..49d71b0662 100644
--- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,16 +52,10 @@ JohnsonJacksonParticleSlipFvPatchVectorField
     partialSlipFvPatchVectorField(p, iF),
     specularityCoefficient_
     (
-        "specularityCoefficient",
-        dimless,
-        dict.lookup("specularityCoefficient")
+        dict.lookup<scalar>("specularityCoefficient", unitFraction)
     )
 {
-    if
-    (
-        (specularityCoefficient_.value() < 0)
-     || (specularityCoefficient_.value() > 1)
-    )
+    if (specularityCoefficient_ < 0 || specularityCoefficient_ > 1)
     {
         FatalErrorInFunction
             << "The specularity coefficient has to be between 0 and 1"
@@ -70,7 +64,7 @@ JohnsonJacksonParticleSlipFvPatchVectorField
 
     fvPatchVectorField::operator=
     (
-        vectorField("value", dict, p.size())
+        vectorField("value", iF.dimensions(), dict, p.size())
     );
 }
 
@@ -163,7 +157,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
         constant::mathematical::pi
        *alpha
        *gs0
-       *specularityCoefficient_.value()
+       *specularityCoefficient_
        *sqrt(3*Theta)
        /max(6*nu*phase.alphaMax(), small)
     );
diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
index 635a094f16..2d75281f0f 100644
--- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
+++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ class JohnsonJacksonParticleSlipFvPatchVectorField
     // Private Data
 
         //- Specularity coefficient
-        dimensionedScalar specularityCoefficient_;
+        const scalar specularityCoefficient_;
 
 
 public:
diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index a11dae3123..90c1936546 100644
--- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,33 +51,21 @@ JohnsonJacksonParticleThetaFvPatchScalarField
     mixedFvPatchScalarField(p, iF, dict, false),
     restitutionCoefficient_
     (
-        "restitutionCoefficient",
-        dimless,
-        dict.lookup("restitutionCoefficient")
+        dict.lookup<scalar>("restitutionCoefficient", unitFraction)
     ),
     specularityCoefficient_
     (
-        "specularityCoefficient",
-        dimless,
-        dict.lookup("specularityCoefficient")
+        dict.lookup<scalar>("specularityCoefficient", unitFraction)
     )
 {
-    if
-    (
-        (restitutionCoefficient_.value() < 0)
-     || (restitutionCoefficient_.value() > 1)
-    )
+    if (restitutionCoefficient_ < 0 || restitutionCoefficient_ > 1)
     {
         FatalErrorInFunction
             << "The restitution coefficient has to be between 0 and 1"
             << abort(FatalError);
     }
 
-    if
-    (
-        (specularityCoefficient_.value() < 0)
-     || (specularityCoefficient_.value() > 1)
-    )
+    if (specularityCoefficient_ < 0 || specularityCoefficient_ > 1)
     {
         FatalErrorInFunction
             << "The specularity coefficient has to be between 0 and 1"
@@ -86,7 +74,7 @@ JohnsonJacksonParticleThetaFvPatchScalarField
 
     fvPatchScalarField::operator=
     (
-        scalarField("value", dict, p.size())
+        scalarField("value", iF.dimensions(), dict, p.size())
     );
 }
 
@@ -182,13 +170,13 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
     const scalarField Theta(patchInternalField());
 
     // calculate the reference value and the value fraction
-    if (restitutionCoefficient_.value() != 1.0)
+    if (restitutionCoefficient_ != 1.0)
     {
         this->refValue() =
             (2.0/3.0)
-           *specularityCoefficient_.value()
+           *specularityCoefficient_
            *magSqr(U)
-           /(scalar(1) - sqr(restitutionCoefficient_.value()));
+           /(scalar(1) - sqr(restitutionCoefficient_));
 
         this->refGrad() = 0.0;
 
@@ -197,7 +185,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
              constant::mathematical::pi
             *alpha
             *gs0
-            *(scalar(1) - sqr(restitutionCoefficient_.value()))
+            *(scalar(1) - sqr(restitutionCoefficient_))
             *sqrt(3*Theta)
             /max(4*kappa*phase.alphaMax(), small)
         );
@@ -214,7 +202,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
         this->refGrad() =
             pos0(alpha - small)
            *constant::mathematical::pi
-           *specularityCoefficient_.value()
+           *specularityCoefficient_
            *alpha
            *gs0
            *sqrt(3*Theta)
diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
index 2b45fc3912..38e795f300 100644
--- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
+++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,10 +69,10 @@ class JohnsonJacksonParticleThetaFvPatchScalarField
     // Private Data
 
         //- Particle-wall restitution coefficient
-        dimensionedScalar restitutionCoefficient_;
+        const scalar restitutionCoefficient_;
 
         //- Specularity coefficient
-        dimensionedScalar specularityCoefficient_;
+        const scalar specularityCoefficient_;
 
 
 public:
diff --git a/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.C b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.C
index 5392b99680..cc7f478857 100644
--- a/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.C
+++ b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.C
@@ -222,7 +222,7 @@ Foam::phaseSystem::phaseSystem
             mesh
         ),
         mesh,
-        dimensionedScalar(dimFlux, 0)
+        dimensionedScalar(dimVolumetricFlux, 0)
     ),
 
     dpdt_
diff --git a/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.C b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.C
index c4e83ee33a..9ced92341f 100644
--- a/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.C
+++ b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ void Foam::diameterModels::LiaoBase::precompute()
         const dimensionedScalar nuc
         (
             "nuc",
-            dimViscosity,
+            dimKinematicViscosity,
             gAverage(populationBalance_.continuousPhase().fluidThermo().nu()())
         );
 
diff --git a/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H b/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H
index b3f4b4c95d..e9e74592b6 100644
--- a/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H
+++ b/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,6 +84,7 @@ public:
         (
             const speciesTable& species,
             const objectRegistry& ob,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H b/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H
index 73d44fa1e9..ceabe8a7f6 100644
--- a/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H
+++ b/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,10 +34,11 @@ phaseSurfaceArrheniusReactionRate
 (
     const speciesTable& species,
     const objectRegistry& ob,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    ArrheniusReactionRate(species, dict),
+    ArrheniusReactionRate(species, dims, dict),
     phaseName_(dict.lookup("phase")),
     ob_(ob),
     tAv_(nullptr)
diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index c318a9eab2..1be7ae91de 100644
--- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -576,8 +576,8 @@ alphatWallBoilingWallFunctionFvPatchScalarField
     ),
     tolerance_(dict.lookupOrDefault<scalar>("tolerance", rootSmall)),
 
-    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)),
-    tau_(dict.lookupOrDefault<scalar>("bubbleWaitingTimeRatio", 0.8)),
+    Prt_(dict.lookupOrDefault<scalar>("Prt", dimless, 0.85)),
+    tau_(dict.lookupOrDefault<scalar>("bubbleWaitingTimeRatio", dimless, 0.8)),
 
     partitioningModel_(nullptr),
     nucleationSiteModel_(nullptr),
@@ -628,6 +628,7 @@ alphatWallBoilingWallFunctionFvPatchScalarField
     auto readFieldBackwardsCompatible = [&p]
     (
         const dictionary& dict,
+        const unitConversion& units,
         const wordList& keywords,
         scalarField& field
     )
@@ -636,7 +637,7 @@ alphatWallBoilingWallFunctionFvPatchScalarField
         {
             if (dict.found(keywords[i]))
             {
-                field = scalarField(keywords[i], dict, p.size());
+                field = scalarField(keywords[i], units, dict, p.size());
                 return;
             }
         }
@@ -646,17 +647,25 @@ alphatWallBoilingWallFunctionFvPatchScalarField
     readFieldBackwardsCompatible
     (
         dict,
+        unitFraction,
         {"wetFraction", "wallLiquidFraction"},
         wetFraction_
     );
 
     if (phaseType_ == liquidPhase)
     {
-        readFieldBackwardsCompatible(dict, {"dDeparture"}, dDeparture_);
+        readFieldBackwardsCompatible
+        (
+            dict,
+            dimLength,
+            {"dDeparture"},
+            dDeparture_
+        );
 
         readFieldBackwardsCompatible
         (
             dict,
+            dimless/dimTime,
             {"fDeparture", "depFrequency"},
             fDeparture_
         );
@@ -664,15 +673,34 @@ alphatWallBoilingWallFunctionFvPatchScalarField
         readFieldBackwardsCompatible
         (
             dict,
+            dimless/dimArea,
             {"nucleationSiteDensity", "nucSiteDensity"},
             nucleationSiteDensity_
         );
 
-        readFieldBackwardsCompatible(dict, {"qQuenching"}, qQuenching_);
+        readFieldBackwardsCompatible
+        (
+            dict,
+            dimPower/dimArea,
+            {"qQuenching"},
+            qQuenching_
+        );
 
-        readFieldBackwardsCompatible(dict, {"qEvaporative"}, qEvaporative_);
+        readFieldBackwardsCompatible
+        (
+            dict,
+            dimPower/dimArea,
+            {"qEvaporative"},
+            qEvaporative_
+        );
 
-        readFieldBackwardsCompatible(dict, {"dmdtf"}, dmdtf_);
+        readFieldBackwardsCompatible
+        (
+            dict,
+            dimDensity/dimTime,
+            {"dmdtf"},
+            dmdtf_
+        );
     }
 }
 
diff --git a/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C
index 7d45641e68..203cf335b3 100644
--- a/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,21 +44,15 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     muName_(dict.lookupOrDefault<word>("mu", "mu")),
-    accommodationCoeff_(dict.lookup<scalar>("accommodationCoeff")),
-    Twall_("Twall", dict, p.size()),
-    gamma_(dict.lookupOrDefault<scalar>("gamma", 1.4))
+    accommodationCoeff_(dict.lookup<scalar>("accommodationCoeff", dimless)),
+    Twall_("Twall", dimTemperature, dict, p.size()),
+    gamma_(dict.lookupOrDefault<scalar>("gamma", dimless, 1.4))
 {
-    if
-    (
-        mag(accommodationCoeff_) < small
-     || mag(accommodationCoeff_) > 2.0
-    )
+    if (mag(accommodationCoeff_) < small || mag(accommodationCoeff_) > 2.0)
     {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "unphysical accommodationCoeff specified"
-            << "(0 < accommodationCoeff <= 1)" << endl
+        FatalIOErrorInFunction(dict)
+            << "unphysical accommodationCoeff specified"
+            << "(0 < accommodationCoeff <= 2)" << endl
             << exit(FatalIOError);
     }
 
@@ -66,7 +60,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
     {
         fvPatchField<scalar>::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C b/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C
index c335a93b79..eb9cf1d3c4 100644
--- a/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,21 +45,15 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
     psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     muName_(dict.lookupOrDefault<word>("mu", "mu")),
     accommodationCoeff_(dict.lookup<scalar>("accommodationCoeff")),
-    Uwall_("Uwall", dict, p.size()),
+    Uwall_("Uwall", dimVelocity, dict, p.size()),
     thermalCreep_(dict.lookupOrDefault("thermalCreep", true)),
     curvature_(dict.lookupOrDefault("curvature", true))
 {
-    if
-    (
-        mag(accommodationCoeff_) < small
-     || mag(accommodationCoeff_) > 2.0
-    )
+    if (mag(accommodationCoeff_) < small || mag(accommodationCoeff_) > 2.0)
     {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "unphysical accommodationCoeff_ specified"
-            << "(0 < accommodationCoeff_ <= 1)" << endl
+        FatalIOErrorInFunction(dict)
+            << "unphysical accommodationCoeff_ specified"
+            << "(0 < accommodationCoeff_ <= 2)" << endl
             << exit(FatalIOError);
     }
 
@@ -67,14 +61,15 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
 
         if (dict.found("refValue") && dict.found("valueFraction"))
         {
-            this->refValue() = vectorField("refValue", dict, p.size());
+            this->refValue() =
+                vectorField("refValue", iF.dimensions(), dict, p.size());
             this->valueFraction() =
-                scalarField("valueFraction", dict, p.size());
+                scalarField("valueFraction", unitFraction, dict, p.size());
         }
         else
         {
diff --git a/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
index d50ff130c1..5a1cc4e6e0 100644
--- a/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
+++ b/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,8 +50,8 @@ Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 )
 :
     transformFvPatchField<Type>(p, iF),
-    refValue_("refValue", dict, p.size()),
-    valueFraction_("valueFraction", dict, p.size())
+    refValue_("refValue", iF.dimensions(), dict, p.size()),
+    valueFraction_("valueFraction", unitFraction, dict, p.size())
 {}
 
 
diff --git a/applications/modules/solid/solid.C b/applications/modules/solid/solid.C
index c2add7c2d2..056313c5fe 100644
--- a/applications/modules/solid/solid.C
+++ b/applications/modules/solid/solid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,10 +91,7 @@ bool Foam::solvers::solid::read()
 
     maxDeltaT_ =
         runTime.controlDict().found("maxDeltaT")
-      ? runTime.userTimeToTime
-        (
-            runTime.controlDict().lookup<scalar>("maxDeltaT")
-        )
+      ? runTime.controlDict().lookup<scalar>("maxDeltaT", runTime.userUnits())
       : vGreat;
 
     return true;
diff --git a/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C b/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C
index 4b3d6e4138..9ae45d2d2c 100644
--- a/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C
+++ b/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,9 +38,12 @@ hydrostaticDisplacementFvPatchVectorField
 )
 :
     tractionDisplacementFvPatchVectorField(p, iF),
-    rhoLiquid_(dict.lookup<scalar>("rhoLiquid")),
-    liquidSurfacePressure_(dict.lookup<scalar>("liquidSurfacePressure")),
-    liquidSurfacePoint_(dict.lookup("liquidSurfacePoint"))
+    rhoLiquid_(dict.lookup<scalar>("rhoLiquid", dimDensity)),
+    liquidSurfacePressure_
+    (
+        dict.lookup<scalar>("liquidSurfacePressure", dimPressure)
+    ),
+    liquidSurfacePoint_(dict.lookup<vector>("liquidSurfacePoint", dimLength))
 {}
 
 
diff --git a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index c439bc9cc9..9243b16a12 100644
--- a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,8 +53,17 @@ tractionDisplacementFvPatchVectorField
 )
 :
     fixedGradientFvPatchVectorField(p, iF),
-    traction_("traction", dict, p.size()),
-    pressure_(Function1<scalar>::New("pressure", dict))
+    traction_("traction", dimPressure, dict, p.size()),
+    pressure_
+    (
+        Function1<scalar>::New
+        (
+            "pressure",
+            db().time().userUnits(),
+            dimPressure,
+            dict
+        )
+    )
 {
     fvPatchVectorField::operator=(patchInternalField());
     gradient() = Zero;
@@ -127,7 +136,7 @@ void Foam::tractionDisplacementFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    this->updateCoeffs(pressure_->value(this->db().time().userTimeValue()));
+    this->updateCoeffs(pressure_->value(db().time().value()));
 }
 
 
@@ -135,7 +144,7 @@ void Foam::tractionDisplacementFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
     writeEntry(os, "traction", traction_);
-    writeEntry(os, pressure_());
+    writeEntry(os, db().time().userUnits(), dimPressure, pressure_());
     writeEntry(os, "value", *this);
 }
 
diff --git a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H
index 324eb5c669..05b89a1dd1 100644
--- a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H
+++ b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,8 +55,10 @@ class tractionDisplacementFvPatchVectorField
     // Private Data
 
         vectorField traction_;
+
         autoPtr<Function1<scalar>> pressure_;
 
+
 protected:
 
         //- Update the coefficients associated with the patch field
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index dcb0ade1eb..49991c44ba 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -53,7 +53,6 @@ Description
 #include "removePoints.H"
 #include "meshCheck.H"
 #include "polyTopoChangeMap.H"
-#include "unitConversion.H"
 
 using namespace Foam;
 
@@ -305,24 +304,25 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const scalar featureAngle = args.argRead<scalar>(1);
-    const scalar minCos = Foam::cos(degToRad(featureAngle));
+    const scalar featureAngle = degToRad(args.argRead<scalar>(1));
+    const scalar minCos = Foam::cos(featureAngle);
 
     // Sin of angle between two consecutive edges on a face.
     // If sin(angle) larger than this the face will be considered concave.
-    scalar concaveAngle = args.optionLookupOrDefault("concaveAngle", 30.0);
-    scalar concaveSin = Foam::sin(degToRad(concaveAngle));
+    const scalar concaveAngle =
+        degToRad(args.optionLookupOrDefault("concaveAngle", 30.0));
+    const scalar concaveSin = Foam::sin(concaveAngle);
 
     const bool overwrite = args.optionFound("overwrite");
     const bool meshQuality = args.optionFound("meshQuality");
 
     Info<< "Merging all faces of a cell" << nl
         << "    - which are on the same patch" << nl
-        << "    - which make an angle < " << featureAngle << " degrees"
-        << nl
+        << "    - which make an angle < " << radToDeg(featureAngle)
+        << " degrees" << nl
         << "      (cos:" << minCos << ')' << nl
         << "    - even when resulting face becomes concave by more than "
-        << concaveAngle << " degrees" << nl
+        << radToDeg(concaveAngle) << " degrees" << nl
         << "      (sin:" << concaveSin << ')' << nl
         << endl;
 
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 47d9a997eb..1a699f052c 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -50,7 +50,6 @@ Description
 #include "cellSet.H"
 #include "cellModeller.H"
 #include "meshCutter.H"
-#include "unitConversion.H"
 #include "geomCellLooper.H"
 #include "plane.H"
 #include "edgeVertex.H"
@@ -548,9 +547,9 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const scalar featureAngle = args.argRead<scalar>(1);
-    const scalar minCos = Foam::cos(degToRad(featureAngle));
-    const scalar minSin = Foam::sin(degToRad(featureAngle));
+    const scalar featureAngle = degToRad(args.argRead<scalar>(1));
+    const scalar minCos = Foam::cos(featureAngle);
+    const scalar minSin = Foam::sin(featureAngle);
 
     const bool readSet   = args.optionFound("set");
     const bool geometry  = args.optionFound("geometry");
@@ -559,7 +558,7 @@ int main(int argc, char *argv[])
     const scalar edgeTol = args.optionLookupOrDefault("tol", 0.2);
 
     Info<< "Trying to split cells with internal angles > feature angle\n" << nl
-        << "featureAngle      : " << featureAngle << nl
+        << "featureAngle      : " << radToDeg(featureAngle) << nl
         << "edge snapping tol : " << edgeTol << nl;
     if (readSet)
     {
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index eff8da938f..567cc7b86a 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,6 @@ Description
 #include "IFstream.H"
 #include "OFstream.H"
 #include "pointField.H"
-#include "unitConversion.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index de1d4af487..a25658f986 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -1429,7 +1429,11 @@ int main(int argc, char *argv[])
     // Un-merge any merged cyclics
     if (args.optionFound("includedAngle"))
     {
-        polyMeshUnMergeCyclics(mesh, args.optionRead<scalar>("includedAngle"));
+        polyMeshUnMergeCyclics
+        (
+            mesh,
+            degToRad(args.optionRead<scalar>("includedAngle"))
+        );
     }
     else
     {
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 1e13657cd6..722dd121ae 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -43,7 +43,6 @@ Description
 #include "wedgePolyPatch.H"
 #include "mergedCyclicPolyPatch.H"
 #include "polyMeshUnMergeCyclics.H"
-#include "unitConversion.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index 46d549c297..c3d0d64410 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,6 @@ Description
 #include "Time.H"
 #include "repatchMesh.H"
 #include "repatcher.H"
-#include "unitConversion.H"
 #include "OFstream.H"
 #include "ListOps.H"
 
@@ -84,12 +83,12 @@ int main(int argc, char *argv[])
         << " s\n" << endl << endl;
 
 
-    const scalar featureAngle = args.argRead<scalar>(1);
+    const scalar featureAngle = degToRad(args.argRead<scalar>(1));
     const bool overwrite      = args.optionFound("overwrite");
 
-    const scalar minCos = Foam::cos(degToRad(featureAngle));
+    const scalar minCos = Foam::cos(featureAngle);
 
-    Info<< "Feature:" << featureAngle << endl
+    Info<< "Feature:" << radToDeg(featureAngle) << endl
         << "minCos :" << minCos << endl
         << endl;
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 9e9f24f5b6..22cc129ed6 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,6 +168,7 @@ int main(int argc, char *argv[])
 
     scalar nonOrthThreshold = 70;
     args.optionReadIfPresent("nonOrthThreshold", nonOrthThreshold);
+    nonOrthThreshold = degToRad(nonOrthThreshold);
 
     scalar skewThreshold = 4;
     args.optionReadIfPresent("skewThreshold", skewThreshold);
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
index 860739d621..05ab3ee31d 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
@@ -61,7 +61,6 @@ Usage
 #include "argList.H"
 #include "Time.H"
 #include "fvMesh.H"
-#include "unitConversion.H"
 #include "polyTopoChange.H"
 #include "polyTopoChangeMap.H"
 #include "PackedBoolList.H"
@@ -90,7 +89,7 @@ void simpleMarkFeatures
     labelList& multiCellFeaturePoints
 )
 {
-    scalar minCos = Foam::cos(degToRad(featureAngle));
+    const scalar minCos = Foam::cos(featureAngle);
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
@@ -393,10 +392,10 @@ int main(int argc, char *argv[])
         }
     }
 
-    const scalar featureAngle = args.argRead<scalar>(1);
-    const scalar minCos = Foam::cos(degToRad(featureAngle));
+    const scalar featureAngle = degToRad(args.argRead<scalar>(1));
+    const scalar minCos = Foam::cos(featureAngle);
 
-    Info<< "Feature:" << featureAngle << endl
+    Info<< "Feature:" << radToDeg(featureAngle) << endl
         << "minCos :" << minCos << endl
         << endl;
 
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 6b7132cd3a..b6b235c612 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -75,7 +75,6 @@ See also
 #include "pointSet.H"
 #include "transformField.H"
 #include "transformGeometricField.H"
-#include "unitConversion.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
index 55f34fc5c5..695ad9e3ba 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,13 +120,10 @@ int main(int argc, char *argv[])
             // Read field
             volScalarField field(*iter(), mesh);
 
-            // lookup field from dictionary and convert field
-            label unitNumber;
-            if
-            (
-                foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
-             && unitNumber > 0
-            )
+            // Lookup field from dictionary and convert field
+            const label unitNumber =
+                foamDataToFluentDict.lookupOrDefault<label>(field.name(), 0);
+            if (unitNumber > 0)
             {
                 Info<< "    Converting field " << field.name() << endl;
                 writeFluentField(field, unitNumber, fluentDataFile);
@@ -145,13 +142,10 @@ int main(int argc, char *argv[])
             // Read field
             volVectorField field(*iter(), mesh);
 
-            // lookup field from dictionary and convert field
-            label unitNumber;
-            if
-            (
-                foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
-             && unitNumber > 0
-            )
+            // Lookup field from dictionary and convert field
+            const label unitNumber =
+                foamDataToFluentDict.lookupOrDefault<label>(field.name(), 0);
+            if (unitNumber > 0)
             {
                 Info<< "    Converting field " << field.name() << endl;
                 writeFluentField(field, unitNumber, fluentDataFile);
diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index b2ad7d9323..6171c38582 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,8 +45,7 @@ Usage
     {
         file                "pressureData";
         nHeaderLine         1;          // number of header lines
-        refColumn           0;          // reference column index
-        componentColumns    (1);        // component column indices
+        columns             (0 1);      // column indices
         separator           " ";        // optional (defaults to ",")
         mergeSeparators     no;         // merge multiple separators
         outOfBounds         clamp;      // optional out-of-bounds handling
@@ -162,6 +161,7 @@ int main(int argc, char *argv[])
     Function1s::Table<scalar> pData
     (
         "pressure",
+        {dimTime, dimPressure},
         dict.subDict("pressureData")
     );
 
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
index 2e3bdcd2a2..ef8017177c 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,8 +46,6 @@ void processField
         return;
     }
 
-    const word timeName(mesh.time().name());
-
     IOobjectList fieldObjbjects(objects.lookupClass(VolField<Type>::typeName));
 
     if (fieldObjbjects.lookup(fieldName) != nullptr)
diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
index 11e33d69dd..95529f2576 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
@@ -36,7 +36,6 @@ Description
 #include "Time.H"
 #include "volFields.H"
 #include "CompactListList.H"
-#include "unitConversion.H"
 #include "pairPatchAgglomeration.H"
 #include "labelListIOList.H"
 #include "syncTools.H"
diff --git a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
index 82559c14a6..a0e583ece7 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,6 @@ License
 #include "dictionary.H"
 #include "polyPatch.H"
 #include "wallPolyPatch.H"
-#include "unitConversion.H"
 #include "blockMeshFunctions.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C b/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C
index 15807b4ef0..d0dcf0104e 100644
--- a/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C
+++ b/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,7 +197,8 @@ namespace Foam
         // Either construct features from surface & featureAngle or read set.
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        const scalar includedAngle = dict.lookup<scalar>("includedAngle");
+        const scalar includedAngle =
+            dict.lookup<scalar>("includedAngle", unitDegrees);
 
         autoPtr<surfaceFeatures> set
         (
@@ -451,7 +452,9 @@ namespace Foam
             (
                 closenessDict.lookupOrDefault<scalar>
                 (
-                    "internalAngleTolerance", 80
+                    "internalAngleTolerance",
+                    unitDegrees,
+                    80
                 )
             );
 
@@ -459,7 +462,9 @@ namespace Foam
             (
                 closenessDict.lookupOrDefault<scalar>
                 (
-                    "externalAngleTolerance", 80
+                    "externalAngleTolerance",
+                    unitDegrees,
+                    80
                 )
             );
 
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 9b68ede89b..e43d8d3aae 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -39,7 +39,6 @@ Usage
 #include "indexedOctree.H"
 #include "treeBoundBox.H"
 #include "PackedBoolList.H"
-#include "unitConversion.H"
 #include "searchableSurfaces.H"
 #include "systemDict.H"
 
@@ -114,41 +113,6 @@ void greenRefine
 }
 
 
-//scalar checkEdgeAngle
-//(
-//    const triSurface& surf,
-//    const label edgeIndex,
-//    const label pointIndex,
-//    const scalar& angle
-//)
-//{
-//    const edge& e = surf.edges()[edgeIndex];
-
-//    vector eVec = e.vec(surf.localPoints());
-//    eVec /= mag(eVec) + small;
-
-//    const labelList& pEdges = surf.pointEdges()[pointIndex];
-//
-//    forAll(pEdges, eI)
-//    {
-//        const edge& nearE = surf.edges()[pEdges[eI]];
-
-//        vector nearEVec = nearE.vec(surf.localPoints());
-//        nearEVec /= mag(nearEVec) + small;
-
-//        const scalar dot = eVec & nearEVec;
-//        const scalar minCos = degToRad(angle);
-
-//        if (mag(dot) > minCos)
-//        {
-//            return false;
-//        }
-//    }
-
-//    return true;
-//}
-
-
 void createBoundaryEdgeTrees
 (
     const PtrList<triSurfaceMesh>& surfs,
@@ -429,15 +393,6 @@ int main(int argc, char *argv[])
 
                 if (nearestHit.hit())
                 {
-    //                bool rejectEdge =
-    //                    checkEdgeAngle
-    //                    (
-    //                        surf,
-    //                        nearestHit.index(),
-    //                        pointi,
-    //                        30
-    //                    );
-
                     if (dist2 > Foam::sqr(dist))
                     {
                         nearestHit.setMiss();
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index d2463cc7a4..5eb1d29543 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -60,7 +60,6 @@ See also
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "unitConversion.H"
 #include "MeshedSurfaces.H"
 
 using namespace Foam;
diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinReader/chemkinReader.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinReader/chemkinReader.C
index 7bfdc6a6a1..84aef2ff20 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/chemkinReader/chemkinReader.C
+++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinReader/chemkinReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -724,7 +724,6 @@ void Foam::chemkinReader::addReaction
                 (
                     Afactor*ArrheniusCoeffs[0],
                     ArrheniusCoeffs[1],
-                    ArrheniusCoeffs[2]/RR,
                     FixedList<scalar, 4>(powerSeriesCoeffs)
                 )
             );
diff --git a/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs b/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs
index 0971a221f0..d60ead1e82 100644
--- a/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs
+++ b/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs
@@ -59,6 +59,7 @@ codeRead
     const Function1s::Table<scalar> initialDistribution
     (
         "initialDistribution",
+        {dimLength, dimless},
         dictionary
         (
             "format", "foam",
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index 7ae00515ef..258f3f17f3 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -29,15 +29,6 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::scalar Foam::CLASS::t() const
-{
-    return this->db().time().userTimeValue();
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -50,10 +41,19 @@ CONSTRUCT
 )
 :
     PARENT(p, iF),
-    scalarData_(dict.lookup<scalar>("scalarData")),
+    scalarData_(dict.lookup<scalar>("scalarData", unitAny)),
     data_(dict.lookup<TYPE>("data")),
-    fieldData_("fieldData", dict, p.size()),
-    timeVsData_(Function1<TYPE>::New("timeVsData", dict)),
+    fieldData_("fieldData", iF.dimensions(), dict, p.size()),
+    timeVsData_
+    (
+        Function1<TYPE>::New
+        (
+            "timeVsData",
+            this->db().time().userUnits(),
+            unitAny,
+            dict
+        )
+    ),
     wordData_(dict.lookupOrDefault<word>("wordName", "wordDefault")),
     labelData_(-1),
     boolData_(false)
@@ -61,7 +61,7 @@ CONSTRUCT
     this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 
-    this->refValue() = FIELD("fieldData", dict, p.size());
+    this->refValue() = FIELD("fieldData", iF.dimensions(), dict, p.size());
     FVPATCHF::operator=(this->refValue());
 
     PARENT::evaluate();
@@ -70,7 +70,7 @@ CONSTRUCT
     // Initialise with the value entry if evaluation is not possible
     FVPATCHF::operator=
     (
-        FIELD("value", dict, p.size())
+        FIELD("value", iF.dimensions(), dict, p.size())
     );
     this->refValue() = *this;
     */
@@ -162,7 +162,7 @@ void Foam::CLASS::updateCoeffs()
     (
         data_
       + fieldData_
-      + scalarData_*timeVsData_->value(t())
+      + scalarData_*timeVsData_->value(this->db().time().value())
     );
 
     const scalarField& phip =
@@ -186,7 +186,7 @@ void Foam::CLASS::write
     writeEntry(os, "scalarData", scalarData_);
     writeEntry(os, "data", data_);
     writeEntry(os, "fieldData", fieldData_);
-    writeEntry(os, timeVsData_());
+    writeEntry(os, this->db().time().userUnits(), unitAny, timeVsData_());
     writeEntry(os, "wordData", wordData_);
     writeEntry(os, "value", *this);
 }
diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H
index 0c054adb87..ec04659d72 100644
--- a/etc/codeTemplates/BC/BC.H
+++ b/etc/codeTemplates/BC/BC.H
@@ -118,12 +118,6 @@ class CONSTRUCT
         bool boolData_;
 
 
-    // Private Member Functions
-
-        //- Return current time
-        scalar t() const;
-
-
 public:
 
     //- Runtime type information
diff --git a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C
index ace1ac9270..c2eec61c04 100644
--- a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C
@@ -29,7 +29,6 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "read.H"
-#include "unitConversion.H"
 
 //{{{ begin codeInclude
 ${codeInclude}
diff --git a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C
index 141304d347..8df270bff1 100644
--- a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C
@@ -28,7 +28,6 @@ License
 #include "fieldMapper.H"
 #include "pointFields.H"
 #include "read.H"
-#include "unitConversion.H"
 
 //{{{ begin codeInclude
 ${codeInclude}
diff --git a/etc/codeTemplates/dynamicCode/codedFunction1Template.C b/etc/codeTemplates/dynamicCode/codedFunction1Template.C
index ce22667e5c..7d35a27f3c 100644
--- a/etc/codeTemplates/dynamicCode/codedFunction1Template.C
+++ b/etc/codeTemplates/dynamicCode/codedFunction1Template.C
@@ -69,6 +69,7 @@ Foam::Function1s::${typeName}Function1${TemplateType}::
 ${typeName}Function1${TemplateType}
 (
     const word& entryName,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -130,7 +131,8 @@ Foam::Function1s::${typeName}Function1${TemplateType}::integral
 
 void Foam::Function1s::${typeName}Function1${TemplateType}::write
 (
-    Ostream& os
+    Ostream& os,
+    const unitConversions&
 ) const
 {
     NotImplemented;
diff --git a/etc/codeTemplates/dynamicCode/codedFunction1Template.H b/etc/codeTemplates/dynamicCode/codedFunction1Template.H
index 699897f9f2..93bcbd6102 100644
--- a/etc/codeTemplates/dynamicCode/codedFunction1Template.H
+++ b/etc/codeTemplates/dynamicCode/codedFunction1Template.H
@@ -69,6 +69,7 @@ public:
         ${typeName}Function1${TemplateType}
         (
             const word& entryName,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -110,7 +111,7 @@ public:
         ) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions&) const;
 
 
     // Member Operators
diff --git a/etc/codeTemplates/dynamicCode/codedFunction2Template.C b/etc/codeTemplates/dynamicCode/codedFunction2Template.C
index 93a5a5e6f0..12b4852dcd 100644
--- a/etc/codeTemplates/dynamicCode/codedFunction2Template.C
+++ b/etc/codeTemplates/dynamicCode/codedFunction2Template.C
@@ -69,6 +69,7 @@ Foam::Function2s::${typeName}Function2${TemplateType}::
 ${typeName}Function2${TemplateType}
 (
     const word& entryName,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -118,7 +119,8 @@ Foam::Function2s::${typeName}Function2${TemplateType}::
 
 void Foam::Function2s::${typeName}Function2${TemplateType}::write
 (
-    Ostream& os
+    Ostream& os,
+    const unitConversions&
 ) const
 {
     NotImplemented;
diff --git a/etc/codeTemplates/dynamicCode/codedFunction2Template.H b/etc/codeTemplates/dynamicCode/codedFunction2Template.H
index b27ee93c19..698fafbb74 100644
--- a/etc/codeTemplates/dynamicCode/codedFunction2Template.H
+++ b/etc/codeTemplates/dynamicCode/codedFunction2Template.H
@@ -69,6 +69,7 @@ public:
         ${typeName}Function2${TemplateType}
         (
             const word& entryName,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -107,7 +108,7 @@ public:
         }
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions&) const;
 
 
     // Member Operators
diff --git a/etc/codeTemplates/dynamicCode/codedFunctionObjectTemplate.C b/etc/codeTemplates/dynamicCode/codedFunctionObjectTemplate.C
index 890883da2d..533bae8773 100644
--- a/etc/codeTemplates/dynamicCode/codedFunctionObjectTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFunctionObjectTemplate.C
@@ -26,7 +26,6 @@ License
 #include "codedFunctionObjectTemplate.H"
 #include "volFields.H"
 #include "read.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
index b3fe40636a..3148959bf6 100644
--- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
@@ -28,7 +28,6 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "read.H"
-#include "unitConversion.H"
 #include "fvMatrix.H"
 
 //{{{ begin codeInclude
diff --git a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C
index cc36ed34ab..950ce164f6 100644
--- a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C
@@ -29,7 +29,6 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "read.H"
-#include "unitConversion.H"
 
 //{{{ begin codeInclude
 ${codeInclude}
diff --git a/etc/controlDict b/etc/controlDict
index bc66ae9e1e..2d7b32a962 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -173,7 +173,7 @@ DimensionedConstants
 }
 
 
-DimensionSets
+UnitConversions
 {
     unitSet             SI; // USCS
 
@@ -195,16 +195,7 @@ DimensionSets
         J           [N m]               1;
         W           [J s^-1]            1;
 
-        // Some non-symbolic units
-        area        [m^2]               1;
-        volume      [m^3]               1;
-        density     [kg m^-3]           1;
-        acceleration [m s^-2]           1;
-        kinematicPressure [Pa density^-1] 1;
-
-        // Scaled units. Supported in dimensionedType and
-        // UniformDimensionedField. Not supported in DimensionedField or
-        // GeometricField.
+        // Scaled units
         g           [kg]                1e-3;
         um          [m]                 1e-6;
         mm          [m]                 1e-3;
@@ -212,7 +203,22 @@ DimensionSets
         km          [m]                 1e3;
         us          [s]                 1e-6;
         ms          [s]                 1e-3;
+        min         [s]                 60;
+        hr          [s]                 3600;
         mol         [kmol]              1e-3;
+
+        // Derived scaled units
+        l           [m^3]               1e-3;
+        ml          [m^3]               1e-6;
+        rpm         [rot/min]           1;
+        bar         [Pa]                1e5;
+        atm         [Pa]                101325;
+        kPa         [Pa]                1e3;
+        MPa         [Pa]                1e6;
+        cal         [J]                 4.184;
+        kcal        [J]                 4184;
+        cSt         [m^2/s]             1e-6;
+        cP          [kg/m/s]            1e-3;
     }
 
     USCSCoeffs
diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.H
index a52974ea62..3ec2d1e255 100644
--- a/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.H
+++ b/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ protected:
             //  - 0: no filtering
             //  - 1: (1 - F1)
             //  - 2: (1 - F2)
-            direction FSST_;
+            label FSST_;
 
 
     // Protected Member Functions
diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthDissipationRate/turbulentMixingLengthDissipationRateFvScalarFieldSource.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthDissipationRate/turbulentMixingLengthDissipationRateFvScalarFieldSource.C
index 530c710447..cd8f55a6a6 100644
--- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthDissipationRate/turbulentMixingLengthDissipationRateFvScalarFieldSource.C
+++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthDissipationRate/turbulentMixingLengthDissipationRateFvScalarFieldSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ turbulentMixingLengthDissipationRateFvScalarFieldSource
 )
 :
     fvScalarFieldSource(iF, dict),
-    mixingLength_(dict.lookup<scalar>("mixingLength")),
+    mixingLength_(dict.lookup<scalar>("mixingLength", dimLength)),
     kName_(dict.lookupOrDefault<word>("k", "k"))
 {}
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthFrequency/turbulentMixingLengthFrequencyFvScalarFieldSource.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthFrequency/turbulentMixingLengthFrequencyFvScalarFieldSource.C
index 66f894cc62..7279e7cc18 100644
--- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthFrequency/turbulentMixingLengthFrequencyFvScalarFieldSource.C
+++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvFieldSources/turbulentMixingLengthFrequency/turbulentMixingLengthFrequencyFvScalarFieldSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ turbulentMixingLengthFrequencyFvScalarFieldSource
 )
 :
     fvScalarFieldSource(iF, dict),
-    mixingLength_(dict.lookup<scalar>("mixingLength")),
+    mixingLength_(dict.lookup<scalar>("mixingLength", dimLength)),
     kName_(dict.lookupOrDefault<word>("k", "k"))
 {}
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 78a9a78279..152806075d 100644
--- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,12 +46,15 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
 )
 :
     inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(dict.lookup<scalar>("mixingLength")),
+    mixingLength_(dict.lookup<scalar>("mixingLength", dimLength)),
     kName_(dict.lookupOrDefault<word>("k", "k"))
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    fvPatchScalarField::operator=
+    (
+        scalarField("value", iF.dimensions(), dict, p.size())
+    );
 
     this->refValue() = 0.0;
     this->refGrad() = 0.0;
diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index b0d3e91410..e1d7feb22e 100644
--- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,12 +46,15 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 )
 :
     inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(dict.lookup<scalar>("mixingLength")),
+    mixingLength_(dict.lookup<scalar>("mixingLength", dimLength)),
     kName_(dict.lookupOrDefault<word>("k", "k"))
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    fvPatchScalarField::operator=
+    (
+        scalarField("value", iF.dimensions(), dict, p.size())
+    );
 
     this->refValue() = 0.0;
     this->refGrad() = 0.0;
diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 700a19553d..1b20127ed5 100644
--- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF, dict, false),
-    tau0_(dict.lookupOrDefault<vector>("tau", Zero))
+    tau0_(dict.lookupOrDefault<vector>("tau", sqr(dimVelocity), Zero))
 {
     fvPatchField<vector>::operator=(patchInternalField());
 }
diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index c461055c79..b581cc669c 100644
--- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -50,13 +50,28 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
       ? dict.lookupOrDefault<word>("rho", "rho")
       : word::null
     ),
-    D_(cyclicPatch().owner() ? dict.lookup<scalar>("D") : NaN),
-    I_(cyclicPatch().owner() ? dict.lookup<scalar>("I") : NaN),
-    length_(cyclicPatch().owner() ? dict.lookup<scalar>("length") : NaN),
+    D_
+    (
+        cyclicPatch().owner()
+      ? dict.lookup<scalar>("D", dimless/dimArea)
+      : NaN
+    ),
+    I_
+    (
+        cyclicPatch().owner()
+      ? dict.lookup<scalar>("I", dimless/dimLength)
+      : NaN
+    ),
+    length_
+    (
+        cyclicPatch().owner()
+      ? dict.lookup<scalar>("length", dimLength)
+      : NaN
+    ),
     relaxation_
     (
         cyclicPatch().owner()
-      ? dict.lookupOrDefault<scalar>("relaxation", 1)
+      ? dict.lookupOrDefault<scalar>("relaxation", unitFraction, 1)
       : NaN
     ),
     jump0_(cyclicPatch().owner() ? jump()() : scalarField(p.size()))
diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index 8be1ac93e1..332db9c3af 100644
--- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchField<scalar>(p, iF, dict),
-    Ceps2_(dict.lookupOrDefault<scalar>("Ceps2", 1.9))
+    Ceps2_(dict.lookupOrDefault<scalar>("Ceps2", dimless, 1.9))
 {}
 
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index e296d7b4f0..98115d0fa1 100644
--- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,8 +217,8 @@ nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 )
 :
     nutUWallFunctionFvPatchScalarField(p, iF, dict),
-    Ks_("Ks", dict, p.size()),
-    Cs_("Cs", dict, p.size())
+    Ks_("Ks", dimLength, dict, p.size()),
+    Cs_("Cs", dimless, dict, p.size())
 {}
 
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index c66c1315ec..4bd02936e9 100644
--- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,9 +73,9 @@ Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", dimless, 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", dimless, 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", dimless, 9.8)),
     yPlusLam_(yPlusLam(kappa_, E_))
 {
     checkType();
diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
index a74e0e58d1..8245ed87e1 100644
--- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
+++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,8 +134,8 @@ nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
 )
 :
     nutkWallFunctionFvPatchScalarField(p, iF, dict),
-    Ks_("Ks", dict, p.size()),
-    Cs_("Cs", dict, p.size())
+    Ks_("Ks", dimLength, dict, p.size()),
+    Cs_("Cs", dimless, dict, p.size())
 {}
 
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C
index 337cf2b6d5..65a557a977 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ Maxwell<BasicMomentumTransportModel>::Maxwell
 
     nModes_(modeCoefficients_.size() ? modeCoefficients_.size() : 1),
 
-    nuM_("nuM", dimViscosity, this->coeffDict_.lookup("nuM")),
+    nuM_("nuM", dimKinematicViscosity, this->coeffDict_.lookup("nuM")),
 
     lambdas_(readModeCoefficients("lambda", dimTime)),
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/BirdCarreau/BirdCarreau.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/BirdCarreau/BirdCarreau.C
index 22ab199d2e..c87d9701da 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/BirdCarreau/BirdCarreau.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/BirdCarreau/BirdCarreau.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,9 +57,9 @@ BirdCarreau
 )
 :
     strainRateViscosityModel(viscosityProperties, viscosity, U),
-    nuInf_("nuInf", dimViscosity, 0),
+    nuInf_("nuInf", dimKinematicViscosity, 0),
     k_("k", dimTime, 0),
-    tauStar_( "tauStar", dimViscosity/dimTime, 0),
+    tauStar_( "tauStar", dimKinematicViscosity/dimTime, 0),
     n_("n", dimless, 0),
     a_("a", dimless, 2)
 {
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/Casson/Casson.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/Casson/Casson.C
index c1f4d93adb..78616edd63 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/Casson/Casson.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/Casson/Casson.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,10 @@ Foam::laminarModels::generalisedNewtonianViscosityModels::Casson::Casson
 )
 :
     strainRateViscosityModel(viscosityProperties, viscosity, U),
-    m_("m", dimViscosity, 0),
-    tau0_("tau0", dimViscosity/dimTime, 0),
-    nuMin_("nuMin", dimViscosity, 0),
-    nuMax_("nuMax", dimViscosity, 0)
+    m_("m", dimKinematicViscosity, 0),
+    tau0_("tau0", dimKinematicViscosity/dimTime, 0),
+    nuMin_("nuMin", dimKinematicViscosity, 0),
+    nuMax_("nuMax", dimKinematicViscosity, 0)
 {
     read(viscosityProperties);
     correct();
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/CrossPowerLaw/CrossPowerLaw.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/CrossPowerLaw/CrossPowerLaw.C
index 58d9243102..4823ff490a 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/CrossPowerLaw/CrossPowerLaw.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/CrossPowerLaw/CrossPowerLaw.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,9 +58,9 @@ CrossPowerLaw
 )
 :
     strainRateViscosityModel(viscosityProperties, viscosity, U),
-    nuInf_("nuInf", dimViscosity, 0),
+    nuInf_("nuInf", dimKinematicViscosity, 0),
     m_("m", dimTime, 0),
-    tauStar_( "tauStar", dimViscosity/dimTime, 0),
+    tauStar_( "tauStar", dimKinematicViscosity/dimTime, 0),
     n_("n", dimless, 0)
 {
     read(viscosityProperties);
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/HerschelBulkley/HerschelBulkley.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/HerschelBulkley/HerschelBulkley.C
index dc7c092984..c0511be812 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/HerschelBulkley/HerschelBulkley.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/HerschelBulkley/HerschelBulkley.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,9 +58,9 @@ HerschelBulkley
 )
 :
     strainRateViscosityModel(viscosityProperties, viscosity, U),
-    k_("k", dimViscosity, 0),
+    k_("k", dimKinematicViscosity, 0),
     n_("n", dimless, 0),
-    tau0_("tau0", dimViscosity/dimTime, 0)
+    tau0_("tau0", dimKinematicViscosity/dimTime, 0)
 {
     read(viscosityProperties);
     correct();
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/powerLaw/powerLaw.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/powerLaw/powerLaw.C
index 2a2a888a9e..5a37429151 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/powerLaw/powerLaw.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/powerLaw/powerLaw.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,10 +57,10 @@ Foam::laminarModels::generalisedNewtonianViscosityModels::powerLaw::powerLaw
 )
 :
     strainRateViscosityModel(viscosityProperties, viscosity, U),
-    k_("k", dimViscosity, 0),
+    k_("k", dimKinematicViscosity, 0),
     n_("n", dimless, 0),
-    nuMin_("nuMin", dimViscosity, 0),
-    nuMax_("nuMax", dimViscosity, 0)
+    nuMin_("nuMin", dimKinematicViscosity, 0),
+    nuMax_("nuMax", dimKinematicViscosity, 0)
 {
     read(viscosityProperties);
     correct();
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.C
index cba3618e8d..d49403c1f5 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,6 +63,8 @@ strainRateFunction
         Function1<scalar>::New
         (
             "function",
+            dimless/dimTime,
+            dimKinematicViscosity,
             viscosityProperties.optionalSubDict(typeName + "Coeffs")
         )
     )
@@ -85,6 +87,8 @@ strainRateFunction::read
     strainRateFunction_ = Function1<scalar>::New
     (
         "function",
+        dimless/dimTime,
+        dimKinematicViscosity,
         viscosityProperties.optionalSubDict
         (
             typeName + "Coeffs"
@@ -109,7 +113,7 @@ nu
         (
             IOobject::groupName(typedName("nu"), nu0.group()),
             nu0.mesh(),
-            dimensionedScalar(dimViscosity, 0)
+            dimensionedScalar(dimKinematicViscosity, 0)
         )
     );
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.C
index 0929f25336..fc68038e67 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ strainRateViscosityModel::strainRateViscosityModel
             IOobject::AUTO_WRITE
         ),
         U.mesh(),
-        dimensionedScalar(dimViscosity, 0)
+        dimensionedScalar(dimKinematicViscosity, 0)
     )
 {}
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C b/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C
index d1a14ab3f4..7f8870d1fe 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C
@@ -65,8 +65,8 @@ lambdaThixotropic<BasicMomentumTransportModel>::lambdaThixotropic
     b_("b", dimless, this->coeffDict_),
     d_("d", dimless, this->coeffDict_),
     c_("c", pow(dimTime, d_.value() - scalar(1)), this->coeffDict_),
-    nu0_("nu0", dimViscosity, this->coeffDict_),
-    nuInf_("nuInf", dimViscosity, this->coeffDict_),
+    nu0_("nu0", dimKinematicViscosity, this->coeffDict_),
+    nuInf_("nuInf", dimKinematicViscosity, this->coeffDict_),
     K_(1 - sqrt(nuInf_/nu0_)),
     BinghamPlastic_(this->coeffDict_.found("sigmay")),
     sigmay_
diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C b/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C
index 5727ac6c2a..2d08bd709d 100644
--- a/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C
+++ b/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,7 @@ Foam::laminarModel<BasicMomentumTransportModel>::nut() const
     (
         this->groupName("nut"),
         this->mesh_,
-        dimensionedScalar(dimViscosity, 0)
+        dimensionedScalar(dimKinematicViscosity, 0)
     );
 }
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 4651484408..fea356ac82 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -92,6 +92,7 @@ primitives/triad/triad.C
 primitives/omega/omega.C
 
 # Run-time selectable functions
+primitives/functions/Function1/Function1/Function1UnitConversions.C
 primitives/functions/Function1/makeFunction1s.C
 primitives/functions/Function1/reverseRamp/reverseRamp.C
 primitives/functions/Function1/linearRamp/linearRamp.C
@@ -106,6 +107,7 @@ primitives/functions/Function1/Table/TableReader/makeTableReaders.C
 primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.C
 primitives/functions/Function1/omega1/omega1.C
 
+primitives/functions/Function2/Function2/Function2UnitConversions.C
 primitives/functions/Function2/makeFunction2s.C
 
 primitives/subModelBase/subModelBase.C
@@ -303,9 +305,15 @@ $(userTime)/userTime/userTimeNew.C
 $(userTime)/realTime/realTime.C
 $(userTime)/engineTime/engineTime.C
 
+symbols/symbols.C
 dimensionSet/dimensionSet.C
 dimensionSet/dimensionSetIO.C
 dimensionSet/dimensionSets.C
+unitConversion/unitConversion.C
+unitConversion/unitConversionIO.C
+unitConversion/unitConversions.C
+unitConversion/namedUnitConversion.C
+unitConversion/namedUnitConversionIO.C
 dimensionedTypes/dimensionedScalar/dimensionedScalar.C
 dimensionedTypes/dimensionedSphericalTensor/dimensionedSphericalTensor.C
 dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 49612e8c67..a2f92f166a 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -118,8 +118,7 @@ void Foam::Time::setControls()
 
     if (startFrom == "startTime")
     {
-        controlDict_.lookup("startTime") >> startTime_;
-        startTime_ = userTimeToTime(startTime_);
+        startTime_ = controlDict_.lookup<scalar>("startTime", userUnits());
     }
     else
     {
@@ -242,11 +241,11 @@ void Foam::Time::setControls()
 
     if (controlDict_.found("beginTime"))
     {
-        beginTime_ = userTimeToTime(controlDict_.lookup<scalar>("beginTime"));
+        beginTime_ = controlDict_.lookup<scalar>("beginTime", userUnits());
     }
     else if (timeDict.found("beginTime"))
     {
-        beginTime_ = userTimeToTime(timeDict.lookup<scalar>("beginTime"));
+        beginTime_ = timeDict.lookup<scalar>("beginTime", userUnits());
     }
     else
     {
@@ -259,7 +258,7 @@ void Foam::Time::setControls()
     {
         if (timeDict.found("deltaT"))
         {
-            deltaT_ = userTimeToTime(timeDict.lookup<scalar>("deltaT"));
+            deltaT_ = timeDict.lookup<scalar>("deltaT", userUnits());
             deltaTSave_ = deltaT_;
             deltaT0_ = deltaT_;
         }
@@ -267,7 +266,7 @@ void Foam::Time::setControls()
 
     if (timeDict.found("deltaT0"))
     {
-        deltaT0_ = userTimeToTime(timeDict.lookup<scalar>("deltaT0"));
+        deltaT0_ = timeDict.lookup<scalar>("deltaT0", userUnits());
     }
 
     if (timeDict.readIfPresent("index", startTimeIndex_))
@@ -414,7 +413,8 @@ Foam::Time::Time
                 "OptimisationSwitches",
                 "DebugSwitches",
                 "DimensionedConstants",
-                "DimensionSets"
+                "DimensionSets",
+                "UnitConversions"
             }
         );
 
@@ -680,6 +680,7 @@ Foam::word Foam::Time::findInstance
             stopInstance
         )
     );
+
     return io.instance();
 }
 
@@ -860,11 +861,37 @@ Foam::word Foam::Time::userTimeName() const
     }
     else
     {
-        return timeName(userTimeValue()) + userTime_->unit();
+        return timeName(userTimeValue()) + userTime_->unitName();
     }
 }
 
 
+const Foam::unitConversion& Foam::Time::userUnits() const
+{
+    return userTime_->units();
+}
+
+
+const Foam::unitConversion& Foam::Time::writeIntervalUnits() const
+{
+    static const unitConversion unitSeconds(dimTime);
+
+    switch (writeControl_)
+    {
+        case writeControl::timeStep:
+            return unitless;
+        case writeControl::runTime:
+        case writeControl::adjustableRunTime:
+            return userUnits();
+        case writeControl::cpuTime:
+        case writeControl::clockTime:
+            return unitSeconds;
+    }
+
+    return unitNone;
+}
+
+
 bool Foam::Time::running() const
 {
     return value() < (endTime_ - 0.5*deltaT_);
@@ -986,12 +1013,12 @@ void Foam::Time::setTime(const instant& inst, const label newIndex)
 
     if (timeDict.found("deltaT"))
     {
-        deltaT_ = userTimeToTime(timeDict.lookup<scalar>("deltaT"));
+        deltaT_ = timeDict.lookup<scalar>("deltaT", userUnits());
     }
 
     if (timeDict.found("deltaT0"))
     {
-        deltaT0_ = userTimeToTime(timeDict.lookup<scalar>("deltaT0"));
+        deltaT0_ = timeDict.lookup<scalar>("deltaT0", userUnits());
     }
 
     timeDict.readIfPresent("index", timeIndex_);
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index e60af99013..69987b7a75 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -423,6 +423,12 @@ public:
             //- Return current user time name with units
             word userTimeName() const;
 
+            //- Return the user-time unit conversion
+            const unitConversion& userUnits() const;
+
+            //- Return the write interval units
+            const unitConversion& writeIntervalUnits() const;
+
             //- Return the list of function objects
             const functionObjectList& functionObjects() const
             {
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index a7e4c494bd..a277cc034e 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -40,7 +40,7 @@ void Foam::Time::readDict()
 
     if (!deltaTchanged_)
     {
-        deltaT_ = userTimeToTime(controlDict_.lookup<scalar>("deltaT"));
+        deltaT_ = controlDict_.lookup<scalar>("deltaT", userUnits());
     }
 
     if (controlDict_.found("writeControl"))
@@ -51,33 +51,22 @@ void Foam::Time::readDict()
         );
     }
 
-    scalar newWriteInterval = writeInterval_;
-
-    if (controlDict_.readIfPresent("writeInterval", newWriteInterval))
-    {
-        if
+    const scalar newWriteInterval =
+        controlDict_.lookupBackwardsCompatible<scalar>
         (
-            writeControl_ == writeControl::runTime
-         || writeControl_ == writeControl::adjustableRunTime
-        )
-        {
-            newWriteInterval = userTimeToTime(newWriteInterval);
-        }
+            {"writeInterval", "writeFrequency"},
+            writeIntervalUnits()
+        );
 
-        if
-        (
-            writeControl_ == writeControl::timeStep
-         && label(newWriteInterval) < 1
-        )
-        {
-            FatalIOErrorInFunction(controlDict_)
-                << "writeInterval < 1 for writeControl timeStep"
-                << exit(FatalIOError);
-        }
-    }
-    else
+    if
+    (
+        writeControl_ == writeControl::timeStep
+     && label(newWriteInterval) < 1
+    )
     {
-        controlDict_.lookup("writeFrequency") >> newWriteInterval;
+        FatalIOErrorInFunction(controlDict_)
+            << "writeInterval < 1 for writeControl timeStep"
+            << exit(FatalIOError);
     }
 
     setWriteInterval(newWriteInterval);
diff --git a/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.C b/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.C
index 174f708b88..cffe95c60b 100644
--- a/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.C
+++ b/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.C
@@ -46,7 +46,7 @@ Foam::userTimes::engine::engine(const dictionary& controlDict)
     userTime(controlDict),
     omega_(dict(controlDict))
 {
-    addUnit(dimensionedScalar(unit(), dimTime, userTimeToTime(1)));
+    addUnits(unitName(), unitConversion(dimTime, 0, 0, userTimeToTime(1)));
 }
 
 
@@ -73,16 +73,22 @@ Foam::scalar Foam::userTimes::engine::timeToUserTime(const scalar t) const
 }
 
 
-Foam::word Foam::userTimes::engine::unit() const
+Foam::word Foam::userTimes::engine::unitName() const
 {
     return "CAD";
 }
 
 
+const Foam::unitConversion& Foam::userTimes::engine::units() const
+{
+    return Foam::units()[unitName()];
+}
+
+
 bool Foam::userTimes::engine::read(const dictionary& controlDict)
 {
     omega_ = omega(dict(controlDict));
-    addUnit(dimensionedScalar(unit(), dimTime, userTimeToTime(1)));
+    addUnits(unitName(), unitConversion(dimTime, 0, 0, userTimeToTime(1)));
     return true;
 }
 
diff --git a/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.H b/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.H
index abede8b63f..44f634095b 100644
--- a/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.H
+++ b/src/OpenFOAM/db/Time/userTime/engineTime/engineTime.H
@@ -83,8 +83,11 @@ public:
         //- Return the time t in crank-angle
         virtual scalar timeToUserTime(const scalar t) const;
 
-        //- Return real-time unit (s)
-        virtual word unit() const;
+        //- Return engine-time unit name (CAD)
+        virtual word unitName() const;
+
+        //- Return the engine-time unit conversion
+        virtual const unitConversion& units() const;
 
         //- Read the controlDict and set all the parameters
         virtual bool read(const dictionary& controlDict);
diff --git a/src/OpenFOAM/db/Time/userTime/realTime/realTime.C b/src/OpenFOAM/db/Time/userTime/realTime/realTime.C
index bc2c5291ef..56f5fe9236 100644
--- a/src/OpenFOAM/db/Time/userTime/realTime/realTime.C
+++ b/src/OpenFOAM/db/Time/userTime/realTime/realTime.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,12 +66,19 @@ Foam::scalar Foam::userTimes::real::timeToUserTime(const scalar t) const
 }
 
 
-Foam::word Foam::userTimes::real::unit() const
+Foam::word Foam::userTimes::real::unitName() const
 {
     return "s";
 }
 
 
+const Foam::unitConversion& Foam::userTimes::real::units() const
+{
+    static const unitConversion unitSeconds(dimTime, 0, 0, 1);
+    return unitSeconds;
+}
+
+
 bool Foam::userTimes::real::read(const dictionary& controlDict)
 {
     return true;
diff --git a/src/OpenFOAM/db/Time/userTime/realTime/realTime.H b/src/OpenFOAM/db/Time/userTime/realTime/realTime.H
index c36a523245..a009d4bd6a 100644
--- a/src/OpenFOAM/db/Time/userTime/realTime/realTime.H
+++ b/src/OpenFOAM/db/Time/userTime/realTime/realTime.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,7 @@ SourceFiles
 #define realTime_H
 
 #include "userTime.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,7 +53,6 @@ class real
 :
     public userTime
 {
-
 public:
 
     //- Runtime type information
@@ -77,8 +77,11 @@ public:
         //- Return t (s)
         virtual scalar timeToUserTime(const scalar t) const;
 
-        //- Return real-time unit (s)
-        virtual word unit() const;
+        //- Return real-time unit name (s)
+        virtual word unitName() const;
+
+        //- Return the real-time unit conversion
+        virtual const unitConversion& units() const;
 
         //- Read the controlDict and set all the parameters
         virtual bool read(const dictionary& controlDict);
diff --git a/src/OpenFOAM/db/Time/userTime/userTime/userTime.H b/src/OpenFOAM/db/Time/userTime/userTime/userTime.H
index ddc91869b6..e4be2e54b1 100644
--- a/src/OpenFOAM/db/Time/userTime/userTime/userTime.H
+++ b/src/OpenFOAM/db/Time/userTime/userTime/userTime.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,10 @@ public:
         virtual scalar timeToUserTime(const scalar t) const = 0;
 
         //- Return user-time unit
-        virtual word unit() const = 0;
+        virtual word unitName() const = 0;
+
+        //- Return the user-time unit conversion
+        virtual const unitConversion& units() const = 0;
 
         //- Read the controlDict and set all the parameters
         virtual bool read(const dictionary& controlDict) = 0;
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 200d2d91f7..9bf177f2d8 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -27,6 +27,7 @@ License
 #include "dictionaryEntry.H"
 #include "regExp.H"
 #include "OSHA1stream.H"
+#include "unitConversion.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
@@ -237,6 +238,83 @@ bool Foam::dictionary::findInPatterns
 }
 
 
+void Foam::dictionary::assertNoConvertUnits
+(
+    const char* typeName,
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    ITstream& is
+) const
+{
+    if (!defaultUnits.standard())
+    {
+        FatalIOErrorInFunction(is)
+            << "Unit conversions are not supported when reading "
+            << typeName << " types" << abort(FatalError);
+    }
+}
+
+
+template<class T>
+T Foam::dictionary::readTypeAndConvertUnits
+(
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    ITstream& is
+) const
+{
+    // Read the units if they are before the value
+    unitConversion units(defaultUnits);
+    const bool haveUnits = units.readIfPresent(keyword, *this, is);
+
+    // Read the value
+    T value = pTraits<T>(is);
+
+    // Read the units if they are after the value
+    if (!haveUnits && !is.eof())
+    {
+        units.readIfPresent(keyword, *this, is);
+    }
+
+    // Modify the value by the unit conversion
+    units.makeStandard(value);
+
+    return value;
+}
+
+
+#define IMPLEMENT_SPECIALISED_READ_TYPE(T, nullArg)                            \
+                                                                               \
+    template<>                                                                 \
+    Foam::T Foam::dictionary::readType                                         \
+    (                                                                          \
+        const word& keyword,                                                   \
+        const unitConversion& defaultUnits,                                    \
+        ITstream& is                                                           \
+    ) const                                                                    \
+    {                                                                          \
+        return readTypeAndConvertUnits<T>(keyword, defaultUnits, is);          \
+    }                                                                          \
+                                                                               \
+    template<>                                                                 \
+    Foam::T Foam::dictionary::readType                                         \
+    (                                                                          \
+        const word& keyword,                                                   \
+        ITstream& is                                                           \
+    ) const                                                                    \
+    {                                                                          \
+        return readTypeAndConvertUnits<T>(keyword, unitAny, is);               \
+    }
+
+#define IMPLEMENT_SPECIALISED_READ_LIST_TYPE(T, nullArg)                       \
+    IMPLEMENT_SPECIALISED_READ_TYPE(List<Foam::T>, nullArg)
+
+FOR_ALL_FIELD_TYPES(IMPLEMENT_SPECIALISED_READ_TYPE)
+FOR_ALL_FIELD_TYPES(IMPLEMENT_SPECIALISED_READ_LIST_TYPE)
+
+#undef IMPLEMENT_SPECIALISED_READ_TYPE
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::dictionary::dictionary()
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index c866b11cb7..7cd6656180 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -58,6 +58,7 @@ SourceFiles
 #include "wordReList.H"
 #include "Pair.H"
 #include "className.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,9 +66,10 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-class regExp;
 class dictionary;
+class regExp;
 class SHA1Digest;
+class unitConversion;
 
 Istream& operator>>(Istream&, dictionary&);
 Ostream& operator<<(Ostream&, const dictionary&);
@@ -174,7 +176,7 @@ class dictionary
         DLList<autoPtr<regExp>> patternRegexps_;
 
 
-   // Private Member Functions
+    // Private Member Functions
 
         //- Find and return an entry data stream pointer if present
         //  otherwise return nullptr.
@@ -204,6 +206,37 @@ class dictionary
             DLList<autoPtr<regExp>>::iterator& reLink
         );
 
+        //- Check that no unit conversions are being performed
+        void assertNoConvertUnits
+        (
+            const char* typeName,
+            const word& keyword,
+            const unitConversion& defaultUnits,
+            ITstream& is
+        ) const;
+
+        //- Read a value, check its dimensions and convert its units
+        template<class T>
+        T readTypeAndConvertUnits
+        (
+            const word& keyword,
+            const unitConversion& defaultUnits,
+            ITstream& is
+        ) const;
+
+        //- Read a value from the token stream
+        template<class T>
+        T readType
+        (
+            const word& keyword,
+            const unitConversion& defaultUnits,
+            ITstream& is
+        ) const;
+
+        //- Read a value from the token stream
+        template<class T>
+        T readType(const word& keyword, ITstream& is) const;
+
 
     // Private Classes
 
@@ -420,8 +453,7 @@ public:
                 bool patternMatch=true
             ) const;
 
-            //- Find and return a T,
-            //  if not found throw a fatal error.
+            //- Find and return a T, if not found throw a fatal error.
             //  If recursive, search parent dictionaries.
             //  If patternMatch, use regular expressions.
             template<class T>
@@ -432,8 +464,22 @@ public:
                 bool patternMatch=true
             ) const;
 
-            //- Find and return a T, trying a list of keywords in sequence
-            //  if not found throw a fatal error relating to the first keyword
+            //- Find and return a T, with dimension checking and unit
+            //  conversions, and if not found throw a fatal error.
+            //  If recursive, search parent dictionaries.
+            //  If patternMatch, use regular expressions.
+            template<class T>
+            T lookup
+            (
+                const word&,
+                const unitConversion&,
+                bool recursive=false,
+                bool patternMatch=true
+            ) const;
+
+            //- Find and return a T, trying a list of keywords in sequence,
+            //  and if not found throw a fatal error relating to the first
+            //  (preferred) keyword.
             //  If recursive, search parent dictionaries.
             //  If patternMatch, use regular expressions.
             template<class T>
@@ -444,8 +490,23 @@ public:
                 bool patternMatch=true
             ) const;
 
-            //- Find and return a T,
-            //  if not found return the given default value.
+            //- Find and return a T, with dimension checking and unit
+            //  conversions, trying a list of keywords in sequence, and if not
+            //  found throw a fatal error relating to the first (preferred)
+            //  keyword.
+            //  If recursive, search parent dictionaries.
+            //  If patternMatch, use regular expressions.
+            template<class T>
+            T lookupBackwardsCompatible
+            (
+                const wordList&,
+                const unitConversion&,
+                bool recursive=false,
+                bool patternMatch=true
+            ) const;
+
+            //- Find and return a T, if not found return the given default
+            //  value.
             //  If recursive, search parent dictionaries.
             //  If patternMatch, use regular expressions.
             template<class T>
@@ -457,8 +518,23 @@ public:
                 bool patternMatch=true
             ) const;
 
-            //- Find and return a T, trying a list of keywords in sequence
-            //  if not found throw a fatal error relating to the first keyword
+            //- Find and return a T with dimension checking and unit
+            //  conversions, and if not found return the given default value.
+            //  If recursive, search parent dictionaries.
+            //  If patternMatch, use regular expressions.
+            template<class T>
+            T lookupOrDefault
+            (
+                const word&,
+                const unitConversion&,
+                const T&,
+                bool recursive=false,
+                bool patternMatch=true
+            ) const;
+
+            //- Find and return a T, trying a list of keywords in sequence,
+            //  and if not found throw a fatal error relating to the first
+            //  (preferred) keyword
             //  If recursive, search parent dictionaries.
             //  If patternMatch, use regular expressions.
             template<class T>
@@ -470,6 +546,22 @@ public:
                 bool patternMatch=true
             ) const;
 
+            //- Find and return a T, with dimension checking and unit
+            //  conversions, trying a list of keywords in sequence, and if not
+            //  found throw a fatal error relating to the first (preferred)
+            //  keyword
+            //  If recursive, search parent dictionaries.
+            //  If patternMatch, use regular expressions.
+            template<class T>
+            T lookupOrDefaultBackwardsCompatible
+            (
+                const wordList&,
+                const unitConversion&,
+                const T&,
+                bool recursive=false,
+                bool patternMatch=true
+            ) const;
+
             //- Find and return a T, if not found return the given
             //  default value, and add to dictionary.
             //  If recursive, search parent dictionaries.
@@ -483,7 +575,7 @@ public:
                 bool patternMatch=true
             );
 
-            //- Find an entry if present, and assign to T
+            //- Find an entry if present, and assign to T.
             //  Returns true if the entry was found.
             //  If recursive, search parent dictionaries.
             //  If patternMatch, use regular expressions.
@@ -496,6 +588,21 @@ public:
                 bool patternMatch=true
             ) const;
 
+            //- Find an entry if present, and assign to T, with dimension
+            //  checking and unit conversions.
+            //  Returns true if the entry was found.
+            //  If recursive, search parent dictionaries.
+            //  If patternMatch, use regular expressions.
+            template<class T>
+            bool readIfPresent
+            (
+                const word&,
+                const unitConversion&,
+                T&,
+                bool recursive=false,
+                bool patternMatch=true
+            ) const;
+
             //- Find and return an entry data stream pointer if present,
             //  otherwise return nullptr.
             //  If recursive, search parent dictionaries.
@@ -768,6 +875,36 @@ public:
 };
 
 
+// Template Specialisations
+
+//- Specialise readType for types for which unit conversions can be performed
+#define DECLARE_SPECIALISED_READ_TYPE(T, nullArg)                              \
+                                                                               \
+    template<>                                                                 \
+    T Foam::dictionary::readType                                               \
+    (                                                                          \
+        const word& keyword,                                                   \
+        const unitConversion& defaultUnits,                                    \
+        ITstream& is                                                           \
+    ) const;                                                                   \
+                                                                               \
+    template<>                                                                 \
+    T Foam::dictionary::readType                                               \
+    (                                                                          \
+        const word& keyword,                                                   \
+        ITstream& is                                                           \
+    ) const;
+
+#define DECLARE_SPECIALISED_READ_LIST_TYPE(T, nullArg)                         \
+    DECLARE_SPECIALISED_READ_TYPE(List<T>, nullArg)
+
+FOR_ALL_FIELD_TYPES(DECLARE_SPECIALISED_READ_TYPE);
+FOR_ALL_FIELD_TYPES(DECLARE_SPECIALISED_READ_LIST_TYPE);
+
+#undef DECLARE_SPECIALISED_READ_TYPE
+#undef DECLARE_SPECIALISED_READ_FIELD_TYPE
+
+
 // Global Operators
 
 //- Combine dictionaries.
@@ -888,6 +1025,16 @@ void writeEntry(Ostream& os, const dictionary& dict);
 template<class EntryType>
 void writeEntry(Ostream& os, const word& entryName, const EntryType& value);
 
+//- Helper function to write the keyword and entry
+template<class EntryType>
+void writeEntry
+(
+    Ostream& os,
+    const word& entryName,
+    const unitConversion& defaultUnits,
+    const EntryType& value
+);
+
 //- Helper function to write the keyword and entry only if the
 //  values are not equal. The value is then output as value2
 template<class EntryType>
@@ -899,6 +1046,18 @@ void writeEntryIfDifferent
     const EntryType& value2
 );
 
+//- Helper function to write the keyword and entry only if the
+//  values are not equal. The value is then output as value2
+template<class EntryType>
+void writeEntryIfDifferent
+(
+    Ostream& os,
+    const word& entryName,
+    const unitConversion& defaultUnits,
+    const EntryType& value1,
+    const EntryType& value2
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
index b46be240da..76b1498bd3 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
@@ -26,6 +26,29 @@ License
 #include "dictionary.H"
 #include "primitiveEntry.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class T>
+T Foam::dictionary::readType
+(
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    ITstream& is
+) const
+{
+    assertNoConvertUnits(pTraits<T>::typeName, keyword, defaultUnits, is);
+
+    return pTraits<T>(is);
+}
+
+
+template<class T>
+T Foam::dictionary::readType(const word& keyword, ITstream& is) const
+{
+    return pTraits<T>(is);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T, class ... KeysAndTs>
@@ -72,15 +95,34 @@ T Foam::dictionary::lookup
 
     if (entryPtr == nullptr)
     {
-        FatalIOErrorInFunction
-        (
-            *this
-        )   << "keyword " << keyword << " is undefined in dictionary "
-            << name()
-            << exit(FatalIOError);
+        FatalIOErrorInFunction(*this)
+            << "keyword " << keyword << " is undefined in dictionary "
+            << name() << exit(FatalIOError);
     }
 
-    return pTraits<T>(entryPtr->stream());
+    return readType<T>(keyword, entryPtr->stream());
+}
+
+
+template<class T>
+T Foam::dictionary::lookup
+(
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    bool recursive,
+    bool patternMatch
+) const
+{
+    const entry* entryPtr = lookupEntryPtr(keyword, recursive, patternMatch);
+
+    if (entryPtr == nullptr)
+    {
+        FatalIOErrorInFunction(*this)
+            << "keyword " << keyword << " is undefined in dictionary "
+            << name() << exit(FatalIOError);
+    }
+
+    return readType<T>(keyword, defaultUnits, entryPtr->stream());
 }
 
 
@@ -97,7 +139,32 @@ T Foam::dictionary::lookupBackwardsCompatible
 
     if (entryPtr)
     {
-        return pTraits<T>(entryPtr->stream());
+        return readType<T>(entryPtr->keyword(), entryPtr->stream());
+    }
+    else
+    {
+        // Generate error message using the first keyword
+        return lookup<T>(keywords[0], recursive, patternMatch);
+    }
+}
+
+
+template<class T>
+T Foam::dictionary::lookupBackwardsCompatible
+(
+    const wordList& keywords,
+    const unitConversion& defaultUnits,
+    bool recursive,
+    bool patternMatch
+) const
+{
+    const entry* entryPtr =
+        lookupEntryPtrBackwardsCompatible(keywords, recursive, patternMatch);
+
+    if (entryPtr)
+    {
+        return
+            readType<T>(entryPtr->keyword(), defaultUnits, entryPtr->stream());
     }
     else
     {
@@ -120,7 +187,38 @@ T Foam::dictionary::lookupOrDefault
 
     if (entryPtr)
     {
-        return pTraits<T>(entryPtr->stream());
+        return readType<T>(keyword, entryPtr->stream());
+    }
+    else
+    {
+        if (writeOptionalEntries)
+        {
+            IOInfoInFunction(*this)
+                << "Optional entry '" << keyword << "' is not present,"
+                << " returning the default value '" << deflt << "'"
+                << endl;
+        }
+
+        return deflt;
+    }
+}
+
+
+template<class T>
+T Foam::dictionary::lookupOrDefault
+(
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    const T& deflt,
+    bool recursive,
+    bool patternMatch
+) const
+{
+    const entry* entryPtr = lookupEntryPtr(keyword, recursive, patternMatch);
+
+    if (entryPtr)
+    {
+        return readType<T>(keyword, defaultUnits, entryPtr->stream());
     }
     else
     {
@@ -151,7 +249,33 @@ T Foam::dictionary::lookupOrDefaultBackwardsCompatible
 
     if (entryPtr)
     {
-        return pTraits<T>(entryPtr->stream());
+        return readType<T>(entryPtr->keyword(), entryPtr->stream());
+    }
+    else
+    {
+        // Generate debugging messages using the first keyword
+        return lookupOrDefault<T>(keywords[0], deflt, recursive, patternMatch);
+    }
+}
+
+
+template<class T>
+T Foam::dictionary::lookupOrDefaultBackwardsCompatible
+(
+    const wordList& keywords,
+    const unitConversion& defaultUnits,
+    const T& deflt,
+    bool recursive,
+    bool patternMatch
+) const
+{
+    const entry* entryPtr =
+        lookupEntryPtrBackwardsCompatible(keywords, recursive, patternMatch);
+
+    if (entryPtr)
+    {
+        return
+            readType<T>(entryPtr->keyword(), defaultUnits, entryPtr->stream());
     }
     else
     {
@@ -174,7 +298,7 @@ T Foam::dictionary::lookupOrAddDefault
 
     if (entryPtr)
     {
-        return pTraits<T>(entryPtr->stream());
+        return readType<T>(keyword, entryPtr->stream());
     }
     else
     {
@@ -205,7 +329,39 @@ bool Foam::dictionary::readIfPresent
 
     if (entryPtr)
     {
-        entryPtr->stream() >> val;
+        val = readType<T>(keyword, entryPtr->stream());
+        return true;
+    }
+    else
+    {
+        if (writeOptionalEntries)
+        {
+            IOInfoInFunction(*this)
+                << "Optional entry '" << keyword << "' is not present,"
+                << " the default value '" << val << "' will be used."
+                << endl;
+        }
+
+        return false;
+    }
+}
+
+
+template<class T>
+bool Foam::dictionary::readIfPresent
+(
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    T& val,
+    bool recursive,
+    bool patternMatch
+) const
+{
+    const entry* entryPtr = lookupEntryPtr(keyword, recursive, patternMatch);
+
+    if (entryPtr)
+    {
+        val = readType<T>(keyword, defaultUnits, entryPtr->stream());
         return true;
     }
     else
@@ -236,12 +392,9 @@ T Foam::dictionary::lookupScoped
 
     if (entryPtr == nullptr)
     {
-        FatalIOErrorInFunction
-        (
-            *this
-        )   << "keyword " << keyword << " is undefined in dictionary "
-            << name()
-            << exit(FatalIOError);
+        FatalIOErrorInFunction(*this)
+            << "keyword " << keyword << " is undefined in dictionary "
+            << name() << exit(FatalIOError);
     }
 
     return pTraits<T>(entryPtr->stream());
@@ -318,6 +471,21 @@ void Foam::writeEntry
 }
 
 
+template<class EntryType>
+void Foam::writeEntry
+(
+    Ostream& os,
+    const word& entryName,
+    const unitConversion& defaultUnits,
+    const EntryType& value
+)
+{
+    writeKeyword(os, entryName);
+    writeEntry(os, defaultUnits, value);
+    os << token::END_STATEMENT << endl;
+}
+
+
 template<class EntryType>
 void Foam::writeEntryIfDifferent
 (
@@ -334,4 +502,21 @@ void Foam::writeEntryIfDifferent
 }
 
 
+template<class EntryType>
+void Foam::writeEntryIfDifferent
+(
+    Ostream& os,
+    const word& entryName,
+    const unitConversion& defaultUnits,
+    const EntryType& value1,
+    const EntryType& value2
+)
+{
+    if (value1 != value2)
+    {
+        writeEntry(os, entryName, defaultUnits, value2);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
index d6cf8f3893..f9f16ad82d 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ void Foam::timeControl::read(const dictionary& dict)
         case timeControls::cpuTime:
         case timeControls::adjustableRunTime:
         {
-            interval_ = time_.userTimeToTime(dict.lookup<scalar>(intervalName));
+            interval_ = dict.lookup<scalar>(intervalName, time_.userUnits());
 
             if (timeControl_ == timeControls::adjustableRunTime)
             {
@@ -150,15 +150,17 @@ void Foam::timeControl::read(const dictionary& dict)
             const word frequenciesName(prefix_ + "Frequencies");
             const bool repeat = dict.lookupOrDefault("writeRepeat", false);
 
-            timeDelta_ = dict.lookupOrDefault
-            (
-                "timeDelta",
-                1e-3*time_.deltaTValue()
-            );
+            timeDelta_ =
+                dict.lookupOrDefault
+                (
+                    "timeDelta",
+                    unitNone,
+                    1e-3*time_.userDeltaTValue()
+                );
 
             if (dict.found(timesName))
             {
-                times_ = dict.lookup<scalarList>(timesName);
+                times_ = dict.lookup<scalarList>(timesName, unitNone);
             }
             else if (dict.found(frequenciesName))
             {
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
index b67da8611a..6d86f3c3ab 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
@@ -44,17 +44,8 @@ namespace functionObjects
 
 void Foam::functionObjects::timeControl::readControls(const dictionary& dict)
 {
-    if (!dict.readIfPresent("startTime", startTime_))
-    {
-        dict.readIfPresent("timeStart", startTime_);
-    }
-    startTime_ = time_.userTimeToTime(startTime_);
-
-    if (!dict.readIfPresent("endTime", endTime_))
-    {
-        dict.readIfPresent("timeEnd", endTime_);
-    }
-    endTime_ = time_.userTimeToTime(endTime_);
+    dict.readIfPresent("startTime", time().userUnits(), startTime_);
+    dict.readIfPresent("endTime", time().userUnits(), endTime_);
 }
 
 
@@ -83,10 +74,9 @@ Foam::functionObjects::timeControl::timeControl
     writeControl_(t, dict, "write"),
     foPtr_(functionObject::New(name, t, dict))
 {
+    readControls(dict);
     writeControl_.read(dict);
     executeControl_.read(dict);
-
-    readControls(dict);
 }
 
 
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.C b/src/OpenFOAM/dimensionSet/dimensionSet.C
index d21551a141..87b26ded14 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.C
@@ -32,6 +32,27 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(dimensionSet, 1);
+
+    template<>
+    const char* NamedEnum<dimensionSet::dimensionType, 7>::names[] =
+    {
+        "mass",
+        "length",
+        "time",
+        "temperature",
+        "moles",
+        "current",
+        "luminousIntensity"
+    };
+}
+
+
+const Foam::NamedEnum<Foam::dimensionSet::dimensionType, 7>
+    Foam::dimensionSet::dimensionTypeNames_;
+
+
+namespace Foam
+{
     const scalar dimensionSet::smallExponent = rootSmall;
 }
 
@@ -170,7 +191,7 @@ bool Foam::dimensionSet::operator=(const dimensionSet& ds) const
     {
         FatalErrorInFunction
             << "Different dimensions for =" << endl
-            << "     dimensions : " << *this << " = " << ds << endl
+            << "     dimensions : " << info() << " = " << ds.info() << endl
             << abort(FatalError);
     }
 
@@ -184,7 +205,7 @@ bool Foam::dimensionSet::operator+=(const dimensionSet& ds) const
     {
         FatalErrorInFunction
             << "Different dimensions for +=" << endl
-            << "     dimensions : " << *this << " = " << ds << endl
+            << "     dimensions : " << info() << " = " << ds.info() << endl
             << abort(FatalError);
     }
 
@@ -198,7 +219,7 @@ bool Foam::dimensionSet::operator-=(const dimensionSet& ds) const
     {
         FatalErrorInFunction
             << "Different dimensions for -=" << endl
-            << "     dimensions : " << *this << " = " << ds << endl
+            << "     dimensions : " << info() << " = " << ds.info() << endl
             << abort(FatalError);
     }
 
@@ -230,8 +251,8 @@ Foam::dimensionSet Foam::max(const dimensionSet& ds1, const dimensionSet& ds2)
     {
         FatalErrorInFunction
             << "Arguments of max have different dimensions" << endl
-            << "     dimensions : " << ds1 << " and " << ds2 << endl
-            << abort(FatalError);
+            << "     dimensions : " << ds1.info() << " and " << ds2.info()
+            << endl << abort(FatalError);
     }
 
     return ds1;
@@ -244,8 +265,8 @@ Foam::dimensionSet Foam::min(const dimensionSet& ds1, const dimensionSet& ds2)
     {
         FatalErrorInFunction
             << "Arguments of min have different dimensions" << endl
-            << "     dimensions : " << ds1 << " and " << ds2 << endl
-            << abort(FatalError);
+            << "     dimensions : " << ds1.info() << " and " << ds2.info()
+            << endl << abort(FatalError);
     }
 
     return ds1;
@@ -472,8 +493,8 @@ Foam::dimensionSet Foam::atan2(const dimensionSet& ds1, const dimensionSet& ds2)
     {
         FatalErrorInFunction
             << "Arguments of atan2 have different dimensions" << endl
-            << "     dimensions : " << ds1 << " and " << ds2 << endl
-            << abort(FatalError);
+            << "     dimensions : " << ds1.info() << " and " << ds2.info()
+            << endl << abort(FatalError);
     }
 
     return dimless;
@@ -518,8 +539,8 @@ Foam::dimensionSet Foam::operator+
     {
         FatalErrorInFunction
             << "LHS and RHS of + have different dimensions" << endl
-            << "     dimensions : " << ds1 << " + " << ds2 << endl
-            << abort(FatalError);
+            << "     dimensions : " << ds1.info() << " + " << ds2.info()
+            << endl << abort(FatalError);
     }
 
     return dimSum;
@@ -538,8 +559,8 @@ Foam::dimensionSet Foam::operator-
     {
         FatalErrorInFunction
             << "LHS and RHS of - have different dimensions" << endl
-            << "     dimensions : " << ds1 << " - " << ds2 << endl
-            << abort(FatalError);
+            << "     dimensions : " << ds1.info() << " - " << ds2.info()
+            << endl << abort(FatalError);
     }
 
     return dimDifference;
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index b4e559276a..777099f8dd 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -40,9 +40,9 @@ SourceFiles
 #define dimensionSet_H
 
 #include "bool.H"
-#include "dimensionedScalarFwd.H"
 #include "className.H"
-#include "List.H"
+#include "NamedEnum.H"
+#include "InfoProxy.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,6 +52,9 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class dimensionSet;
+class unitConversion;
+template<class Type> class dimensioned;
+typedef dimensioned<scalar> dimensionedScalar;
 
 // Friend Functions
 
@@ -112,6 +115,7 @@ dimensionSet operator&&(const dimensionSet&, const dimensionSet&);
 
 Istream& operator>>(Istream&, dimensionSet&);
 Ostream& operator<<(Ostream&, const dimensionSet&);
+Ostream& operator<<(Ostream&, const InfoProxy<dimensionSet>&);
 
 
 /*---------------------------------------------------------------------------*\
@@ -125,6 +129,7 @@ public:
 
     // Member constants
 
+        //- Define an enumeration for the number of dimensions
         enum
         {
             nDimensions = 7    // Number of dimensions in SI is 7
@@ -137,71 +142,23 @@ public:
             LENGTH,             // metre      m
             TIME,               // second     s
             TEMPERATURE,        // Kelvin     K
-            MOLES,              // mole       mol
+            MOLES,              // kilomole   kmol
             CURRENT,            // Ampere     A
             LUMINOUS_INTENSITY  // Candela    Cd
         };
 
+        //- Names of the dimensions
+        static const NamedEnum<dimensionType, 7> dimensionTypeNames_;
+
 
     // Static Data Members
 
+        //- A small exponent with which to perform inexact comparisons
         static const scalar smallExponent;
 
 
 private:
 
-    // Private classes
-
-        class tokeniser
-        {
-            // Private Data
-
-                Istream& is_;
-
-                List<token> tokens_;
-
-                label start_;
-
-                label size_;
-
-
-            // Private Member Functions
-
-                void push(const token&);
-
-                token pop();
-
-                void unpop(const token&);
-
-
-        public:
-
-            // Constructors
-
-                 tokeniser(Istream&);
-
-
-            // Member Functions
-
-                Istream& stream()
-                {
-                    return is_;
-                }
-
-                bool hasToken() const;
-
-                token nextToken();
-
-                void putBack(const token&);
-
-                void splitWord(const word&);
-
-                static bool valid(char c);
-
-                static label priority(const token& t);
-        };
-
-
     // Private Data
 
         //- Array of dimension exponents
@@ -214,14 +171,6 @@ private:
         //  handle reading with insufficient precision.
         void round(const scalar tol);
 
-        //- Parse tokens into a dimensioned scalar
-        dimensionedScalar parse
-        (
-            const label lastPrior,
-            tokeniser& tis,
-            const HashTable<dimensionedScalar>& readSet
-        ) const;
-
 
 public:
 
@@ -278,13 +227,21 @@ public:
 
     // I/O
 
-        //- Read using units from the system table. Return the multiplier with
-        //  which to convert associated values to the given units.
-        Istream& read(Istream& is, scalar& multiplier);
+        //- Read, assuming the '[' has already been read
+        Istream& readNoBegin(Istream& is);
+
+        //- Read
+        Istream& read(Istream& is);
 
         //- Write
         Ostream& write(Ostream& os) const;
 
+        //- Return info proxy
+        inline InfoProxy<dimensionSet> info() const
+        {
+            return *this;
+        }
+
 
     // Member Operators
 
@@ -346,14 +303,13 @@ public:
 
         friend dimensionSet atan2(const dimensionSet&, const dimensionSet&);
 
-        //- Return the argument; transformations do not change the dimensions
         friend dimensionSet transform(const dimensionSet&);
 
         friend dimensionSet normalised(const dimensionSet&);
         friend dimensionSet perpendicular(const dimensionSet&);
 
 
-    // Friend operators
+    // Friend Operators
 
         friend dimensionSet operator-(const dimensionSet&);
 
@@ -404,6 +360,7 @@ public:
 
         friend Istream& operator>>(Istream&, dimensionSet&);
         friend Ostream& operator<<(Ostream&, const dimensionSet&);
+        friend Ostream& operator<<(Ostream&, const InfoProxy<dimensionSet>&);
 };
 
 
diff --git a/src/OpenFOAM/dimensionSet/dimensionSetIO.C b/src/OpenFOAM/dimensionSet/dimensionSetIO.C
index fc2635687c..ecba0c49a5 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSetIO.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSetIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,44 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dimensionSet.H"
-#include "IOstreams.H"
-#include "dimensionedScalar.H"
-#include <limits>
+#include "symbols.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::dimensionSet::tokeniser::push(const token& t)
-{
-    label end = (start_+size_)%tokens_.size();
-    tokens_[end] = t;
-    if (size_ == tokens_.size())
-    {
-        start_ = tokens_.fcIndex(start_);
-    }
-    else
-    {
-        size_++;
-    }
-}
-
-
-Foam::token Foam::dimensionSet::tokeniser::pop()
-{
-    token t = tokens_[start_];
-    start_ = tokens_.fcIndex(start_);
-    --size_;
-    return t;
-}
-
-
-void Foam::dimensionSet::tokeniser::unpop(const token& t)
-{
-    ++size_;
-    start_ = tokens_.rcIndex(start_);
-    tokens_[start_] = t;
-}
-
-
 void Foam::dimensionSet::round(const scalar tol)
 {
     for (int i=0; i < dimensionSet::nDimensions; ++i)
@@ -85,169 +51,6 @@ void Foam::dimensionSet::round(const scalar tol)
 }
 
 
-Foam::dimensionedScalar Foam::dimensionSet::parse
-(
-    const label lastPrior,
-    tokeniser& tis,
-    const HashTable<dimensionedScalar>& readSet
-) const
-{
-    dimensionedScalar ds("", dimless, 1.0);
-
-    // Get initial token
-    token nextToken(tis.nextToken());
-
-    // Store type of last token read. Used to detect two consecutive
-    // symbols and assume multiplication
-    bool haveReadSymbol = false;
-
-    while (true)
-    {
-        if (nextToken.isWord())
-        {
-            const word& unitName = nextToken.wordToken();
-            const dimensionedScalar& unitDim = readSet[unitName];
-            ds.dimensions() *= unitDim.dimensions();
-            ds.value() *= unitDim.value();
-            haveReadSymbol = true;
-        }
-        else if (nextToken.isNumber())
-        {
-            // no dimensions, just value
-            ds.value() *= nextToken.number();
-            haveReadSymbol = true;
-        }
-        else if (nextToken.isPunctuation())
-        {
-            label nextPrior = tokeniser::priority(nextToken);
-
-            if (nextToken.pToken() == token::BEGIN_SQR)
-            {
-                // No idea when this will happen
-                tis.putBack(nextToken);
-                return ds;
-            }
-            else if (nextToken.pToken() == token::END_SQR)
-            {
-                tis.putBack(nextToken);
-                return ds;
-            }
-            else if (nextToken.pToken() == token::BEGIN_LIST)
-            {
-                dimensionedScalar sub(parse(nextPrior, tis, readSet));
-
-                token t = tis.nextToken();
-                if (!t.isPunctuation()  || t.pToken() !=  token::END_LIST)
-                {
-                    FatalIOErrorInFunction
-                    (
-                        tis.stream()
-                    )   << "Illegal token " << t << exit(FatalIOError);
-                }
-
-                ds.dimensions() *= sub.dimensions();
-                ds.value() *= sub.value();
-
-                haveReadSymbol = true;
-            }
-            else if (nextToken.pToken() == token::END_LIST)
-            {
-                tis.putBack(nextToken);
-                return ds;
-            }
-            else if (nextToken.pToken() == token::MULTIPLY)
-            {
-                if (nextPrior > lastPrior)
-                {
-                    dimensionedScalar sub(parse(nextPrior, tis, readSet));
-
-                    ds.dimensions() *= sub.dimensions();
-                    ds.value() *= sub.value();
-                }
-                else
-                {
-                    // Restore token
-                    tis.putBack(nextToken);
-                    return ds;
-                }
-                haveReadSymbol = false;
-            }
-            else if (nextToken.pToken() == token::DIVIDE)
-            {
-                if (nextPrior > lastPrior)
-                {
-                    dimensionedScalar sub(parse(nextPrior, tis, readSet));
-
-                    ds.dimensions() /= sub.dimensions();
-                    ds.value() /= sub.value();
-                }
-                else
-                {
-                    tis.putBack(nextToken);
-                    return ds;
-                }
-                haveReadSymbol = false;
-            }
-            else if (nextToken.pToken() == '^')
-            {
-                if (nextPrior > lastPrior)
-                {
-                    dimensionedScalar exp(parse(nextPrior, tis, readSet));
-
-                    ds.dimensions().reset(pow(ds.dimensions(), exp.value()));
-
-                    // Round to nearest integer if close to it
-                    ds.dimensions().round(10*smallExponent);
-
-                    ds.value() = Foam::pow(ds.value(), exp.value());
-                }
-                else
-                {
-                    tis.putBack(nextToken);
-                    return ds;
-                }
-                haveReadSymbol = false;
-            }
-            else
-            {
-                FatalIOErrorInFunction
-                (
-                    tis.stream()
-                )   << "Illegal token " << nextToken << exit(FatalIOError);
-            }
-        }
-        else
-        {
-            FatalIOErrorInFunction
-            (
-                tis.stream()
-            )   << "Illegal token " << nextToken << exit(FatalIOError);
-        }
-
-
-        if (!tis.hasToken())
-        {
-            break;
-        }
-
-        nextToken = tis.nextToken();
-        if (nextToken.error())
-        {
-            break;
-        }
-
-        if (haveReadSymbol && (nextToken.isWord() || nextToken.isNumber()))
-        {
-            // Two consecutive symbols. Assume multiplication
-            tis.putBack(nextToken);
-            nextToken = token(token::MULTIPLY);
-        }
-    }
-
-    return ds;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::dimensionSet::dimensionSet(Istream& is)
@@ -256,192 +59,23 @@ Foam::dimensionSet::dimensionSet(Istream& is)
 }
 
 
-Foam::dimensionSet::tokeniser::tokeniser(Istream& is)
-:
-    is_(is),
-    tokens_(100),
-    start_(0),
-    size_(0)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::dimensionSet::tokeniser::hasToken() const
+Foam::Istream& Foam::dimensionSet::readNoBegin(Istream& is)
 {
-    return size_ || is_.good();
-}
-
-
-Foam::token Foam::dimensionSet::tokeniser::nextToken()
-{
-    if (size_ == 0)
-    {
-        token t(is_);
-        if (t.isWord())
-        {
-            splitWord(t.wordToken());
-            return pop();
-        }
-        else
-        {
-            return t;
-        }
-    }
-    else
-    {
-        return pop();
-    }
-}
-
-
-void Foam::dimensionSet::tokeniser::putBack(const token& t)
-{
-    if (size_ == 0)
-    {
-        push(t);
-    }
-    else
-    {
-        unpop(t);
-    }
-}
-
-
-void Foam::dimensionSet::tokeniser::splitWord(const word& w)
-{
-    size_t start = 0;
-    for (size_t i=0; i<w.size(); ++i)
-    {
-        if (!valid(w[i]))
-        {
-            if (i > start)
-            {
-                word subWord = w(start, i-start);
-                if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
-                {
-                    push(token(readScalar(IStringStream(subWord)())));
-                }
-                else
-                {
-                    push(token(subWord));
-                }
-            }
-            if (w[i] != token::SPACE)
-            {
-                if (isdigit(w[i]))
-                {
-                    push(token(readScalar(IStringStream(w[i])())));
-                }
-                else
-                {
-                    push(token::punctuationToken(w[i]));
-                }
-            }
-            start = i+1;
-        }
-    }
-    if (start < w.size())
-    {
-        word subWord = w(start, w.size()-start);
-        if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
-        {
-            push(token(readScalar(IStringStream(subWord)())));
-        }
-        else
-        {
-            push(token(subWord));
-        }
-    }
-}
-
-
-bool Foam::dimensionSet::tokeniser::valid(char c)
-{
-    return
-    (
-        !isspace(c)
-     && c != '"'   // string quote
-     && c != '\''  // string quote
-     && c != '/'   // div
-     && c != ';'   // end statement
-     && c != '{'   // beg subdict
-     && c != '}'   // end subdict
-     && c != '('   // beg expr
-     && c != ')'   // end expr
-     && c != '['   // beg dim
-     && c != ']'   // end dim
-     && c != '^'   // power
-     && c != '*'   // mult
-    );
-}
-
-
-Foam::label Foam::dimensionSet::tokeniser::priority(const token& t)
-{
-    if (!t.isPunctuation())
-    {
-        return 0;
-    }
-    else if
-    (
-        t.pToken() == token::MULTIPLY
-     || t.pToken() == token::DIVIDE
-    )
-    {
-        return 2;
-    }
-    else if (t.pToken() == '^')
-    {
-        return 3;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-
-Foam::Istream& Foam::dimensionSet::read
-(
-    Istream& is,
-    scalar& multiplier
-)
-{
-    multiplier = 1.0;
-
-    // Read beginning of dimensionSet
-    token startToken(is);
-
-    if (startToken != token::BEGIN_SQR)
-    {
-        FatalIOErrorInFunction
-        (
-            is
-        )   << "expected a " << token::BEGIN_SQR << " in dimensionSet"
-            << endl << "in stream " << is.info()
-            << exit(FatalIOError);
-    }
-
     // Read next token
     token nextToken(is);
 
     if (!nextToken.isNumber())
     {
+        // Named dimensions. Parse.
         is.putBack(nextToken);
-
-        tokeniser tis(is);
-
-        dimensionedScalar ds(parse(0, tis, unitSet()));
-
-        multiplier = ds.value();
-        for (int i=0; i < dimensionSet::nDimensions; ++i)
-        {
-            exponents_[i] = ds.dimensions()[i];
-        }
+        reset(symbols::parseNoBegin(is, dimless, dimensions()));
     }
     else
     {
+        // Numbered dimensions. Read directly.
+
         // Read first five dimensions
         exponents_[dimensionSet::MASS] = nextToken.number();
         for (int Dimension=1; Dimension<dimensionSet::CURRENT; Dimension++)
@@ -452,8 +86,7 @@ Foam::Istream& Foam::dimensionSet::read
         // Read next token
         token nextToken(is);
 
-        // If next token is another number
-        // read last two dimensions
+        // If next token is another number then read the last two dimensions
         // and then read another token for the end of the dimensionSet
         if (nextToken.isNumber())
         {
@@ -471,10 +104,8 @@ Foam::Istream& Foam::dimensionSet::read
         // Check end of dimensionSet
         if (nextToken != token::END_SQR)
         {
-            FatalIOErrorInFunction
-            (
-                is
-            )   << "expected a " << token::END_SQR << " in dimensionSet "
+            FatalIOErrorInFunction(is)
+                << "expected a " << token::END_SQR << " in dimensionSet "
                 << endl << "in stream " << is.info()
                 << exit(FatalIOError);
         }
@@ -487,6 +118,23 @@ Foam::Istream& Foam::dimensionSet::read
 }
 
 
+Foam::Istream& Foam::dimensionSet::read(Istream& is)
+{
+    // Read beginning of dimensionSet
+    token startToken(is);
+
+    if (startToken != token::BEGIN_SQR)
+    {
+        FatalIOErrorInFunction(is)
+            << "expected a " << token::BEGIN_SQR << " in dimensionSet"
+            << endl << "in stream " << is.info()
+            << exit(FatalIOError);
+    }
+
+    return readNoBegin(is);
+}
+
+
 Foam::Ostream& Foam::dimensionSet::write(Ostream& os) const
 {
     os << token::BEGIN_SQR;
@@ -513,17 +161,9 @@ void Foam::writeEntry(Ostream& os, const dimensionSet& value)
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset)
+Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dims)
 {
-    scalar multiplier;
-    dset.read(is, multiplier);
-
-    if (mag(multiplier-1.0) > dimensionSet::smallExponent)
-    {
-        FatalIOErrorInFunction(is)
-            << "Cannot use scaled units in dimensionSet"
-            << exit(FatalIOError);
-    }
+    dims.read(is);
 
     // Check state of Istream
     is.check("Istream& operator>>(Istream&, dimensionSet&)");
@@ -532,9 +172,9 @@ Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset)
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const dimensionSet& dset)
+Foam::Ostream& Foam::operator<<(Ostream& os, const dimensionSet& dims)
 {
-    dset.write(os);
+    dims.write(os);
 
     // Check state of Ostream
     os.check("Ostream& operator<<(Ostream&, const dimensionSet&)");
@@ -543,4 +183,40 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const dimensionSet& dset)
 }
 
 
+Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<dimensionSet>& ip)
+{
+    const dimensionSet& dims = ip.t_;
+
+    os << token::BEGIN_SQR;
+
+    for (int first=true, i=0; i<dimensionSet::nDimensions; i++)
+    {
+        if (mag(dims.exponents_[i]) > dimensionSet::smallExponent)
+        {
+            if (!first)
+            {
+                os << token::SPACE;
+            }
+
+            os << dimensionSet::dimensionTypeNames_
+                  [static_cast<dimensionSet::dimensionType>(i)];
+
+            if (dims.exponents_[i] != 1)
+            {
+                os << '^' << dims.exponents_[i];
+            }
+
+            first = false;
+        }
+    }
+
+    os << token::END_SQR;
+
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const InfoProxy<dimensionSet>&)");
+
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index 853c42a7ec..65e954e368 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.C
@@ -24,11 +24,30 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dimensionSet.H"
-#include "dimensionedScalar.H"
 #include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+namespace Foam
+{
+
+HashTable<dimensionSet>* dimensionsPtr_(nullptr);
+
+// Delete the above data at the end of the run
+struct deleteDimensionsPtr
+{
+    ~deleteDimensionsPtr()
+    {
+        deleteDemandDrivenData(dimensionsPtr_);
+    }
+};
+
+deleteDimensionsPtr deleteDimensionsPtr_;
+
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 const Foam::dimensionSet Foam::dimless(0, 0, 0, 0, 0, 0, 0);
 
 const Foam::dimensionSet Foam::dimMass(1, 0, 0, 0, 0, 0, 0);
@@ -41,7 +60,6 @@ const Foam::dimensionSet Foam::dimLuminousIntensity(0, 0, 0, 0, 0, 0, 1);
 
 const Foam::dimensionSet Foam::dimArea(sqr(dimLength));
 const Foam::dimensionSet Foam::dimVolume(pow3(dimLength));
-const Foam::dimensionSet Foam::dimVol(dimVolume);
 
 const Foam::dimensionSet Foam::dimRate(dimless/dimTime);
 
@@ -55,136 +73,79 @@ const Foam::dimensionSet Foam::dimEnergy(dimForce*dimLength);
 const Foam::dimensionSet Foam::dimPower(dimEnergy/dimTime);
 
 const Foam::dimensionSet Foam::dimPressure(dimForce/dimArea);
+const Foam::dimensionSet Foam::dimKinematicPressure(dimPressure/dimDensity);
 const Foam::dimensionSet Foam::dimCompressibility(dimDensity/dimPressure);
 const Foam::dimensionSet Foam::dimGasConstant(dimEnergy/dimMass/dimTemperature);
 const Foam::dimensionSet Foam::dimSpecificHeatCapacity(dimGasConstant);
-const Foam::dimensionSet Foam::dimViscosity(dimArea/dimTime);
-const Foam::dimensionSet Foam::dimDynamicViscosity(dimDensity*dimViscosity);
+const Foam::dimensionSet Foam::dimKinematicViscosity(dimArea/dimTime);
+const Foam::dimensionSet Foam::dimDynamicViscosity
+(
+    dimDensity*dimKinematicViscosity
+);
+const Foam::dimensionSet Foam::dimThermalConductivity
+(
+    dimPower/dimLength/dimTemperature
+);
 
-const Foam::dimensionSet Foam::dimFlux(dimArea*dimVelocity);
-const Foam::dimensionSet Foam::dimMassFlux(dimDensity*dimFlux);
+const Foam::dimensionSet Foam::dimVolumetricFlux(dimArea*dimVelocity);
+const Foam::dimensionSet Foam::dimMassFlux(dimDensity*dimVolumetricFlux);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::HashTable<Foam::dimensionSet>& Foam::dimensions()
 {
+    static const NamedEnum<dimensionSet::dimensionType, 7>& names =
+        dimensionSet::dimensionTypeNames_;
 
-dictionary* dimensionSetsDictPtr_(nullptr);
-
-const dictionary& dimensionSetsDict()
-{
-    if (!dimensionSetsDictPtr_)
+    if (!dimensionsPtr_)
     {
-        dictionary* cachedPtr = nullptr;
-        dimensionSetsDictPtr_ = new dictionary
+        dimensionsPtr_ = new HashTable<dimensionSet>();
+
+        dimensionsPtr_->insert(names[dimensionSet::MASS], dimMass);
+        dimensionsPtr_->insert(names[dimensionSet::LENGTH], dimLength);
+        dimensionsPtr_->insert(names[dimensionSet::TIME], dimTime);
+        dimensionsPtr_->insert
         (
-            debug::switchSet
-            (
-                "DimensionSets",
-                cachedPtr
-            )
+            names[dimensionSet::TEMPERATURE],
+            dimTemperature
         );
+        dimensionsPtr_->insert(names[dimensionSet::MOLES], dimMoles);
+        dimensionsPtr_->insert(names[dimensionSet::CURRENT], dimCurrent);
+        dimensionsPtr_->insert
+        (
+            names[dimensionSet::LUMINOUS_INTENSITY],
+            dimLuminousIntensity
+        );
+
+        dimensionsPtr_->insert("area", dimArea);
+        dimensionsPtr_->insert("volume", dimVolume);
+
+        dimensionsPtr_->insert("rate", dimRate);
+
+        dimensionsPtr_->insert("velocity", dimVelocity);
+        dimensionsPtr_->insert("momentum", dimMomentum);
+        dimensionsPtr_->insert("acceleration", dimAcceleration);
+
+        dimensionsPtr_->insert("density", dimDensity);
+        dimensionsPtr_->insert("force", dimForce);
+        dimensionsPtr_->insert("energy", dimEnergy);
+        dimensionsPtr_->insert("power", dimPower);
+
+        dimensionsPtr_->insert("pressure", dimPressure);
+        dimensionsPtr_->insert("kinematicPressure", dimKinematicPressure);
+        dimensionsPtr_->insert("compressibility", dimCompressibility);
+        dimensionsPtr_->insert("gasConstant", dimGasConstant);
+        dimensionsPtr_->insert("specificHeatCapacity", dimSpecificHeatCapacity);
+        dimensionsPtr_->insert("kinematicViscosity", dimKinematicViscosity);
+        dimensionsPtr_->insert("dynamicViscosity", dimDynamicViscosity);
+        dimensionsPtr_->insert("thermalConductivity", dimThermalConductivity);
+
+        dimensionsPtr_->insert("volumetricFlux", dimVolumetricFlux);
+        dimensionsPtr_->insert("massFlux", dimMassFlux);
     }
 
-    return *dimensionSetsDictPtr_;
-}
-
-HashTable<dimensionedScalar>* addedUnitsPtr_(nullptr);
-HashTable<dimensionedScalar>* unitSetPtr_(nullptr);
-
-// Delete the above data at the end of the run
-struct deleteDimensionSystemsPtr
-{
-    ~deleteDimensionSystemsPtr()
-    {
-        deleteDemandDrivenData(dimensionSetsDictPtr_);
-        deleteDemandDrivenData(addedUnitsPtr_);
-        deleteDemandDrivenData(unitSetPtr_);
-    }
-};
-
-deleteDimensionSystemsPtr deleteDimensionSystemsPtr_;
-
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void Foam::addUnit(const dimensionedScalar& unit)
-{
-    deleteDemandDrivenData(dimensionSetsDictPtr_);
-
-    if (!addedUnitsPtr_)
-    {
-        addedUnitsPtr_ = new HashTable<dimensionedScalar>();
-    }
-
-    addedUnitsPtr_->insert(unit.name(), unit);
-
-    deleteDemandDrivenData(unitSetPtr_);
-}
-
-
-const Foam::HashTable<Foam::dimensionedScalar>& Foam::unitSet()
-{
-    if (!unitSetPtr_)
-    {
-        const dictionary& dimSetsDict = dimensionSetsDict();
-
-        if (!dimSetsDict.found("unitSet"))
-        {
-            FatalIOErrorInFunction(dimSetsDict)
-                << "Cannot find unitSet in dictionary " << dimSetsDict.name()
-                << exit(FatalIOError);
-        }
-
-        const word unitSetDictName =
-            dimSetsDict.lookup<word>("unitSet") + "Coeffs";
-
-        if (!dimSetsDict.found(unitSetDictName))
-        {
-            FatalIOErrorInFunction(dimSetsDict)
-                << "Cannot find " << unitSetDictName << " in dictionary "
-                << dimSetsDict.name() << exit(FatalIOError);
-        }
-
-        const dictionary& unitSetDict = dimSetsDict.subDict(unitSetDictName);
-
-        unitSetPtr_ = new HashTable<dimensionedScalar>(unitSetDict.size());
-
-        forAllConstIter(dictionary, unitSetDict, iter)
-        {
-            const dimensionedScalar dt(iter().keyword(), iter().stream());
-
-            const bool ok = unitSetPtr_->insert(iter().keyword(), dt);
-
-            if (!ok)
-            {
-                FatalIOErrorInFunction(dimSetsDict)
-                    << "Duplicate unit " << iter().keyword()
-                    << " read from dictionary"
-                    << exit(FatalIOError);
-            }
-        }
-
-        if (addedUnitsPtr_)
-        {
-            forAllConstIter(HashTable<dimensionedScalar>, *addedUnitsPtr_, iter)
-            {
-                const bool ok = unitSetPtr_->insert(iter.key(), iter());
-
-                if (!ok)
-                {
-                    FatalIOErrorInFunction(dimSetsDict)
-                        << "Duplicate unit " << iter.key()
-                        << " added to dictionary"
-                        << exit(FatalIOError);
-                }
-            }
-        }
-    }
-
-    return *unitSetPtr_;
+    return *dimensionsPtr_;
 }
 
 
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.H b/src/OpenFOAM/dimensionSet/dimensionSets.H
index 7ff06848ca..a5bc1bcd50 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.H
@@ -36,6 +36,7 @@ SourceFiles
 #define dimensionSets_H
 
 #include "dimensionSet.H"
+#include "unitConversions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,7 +57,6 @@ extern const dimensionSet dimLuminousIntensity;
 
 extern const dimensionSet dimArea;
 extern const dimensionSet dimVolume;
-extern const dimensionSet dimVol;
 
 extern const dimensionSet dimRate;
 
@@ -70,22 +70,22 @@ extern const dimensionSet dimEnergy;
 extern const dimensionSet dimPower;
 
 extern const dimensionSet dimPressure;
+extern const dimensionSet dimKinematicPressure;
 extern const dimensionSet dimCompressibility;
 extern const dimensionSet dimGasConstant;
 extern const dimensionSet dimSpecificHeatCapacity;
-extern const dimensionSet dimViscosity;
+extern const dimensionSet dimKinematicViscosity;
 extern const dimensionSet dimDynamicViscosity;
+extern const dimensionSet dimThermalConductivity;
 
-extern const dimensionSet dimFlux;
+extern const dimensionSet dimVolumetricFlux;
 extern const dimensionSet dimMassFlux;
 
 
-//- Add a unit
-void addUnit(const dimensionedScalar& unit);
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-//- Set of all units
-const HashTable<dimensionedScalar>& unitSet();
+//- Get the table of dimension sets
+const HashTable<dimensionSet>& dimensions();
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H
index 69d18d7863..23d1558927 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,13 +37,14 @@ SourceFiles
 
 #include "dimensionedType.H"
 #include "scalar.H"
-#include "dimensionedScalarFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+typedef dimensioned<scalar> dimensionedScalar;
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensionedScalar operator+(const dimensionedScalar&, const scalar);
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 23dc80baab..c4f04c9d53 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -29,109 +29,95 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class Type>
-bool Foam::dimensioned<Type>::readDimensions
-(
-    Istream& is,
-    scalar& multiplier,
-    const bool haveDims
-)
-{
-    token nextToken(is);
-    is.putBack(nextToken);
-
-    if (nextToken == token::BEGIN_SQR)
-    {
-        dimensionSet dims(dimless);
-        dims.read(is, multiplier);
-
-        if (!haveDims)
-        {
-            dimensions_.reset(dims);
-        }
-        else if (dims != dimensions_)
-        {
-            FatalIOErrorInFunction(is)
-                << "The dimensions " << dims
-                << " provided do not match the required dimensions "
-                << dimensions_ << abort(FatalIOError);
-        }
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
 template<class Type>
 void Foam::dimensioned<Type>::initialise
 (
-    Istream& is,
-    const bool haveName,
-    const bool haveDims
+    const word& name,
+    const unitConversion& defaultUnits,
+    Istream& is
 )
 {
     token nextToken(is);
 
-    // Check if the original format is used in which the name is provided
-    // and reset the name to that read
-    if (nextToken.isWord())
+    // Set the name using the argument, if specified, or read it from the
+    // stream if it is present. If neither are, then it will be set to a word
+    // representation of the value lower down.
+    if (!name.empty())
     {
-        if (!haveName)
-        {
-            name_ = nextToken.wordToken();
-        }
+        name_ = name;
+    }
+    else if (nextToken.isWord())
+    {
+        name_ = nextToken.wordToken();
     }
     else
+    {
+        name_ = word::null;
+    }
+
+    // Put the token back if it wasn't the name
+    if (!nextToken.isWord())
     {
         is.putBack(nextToken);
     }
 
-    scalar multiplier = 1;
+    // Read the units if they are before the value
+    unitConversion units(defaultUnits);
+    const bool haveUnits = units.readIfPresent(is);
 
-    // Read dimensions if they are before the value,
-    // compare with the argument with current
-    // and set the multiplier
-    const bool dimensionsRead = readDimensions(is, multiplier, haveDims);
+    // Read the value
+    value_ = pTraits<Type>(is);
 
-    is >> value_;
-
-    // Read dimensions if they are after the value,
-    // compare with the argument with current
-    // and set the multiplier
-    if (!dimensionsRead && !is.eof())
+    // Read the units if they are after the value
+    if (!haveUnits && !is.eof())
     {
-        readDimensions(is, multiplier, haveDims);
+        units.readIfPresent(is);
     }
 
-    value_ *= multiplier;
+    // Set the name
+    if (name_.empty())
+    {
+        name_ = Foam::name(value_);
+    }
+
+    // Set the dimensions
+    dimensions_.reset(units.dimensions());
+
+    // Modify the value by the unit conversion
+    units.makeStandard(value_);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class Type>
+Foam::dimensioned<Type>::dimensioned()
+:
+    name_("NaN"),
+    dimensions_(dimless),
+    value_(pTraits<Type>::nan)
+{}
+
+
 template<class Type>
 Foam::dimensioned<Type>::dimensioned
 (
     const word& name,
-    const dimensionSet& dimSet,
+    const dimensionSet& dims,
     const Type& t
 )
 :
     name_(name),
-    dimensions_(dimSet),
+    dimensions_(dims),
     value_(t)
 {}
 
 
 template<class Type>
-Foam::dimensioned<Type>::dimensioned(const dimensionSet& dimSet, const Type& t)
+Foam::dimensioned<Type>::dimensioned(const dimensionSet& dims, const Type& t)
 :
     name_(::Foam::name(t)),
-    dimensions_(dimSet),
+    dimensions_(dims),
     value_(t)
 {}
 
@@ -163,7 +149,7 @@ Foam::dimensioned<Type>::dimensioned(Istream& is)
 :
     dimensions_(dimless)
 {
-    initialise(is, false, false);
+    initialise(word::null, unitAny, is);
 }
 
 
@@ -173,7 +159,7 @@ Foam::dimensioned<Type>::dimensioned(const word& name, Istream& is)
     name_(name),
     dimensions_(dimless)
 {
-    initialise(is, true, false);
+    initialise(name, unitAny, is);
 }
 
 
@@ -181,15 +167,15 @@ template<class Type>
 Foam::dimensioned<Type>::dimensioned
 (
     const word& name,
-    const dimensionSet& dimSet,
+    const dimensionSet& dims,
     Istream& is
 )
 :
     name_(name),
-    dimensions_(dimSet),
+    dimensions_(dims),
     value_(Zero)
 {
-    initialise(is, true, true);
+    initialise(name, dims, is);
 }
 
 
@@ -197,27 +183,18 @@ template<class Type>
 Foam::dimensioned<Type>::dimensioned
 (
     const word& name,
-    const dimensionSet& dimSet,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
     name_(name),
-    dimensions_(dimSet),
+    dimensions_(dims),
     value_(Zero)
 {
-    initialise(dict.lookup(name), true, true);
+    initialise(name, dims, dict.lookup(name));
 }
 
 
-template<class Type>
-Foam::dimensioned<Type>::dimensioned()
-:
-    name_("NaN"),
-    dimensions_(dimless),
-    value_(pTraits<Type>::nan)
-{}
-
-
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 template<class Type>
@@ -350,7 +327,7 @@ void Foam::dimensioned<Type>::replace
 template<class Type>
 void Foam::dimensioned<Type>::read(const dictionary& dict)
 {
-    initialise(dict.lookup(name_), true, true);
+    initialise(name_, dimensions_, dict.lookup(name_));
 }
 
 
@@ -361,7 +338,7 @@ bool Foam::dimensioned<Type>::readIfPresent(const dictionary& dict)
 
     if (entryPtr)
     {
-        initialise(entryPtr->stream(), true, true);
+        initialise(name_, dimensions_, entryPtr->stream());
         return true;
     }
     else
@@ -563,7 +540,7 @@ void Foam::writeEntry(Ostream& os, const dimensioned<Type>& dt)
 template<class Type>
 Foam::Istream& Foam::operator>>(Istream& is, dimensioned<Type>& dt)
 {
-    dt.initialise(is, false, false);
+    dt.initialise(word::null, unitAny, is);
 
     // Check state of Istream
     is.check("Istream& operator>>(Istream&, dimensioned<Type>&)");
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 3ea338852f..51182abbbb 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -86,6 +86,14 @@ class dimensioned
         //- Initialise from Istream
         void initialise(Istream& is, const bool haveName, const bool haveDims);
 
+        //- Initialise from Istream
+        void initialise
+        (
+            const word& name,
+            const unitConversion& defaultUnits,
+            Istream& is
+        );
+
 
 public:
 
@@ -95,6 +103,9 @@ public:
 
     // Constructors
 
+        //- Null constructor
+        dimensioned();
+
         //- Construct given name, dimensions and value
         dimensioned(const word&, const dimensionSet&, const Type&);
 
@@ -121,9 +132,6 @@ public:
         //- Construct from dictionary lookup with a given name and dimensions
         dimensioned(const word&, const dimensionSet&, const dictionary&);
 
-        //- Null constructor
-        dimensioned();
-
 
     // Static member functions
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
index 81aee5e1e9..47dce35680 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
@@ -38,7 +38,7 @@ void Foam::DimensionedField<Type, GeoMesh>::readField
 {
     dimensions_.reset(dimensionSet(fieldDict.lookup("dimensions")));
 
-    Field<Type> f(fieldDictEntry, fieldDict, GeoMesh::size(mesh_));
+    Field<Type> f(fieldDictEntry, dimensions_, fieldDict, GeoMesh::size(mesh_));
 
     this->transfer(f);
 }
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
index ff0a3ec20f..34a69e51ea 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,20 @@ Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 {}
 
 
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
+(
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    const dictionary& dict,
+    const label size
+)
+:
+    Field<T>(keyword, defaultUnits, dict, size),
+    capacity_(Field<T>::size())
+{}
+
+
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 Foam::tmp<Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>>
 Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::clone() const
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index d49ec235ae..5d19967daf 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,6 +146,15 @@ public:
         //- Construct from a dictionary entry
         DynamicField(const word& keyword, const dictionary&, const label size);
 
+        //- Construct from a dictionary entry with unit conversion
+        DynamicField
+        (
+            const word& keyword,
+            const unitConversion&,
+            const dictionary&,
+            const label size
+        );
+
         //- Clone
         tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv>> clone() const;
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index a56617d7c1..93a8432347 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "Field.H"
 #include "FieldM.H"
+#include "unitConversions.H"
 #include "dictionary.H"
 #include "contiguous.H"
 
@@ -185,6 +186,19 @@ Foam::Field<Type>::Field
     const dictionary& dict,
     const label s
 )
+:
+    Field<Type>(keyword, unitAny, dict, s)
+{}
+
+
+template<class Type>
+Foam::Field<Type>::Field
+(
+    const word& keyword,
+    const unitConversion& defaultUnits,
+    const dictionary& dict,
+    const label s
+)
 {
     if (s)
     {
@@ -193,45 +207,55 @@ Foam::Field<Type>::Field
         // Read first token
         token firstToken(is);
 
+        // Read the units if they are before the values
+        unitConversion units(defaultUnits);
+        const bool haveUnits = units.readIfPresent(keyword, dict, is);
+
+        // Read the values
         if (firstToken.isWord())
         {
             if (firstToken.wordToken() == "uniform")
             {
                 this->setSize(s);
+
                 operator=(pTraits<Type>(is));
             }
             else if (firstToken.wordToken() == "nonuniform")
             {
                 is >> static_cast<List<Type>&>(*this);
+
                 if (this->size() != s)
                 {
-                    FatalIOErrorInFunction
-                    (
-                        dict
-                    )   << "size " << this->size()
+                    FatalIOErrorInFunction(dict)
+                        << "size " << this->size()
                         << " is not equal to the given value of " << s
                         << exit(FatalIOError);
                 }
             }
             else
             {
-                FatalIOErrorInFunction
-                (
-                    dict
-                )   << "expected keyword 'uniform' or 'nonuniform', found "
+                FatalIOErrorInFunction(dict)
+                    << "expected keyword 'uniform' or 'nonuniform', found "
                     << firstToken.wordToken()
                     << exit(FatalIOError);
             }
         }
         else
         {
-            FatalIOErrorInFunction
-            (
-                dict
-            )   << "expected keyword 'uniform' or 'nonuniform', found "
+            FatalIOErrorInFunction(dict)
+                << "expected keyword 'uniform' or 'nonuniform', found "
                 << firstToken.info()
                 << exit(FatalIOError);
         }
+
+        // Read the units if they are after the value
+        if (!haveUnits && !is.eof())
+        {
+            units.readIfPresent(keyword, dict, is);
+        }
+
+        // Modify the values by the unit conversion
+        units.makeStandard(*this);
     }
 }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index dd1d62d1d4..28bfe30ddf 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,7 @@ Ostream& operator<<(Ostream&, const Field<Type>&);
 template<class Type>
 Ostream& operator<<(Ostream&, const tmp<Field<Type>>&);
 
+class unitConversion;
 class dictionary;
 
 /*---------------------------------------------------------------------------*\
@@ -188,6 +189,15 @@ public:
         //- Construct from a dictionary entry
         Field(const word& keyword, const dictionary&, const label size);
 
+        //- Construct from a dictionary entry with unit conversion
+        Field
+        (
+            const word& keyword,
+            const unitConversion&,
+            const dictionary&,
+            const label size
+        );
+
         //- Clone
         tmp<Field<Type>> clone() const;
 
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index 8da5ffac40..21ae6e37a1 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "scalarField.H"
-#include "unitConversion.H"
 
 #define TEMPLATE
 #include "FieldFunctionsM.C"
@@ -166,12 +165,6 @@ UNARY_FUNCTION(scalar, scalar, j1)
 UNARY_FUNCTION(scalar, scalar, y0)
 UNARY_FUNCTION(scalar, scalar, y1)
 
-UNARY_FUNCTION(scalar, scalar, degToRad)
-UNARY_FUNCTION(scalar, scalar, radToDeg)
-UNARY_FUNCTION(scalar, scalar, atmToPa)
-UNARY_FUNCTION(scalar, scalar, paToAtm)
-
-
 #define BesselFunc(func)                                                       \
 void func(scalarField& res, const int n, const UList<scalar>& sf)              \
 {                                                                              \
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
index 0d6cace18d..65748a524a 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,11 +141,6 @@ UNARY_FUNCTION(scalar, scalar, j1)
 UNARY_FUNCTION(scalar, scalar, y0)
 UNARY_FUNCTION(scalar, scalar, y1)
 
-UNARY_FUNCTION(scalar, scalar, degToRad)
-UNARY_FUNCTION(scalar, scalar, radToDeg)
-UNARY_FUNCTION(scalar, scalar, atmToPa)
-UNARY_FUNCTION(scalar, scalar, paToAtm)
-
 #define BesselFunc(func)                                            \
 void func(scalarField& Res, const int n, const UList<scalar>& sf);  \
 tmp<scalarField> func(const int n, const UList<scalar>&);           \
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
index 85fa2e401a..1f6badaf55 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -49,10 +49,10 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
     )
     {
         dictionary dict(readStream(typeName));
-        scalar multiplier;
-        this->dimensions().read(dict.lookup("dimensions"), multiplier);
-        dict.lookup("value") >> this->value();
-        this->value() *= multiplier;
+
+        this->dimensions().read(dict.lookup("dimensions"));
+
+        this->value() = dict.lookup<Type>("value", this->dimensions());
     }
 }
 
@@ -80,10 +80,10 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
     OldTimeField<UniformDimensionedField>(this->time().timeIndex())
 {
     dictionary dict(readStream(typeName));
-    scalar multiplier;
-    this->dimensions().read(dict.lookup("dimensions"), multiplier);
-    dict.lookup("value") >> this->value();
-    this->value() *= multiplier;
+
+    this->dimensions().read(dict.lookup("dimensions"));
+
+    this->value() = dict.lookup<Type>("value", this->dimensions());
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index 80dcb1f854..1c9e82db59 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
     {
         Field<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else if (!valueRequired)
@@ -81,10 +81,8 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
     }
     else
     {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "Essential entry 'value' missing"
+        FatalIOErrorInFunction(dict)
+            << "Essential entry 'value' missing"
             << exit(FatalIOError);
     }
 }
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
index bcd19696f1..5a38018c04 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::fixedNormalSlipPointPatchField<Type>::fixedNormalSlipPointPatchField
 )
 :
     slipPointPatchField<Type>(p, iF, dict),
-    n_(dict.lookup("n"))
+    n_(dict.lookup<vector>("n", dimless))
 {}
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
index 1aa434d071..27a4bd7b01 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,18 +37,27 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(p, iF, dict, false),
-    uniformValue_(Function1<Type>::New("uniformValue", dict))
+    uniformValue_
+    (
+        Function1<Type>::New
+        (
+            "uniformValue",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {
     if (dict.found("value"))
     {
         fixedValuePointPatchField<Type>::operator==
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
     {
-        const scalar t = this->db().time().userTimeValue();
+        const scalar t = this->db().time().value();
         fixedValuePointPatchField<Type>::operator=(uniformValue_->value(t));
     }
 }
@@ -68,7 +77,7 @@ uniformFixedValuePointPatchField
     uniformValue_(ptf.uniformValue_, false)
 {
     // For safety re-evaluate
-    const scalar t = this->db().time().userTimeValue();
+    const scalar t = this->db().time().value();
     fixedValuePointPatchField<Type>::operator=(uniformValue_->value(t));
 }
 
@@ -85,7 +94,7 @@ uniformFixedValuePointPatchField
     uniformValue_(ptf.uniformValue_, false)
 {
     // For safety re-evaluate
-    const scalar t = this->db().time().userTimeValue();
+    const scalar t = this->db().time().value();
     fixedValuePointPatchField<Type>::operator==(uniformValue_->value(t));
 }
 
@@ -100,7 +109,7 @@ void Foam::uniformFixedValuePointPatchField<Type>::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
+    const scalar t = this->db().time().value();
     fixedValuePointPatchField<Type>::operator==(uniformValue_->value(t));
 
     fixedValuePointPatchField<Type>::updateCoeffs();
@@ -113,7 +122,13 @@ write(Ostream& os) const
 {
     // Note: write value
     fixedValuePointPatchField<Type>::write(os);
-    writeEntry(os, uniformValue_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        uniformValue_())
+    ;
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index b57d218b46..24c654f443 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,6 @@ License
 #include "Time.H"
 #include "transformField.H"
 #include "SubField.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicTransform.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicTransform.C
index 8f96874f45..dd49bc2745 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicTransform.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicTransform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ void Foam::cyclicTransform::update()
             else
             {
                 const tensor R =
-                    quaternion(rotationAxis_, degToRad(rotationAngle_)).R();
+                    quaternion(rotationAxis_, rotationAngle_).R();
 
                 if (mag(rotationCentre_) == 0)
                 {
@@ -183,7 +183,7 @@ bool Foam::cyclicTransform::set
             {
                 if
                 (
-                    mag(degToRad(rotationAngle_ - sign(dot)*t.rotationAngle_))
+                    mag(rotationAngle_ - sign(dot)*t.rotationAngle_)
                   > matchTolerance
                 )
                 {
@@ -268,7 +268,10 @@ Foam::cyclicTransform::cyclicTransform
       ? dict.lookup<point>("rotationCentre")
       : point::uniform(NaN)
     ),
-    rotationAngle_(dict.lookupOrDefault<scalar>("rotationAngle", NaN)),
+    rotationAngle_
+    (
+        dict.lookupOrDefault<scalar>("rotationAngle", unitDegrees, NaN)
+    ),
     separation_
     (
         transformType_ == TRANSLATIONAL
@@ -461,8 +464,7 @@ Foam::cyclicTransform::cyclicTransform
             const scalar theta =
                 acos(min(max(normalPerpA & negNbrNormalPerpA, -1), 1));
             rotationAngle_ =
-              - sign((normalPerpA ^ negNbrNormalPerpA) & rotationAxis_)
-               *radToDeg(theta);
+              - sign((normalPerpA ^ negNbrNormalPerpA) & rotationAxis_)*theta;
 
             // Calculate the angle
             // Calculate the centre of rotation, if necessary
@@ -560,7 +562,7 @@ void Foam::cyclicTransform::write(Ostream& os) const
 
         if (transformComplete_)
         {
-            writeEntry(os, "rotationAngle", rotationAngle_);
+            writeEntry(os, "rotationAngle", unitDegrees, rotationAngle_);
         }
     }
 
diff --git a/src/OpenFOAM/primitives/Tuple2/Tuple2.H b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
index 3a26391e0d..dcde73147f 100644
--- a/src/OpenFOAM/primitives/Tuple2/Tuple2.H
+++ b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,9 @@ namespace Foam
 template<class Type1, class Type2>
 class Tuple2;
 
+template<class Type1, class Type2>
+void writeEntry(Ostream& os, const Tuple2<Type1, Type2>&);
+
 template<class Type1, class Type2>
 inline Istream& operator>>(Istream&, Tuple2<Type1, Type2>&);
 
@@ -227,6 +230,13 @@ inline Ostream& operator<<(Ostream& os, const Tuple2<Type1, Type2>& t2)
 }
 
 
+template<class Type1, class Type2>
+void writeEntry(Ostream& os, const Tuple2<Type1, Type2>& t2)
+{
+    os << t2;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
index 67b0fe5834..12d5440ee1 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
@@ -98,7 +98,7 @@ Foam::Function1s::Coded<Type>::compileNew()
     dictionary redirectDict(codeDict());
     redirectDict.set(codeName(), codeName());
 
-    return Function1<Type>::New(codeName(), redirectDict);
+    return Function1<Type>::New(codeName(), unitAny, unitAny, redirectDict);
 }
 
 
@@ -108,11 +108,13 @@ template<class Type>
 Foam::Function1s::Coded<Type>::Coded
 (
     const word& name,
+    const Function1s::unitConversions& units,
     const dictionary& dict
 )
 :
     Function1<Type>(name),
-    codedBase(dict)
+    codedBase(dict),
+    units_(units)
 {
     redirectFunction1Ptr_ = compileNew();
 }
@@ -123,7 +125,8 @@ template<class Type>
 Foam::Function1s::Coded<Type>::Coded(const Coded<Type>& cf1)
 :
     Function1<Type>(cf1),
-    codedBase(cf1)
+    codedBase(cf1),
+    units_(cf1.units_)
 {
     redirectFunction1Ptr_ = compileNew();
 }
@@ -151,7 +154,14 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1s::Coded<Type>::value
     const scalarField& x
 ) const
 {
-    return redirectFunction1Ptr_->value(x);
+    return
+        units_.value.toStandard
+        (
+            redirectFunction1Ptr_->value
+            (
+                units_.x.toUser(x)
+            )
+        );
 }
 
 
@@ -180,7 +190,11 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1s::Coded<Type>::integral
 
 
 template<class Type>
-void Foam::Function1s::Coded<Type>::write(Ostream& os) const
+void Foam::Function1s::Coded<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeCode(os);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
index afc0a8c421..201fd84c56 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
@@ -92,6 +92,9 @@ class Coded
         //- The dynamically generated Function1 pointer
         mutable autoPtr<Function1<Type>> redirectFunction1Ptr_;
 
+        //- Cache of the unit conversions
+        const unitConversions units_;
+
 
     // Private Member Functions
 
@@ -123,6 +126,7 @@ public:
         Coded
         (
             const word& name,
+            const Function1s::unitConversions& units,
             const dictionary& dict
         );
 
@@ -156,7 +160,7 @@ public:
         ) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1I.H b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1I.H
index 86b297e061..60ef43c73d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1I.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,14 @@ inline Type Foam::Function1s::Coded<Type>::value(const scalar x) const
     // Make sure library containing user-defined Function1 is up-to-date
     this->updateLibrary();
 
-    return redirectFunction1Ptr_->value(x);
+    return
+        units_.value.toStandard
+        (
+            redirectFunction1Ptr_->value
+            (
+                units_.x.toUser(x)
+            )
+        );
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index fdd282e32b..77aa17749b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,33 @@ License
 
 #include "Constant.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::Function1s::Constant<Type>::readValue
+(
+    const unitConversions& defaultUnits,
+    Istream& is
+)
+{
+    // Read the units if they are before the value
+    unitConversion units(defaultUnits.value);
+    const bool haveUnits = units.readIfPresent(is);
+
+    // Read the value
+    const Type value = pTraits<Type>(is);
+
+    // Read the units if they are after the value
+    if (!haveUnits && !is.eof())
+    {
+        units.readIfPresent(is);
+    }
+
+    // Modify the value by the unit conversion and return
+    return units.toStandard(value);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -43,11 +70,12 @@ template<class Type>
 Foam::Function1s::Constant<Type>::Constant
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<Type, Constant<Type>>(name),
-    value_(dict.lookup<Type>("value"))
+    value_(dict.lookup<Type>("value", units.value))
 {}
 
 
@@ -55,11 +83,12 @@ template<class Type>
 Foam::Function1s::Constant<Type>::Constant
 (
     const word& name,
+    const unitConversions& units,
     Istream& is
 )
 :
     FieldFunction1<Type, Constant<Type>>(name),
-    value_(pTraits<Type>(is))
+    value_(readValue(units, is))
 {}
 
 
@@ -81,9 +110,13 @@ Foam::Function1s::Constant<Type>::~Constant()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Constant<Type>::write(Ostream& os) const
+void Foam::Function1s::Constant<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, "value", value_);
+    writeEntry(os, "value", units.value, value_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index 8356558e08..b0f97163a5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,6 +65,12 @@ class Constant
         const Type value_;
 
 
+    // Private Member Functions
+
+        //- Read the value
+        static Type readValue(const unitConversions& units, Istream& is);
+
+
 public:
 
     // Runtime type information
@@ -77,12 +83,15 @@ public:
         Constant(const word& name, const Type& val);
 
         //- Construct from name and dictionary
-        Constant(const word& name, const dictionary& dict);
+        Constant
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Construct from name and Istream
-        //  Reads the constant value without the Function1 type
-        //  for backward compatibility
-        Constant(const word& name, Istream& is);
+        Constant(const word& name, const unitConversions& units, Istream& is);
 
         //- Copy constructor
         Constant(const Constant<Type>& cnst);
@@ -110,7 +119,7 @@ public:
         virtual inline bool constant() const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1.C b/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1.C
deleted file mode 100644
index d43d54d1fc..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1.C
+++ /dev/null
@@ -1,244 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DimensionedFunction1.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-inline dimensionedScalar readUnits(Istream& is)
-{
-    scalar multiplier;
-
-    dimensionSet d(dimless);
-    d.read(is, multiplier);
-
-    return dimensionedScalar(d, multiplier);
-}
-
-
-inline void setUnits
-(
-    Istream& is,
-    const word& prefix,
-    const dimensionedScalar& from,
-    dimensionedScalar& to
-)
-{
-    to.name() =
-        prefix + (prefix.empty() ? 'u' : 'U') + "nits";
-
-    if (from.dimensions() != to.dimensions())
-    {
-        FatalIOErrorInFunction(is)
-            << "The " << prefix << (prefix.empty() ? "" : "-")
-            << "dimensions " << from.dimensions()
-            << " provided do not match the required "
-            << "dimensions " << to.dimensions()
-            << exit(FatalIOError);
-    }
-
-    to.value() = from.value();
-}
-
-
-inline void readAndSetUnits
-(
-    Istream& is,
-    const word& prefix,
-    dimensionedScalar& units
-)
-{
-    setUnits(is, prefix, readUnits(is), units);
-}
-
-
-inline void lookupUnitsIfPresent
-(
-    const dictionary& dict,
-    const word& prefix,
-    dimensionedScalar& units
-)
-{
-    const word unitsKey =
-        prefix + (prefix.empty() ? 'u' : 'U') + "nits";
-    const word dimsKey =
-        prefix + (prefix.empty() ? 'd' : 'D') + "imensions";
-
-    const bool haveUnits = dict.found(unitsKey);
-    const bool haveDims = dict.found(dimsKey);
-
-    if (haveUnits && haveDims)
-    {
-        FatalIOErrorInFunction(dict)
-            << "Both " << unitsKey << " and " << dimsKey
-            << " are specified. Only one is permitted."
-            << exit(FatalError);
-    }
-
-    if (haveUnits)
-    {
-        units = dimensionedScalar(unitsKey, units.dimensions(), dict);
-    }
-
-    if (haveDims)
-    {
-        readAndSetUnits(dict.lookup(dimsKey), prefix, units);
-    }
-}
-
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1s::Dimensioned<Type>::Dimensioned
-(
-    const word& name,
-    const dimensionSet& xDimensions,
-    const dimensionSet& dimensions,
-    const dictionary& dict
-)
-:
-    FieldFunction1<Type, Dimensioned<Type>>(name),
-    xUnits_(word::null, xDimensions, scalar(1)),
-    units_(word::null, dimensions, scalar(1)),
-    value_(nullptr)
-{
-    // If the function is a dictionary (preferred) then read straightforwardly
-    if (dict.isDict(name))
-    {
-        const dictionary& coeffsDict(dict.subDict(name));
-
-        lookupUnitsIfPresent(coeffsDict, "x", xUnits_);
-        lookupUnitsIfPresent(coeffsDict, "", units_);
-
-        value_.reset(Function1<Type>::New(name, dict).ptr());
-
-        return;
-    }
-
-    // Find the entry
-    Istream& is(dict.lookup(name));
-
-    // Peek at the first token
-    token firstToken(is);
-    is.putBack(firstToken);
-
-    // Read the type, or assume constant
-    const word Function1Type =
-        firstToken.isWord() ? word(is) : Constant<Type>::typeName;
-
-    // If the entry is not a type followed by a end statement then
-    // construct the function from the stream
-    if (!firstToken.isWord() || !is.eof())
-    {
-        PtrList<dimensionedScalar> units;
-
-        // Peek at the next token and read the units, if provided
-        token nextToken(is);
-        is.putBack(nextToken);
-        if (nextToken == token::BEGIN_SQR)
-        {
-            units.append(new dimensionedScalar(readUnits(is)));
-
-            // And again ...
-            token nextToken(is);
-            is.putBack(nextToken);
-            if (nextToken == token::BEGIN_SQR)
-            {
-                units.append(new dimensionedScalar(readUnits(is)));
-            }
-        }
-
-        // Set the units. If there is just one, then just take this to be the
-        // value units. If two, then the first is the argument units and the
-        // second is the value units.
-        if (units.size() == 2) setUnits(is, "x", units.first(), xUnits_);
-        if (units.size() >= 1) setUnits(is, "", units.last(), units_);
-
-        // Construct from a stream
-        value_.reset(Function1<Type>::New(name, Function1Type, is).ptr());
-
-        return;
-    }
-
-    // Otherwise, construct from the current or coeffs dictionary
-    const dictionary& coeffsDict =
-        dict.optionalSubDict(name + "Coeffs");
-
-    lookupUnitsIfPresent(coeffsDict, "x", xUnits_);
-    lookupUnitsIfPresent(coeffsDict, "", units_);
-
-    value_.reset(Function1<Type>::New(name, dict).ptr());
-}
-
-
-template<class Type>
-Foam::Function1s::Dimensioned<Type>::Dimensioned(const Dimensioned<Type>& df1)
-:
-    FieldFunction1<Type, Dimensioned<Type>>(df1),
-    xUnits_(df1.xUnits_),
-    units_(df1.units_),
-    value_(df1.value_, false)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1s::Dimensioned<Type>::~Dimensioned()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1s::Dimensioned<Type>::write(Ostream& os) const
-{
-    if (xUnits_.name() != word::null)
-    {
-        writeKeyword(os, xUnits_.name());
-        writeEntry(os, xUnits_.dimensions());
-        os << token::SPACE;
-        writeEntry(os, xUnits_.value());
-        os << token::END_STATEMENT << endl;
-    }
-    if (units_.name() != word::null)
-    {
-        writeKeyword(os, units_.name());
-        writeEntry(os, units_.dimensions());
-        os << token::SPACE;
-        writeEntry(os, units_.value());
-        os << token::END_STATEMENT << endl;
-    }
-    value_().write(os);
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1.H b/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1.H
deleted file mode 100644
index 38d0104198..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1.H
+++ /dev/null
@@ -1,191 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::Function1s::Dimensioned
-
-Description
-    Function1 with dimensions.
-
-    The dimensions are specified in the constructing code, in much the same way
-    as for a dimensioned constant, except that both argument (x) and value
-    dimensions must be specified.
-
-    This can be used identically to a standard Function1. In addition, it also
-    permits specification of the dimensions. This allows the dimensions to be
-    checked. It also permits unit conversions.
-
-Usage
-    <name>
-    {
-        type        table;
-
-        // Dimensions
-        xDimensions [CAD];  // Optional. Argument dimensions/units.
-                            // Here, this specifies coordinates are in
-                            // crank angle degrees (available if using
-                            // engine time).
-        dimensions  [mm];   // Optional. Value dimensions/units.
-                            // Here, values are in mm.
-
-        // Tabulated data
-        values
-        (
-            (0 0)
-            (60 12)         // <-- i.e., 12 mm at 60 degrees
-            (180 20)
-            (240 8)
-            (360 0)
-        );
-        outOfBounds repeat;
-    }
-
-SourceFiles
-    DimensionedFunction1.C
-    DimensionedFunction1I.H
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef DimensionedFunction1_H
-#define DimensionedFunction1_H
-
-#include "Function1.H"
-#include "dimensionedType.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace Function1s
-{
-
-/*---------------------------------------------------------------------------*\
-                            Class Dimensioned Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class Dimensioned
-:
-    public FieldFunction1<Type, Dimensioned<Type>>
-{
-    // Private Data
-
-        //- Argument dimensions
-        dimensionedScalar xUnits_;
-
-        //- Value dimensions
-        dimensionedScalar units_;
-
-        //- Value function
-        autoPtr<Function1<Type>> value_;
-
-
-public:
-
-    // Runtime type information
-    virtual const word& type() const
-    {
-        return value_->type();
-    }
-
-
-    // Constructors
-
-        //- Construct from name and dictionary. Note that this is the outer
-        //  dictionary, not the coefficients dictionary, as is the case for
-        //  most/all other Function1-s.
-        Dimensioned
-        (
-            const word& name,
-            const dimensionSet& xDimensions,
-            const dimensionSet& dimensions,
-            const dictionary& dict
-        );
-
-        //- Copy constructor
-        Dimensioned(const Dimensioned<Type>& se);
-
-
-    //- Destructor
-    virtual ~Dimensioned();
-
-
-    // Member Functions
-
-        //- Return a value
-        virtual inline Type value(const scalar x) const;
-
-        //- Integrate between two values
-        virtual inline Type integral(const scalar x1, const scalar x2) const;
-
-        //- Inherit field value evaluation
-        using FieldFunction1<Type, Dimensioned<Type>>::value;
-
-        //- Inherit field integral evaluation
-        using FieldFunction1<Type, Dimensioned<Type>>::integral;
-
-        //- Return a dimensioned value
-        virtual inline dimensioned<Type> value
-        (
-            const dimensionedScalar& x
-        ) const;
-
-        //- Integrate between two dimensioned values
-        virtual inline dimensioned<Type> integral
-        (
-            const dimensionedScalar& x1,
-            const dimensionedScalar& x2
-        ) const;
-
-        //- Is this function guaranteed to be constant?
-        virtual inline bool constant() const;
-
-        //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
-
-
-    // Member Operators
-
-        //- Disallow default bitwise assignment
-        void operator=(const Dimensioned<Type>&) = delete;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Function1s
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "DimensionedFunction1I.H"
-
-#ifdef NoRepository
-    #include "DimensionedFunction1.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1I.H b/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1I.H
deleted file mode 100644
index 10cf0b7771..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Dimensioned/DimensionedFunction1I.H
+++ /dev/null
@@ -1,96 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DimensionedFunction1.H"
-#include "dimensionedType.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-inline Type Foam::Function1s::Dimensioned<Type>::value(const scalar x) const
-{
-    return
-        value_->value(x/xUnits_.value())
-       *units_.value();
-}
-
-
-template<class Type>
-inline Type Foam::Function1s::Dimensioned<Type>::integral
-(
-    const scalar x1,
-    const scalar x2
-) const
-{
-    return
-        value_->integral(x1/xUnits_.value(), x2/xUnits_.value())
-       *xUnits_.value()*units_.value();
-}
-
-
-template<class Type>
-inline Foam::dimensioned<Type> Foam::Function1s::Dimensioned<Type>::value
-(
-    const dimensionedScalar& x
-) const
-{
-    x.dimensions() = xUnits_.dimensions();
-
-    return
-        dimensioned<Type>
-        (
-            units_.dimensions(),
-            value(x.value())
-        );
-}
-
-
-template<class Type>
-inline Foam::dimensioned<Type> Foam::Function1s::Dimensioned<Type>::integral
-(
-    const dimensionedScalar& x1,
-    const dimensionedScalar& x2
-) const
-{
-    x1.dimensions() = xUnits_.dimensions();
-    x2.dimensions() = xUnits_.dimensions();
-
-    return
-        dimensioned<Type>
-        (
-            units_.dimensions()*xUnits_.dimensions(),
-            integral(x1.value(), x2.value())
-        );
-}
-
-
-template<class Type>
-inline bool Foam::Function1s::Dimensioned<Type>::constant() const
-{
-    return value_->constant();
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index 07f52f2524..5ca8c9546a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "Function1.H"
 
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -44,10 +43,7 @@ Foam::Function1<Type>::Function1(const Function1<Type>& f1)
 
 
 template<class Type, class Function1Type>
-Foam::FieldFunction1<Type, Function1Type>::FieldFunction1
-(
-    const word& name
-)
+Foam::FieldFunction1<Type, Function1Type>::FieldFunction1(const word& name)
 :
     Function1<Type>(name)
 {}
@@ -149,34 +145,52 @@ void Foam::Function1<Type>::operator=(const Function1<Type>& f)
 
 template<class Type>
 void Foam::writeEntry(Ostream& os, const Function1<Type>& f1)
+{
+    writeEntry(os, {unitAny, unitAny}, f1);
+}
+
+
+template<class Type>
+void Foam::writeEntry
+(
+    Ostream& os,
+    const Function1s::unitConversions& units,
+    const Function1<Type>& f1
+)
 {
     writeKeyword(os, f1.name())
         << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
 
     writeEntry(os, "type", f1.type());
 
-    f1.write(os);
+    f1.write(os, units);
 
     os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 
 
+template<class Type>
+void Foam::writeEntry
+(
+    Ostream& os,
+    const unitConversion& xUnits,
+    const unitConversion& valueUnits,
+    const Function1<Type>& f1
+)
+{
+    writeEntry(os, {xUnits, valueUnits}, f1);
+}
+
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Function1<Type>& f1
-)
+Foam::Ostream& Foam::operator<<(Ostream& os, const Function1<Type>& f1)
 {
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const Function1<Type>&)"
-    );
+    f1.write(os, {unitAny, unitAny});
 
-    f1.write(os);
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const Function1<Type>&)");
 
     return os;
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index dced788b14..8212d1fc72 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,6 +40,7 @@ SourceFiles
 #define Function1_H
 
 #include "dictionary.H"
+#include "unitConversion.H"
 #include "tmp.H"
 #include "typeInfo.H"
 #include "Field.H"
@@ -54,6 +55,66 @@ namespace Foam
 template<class Type> class Function1;
 template<class Type> Ostream& operator<<(Ostream&, const Function1<Type>&);
 
+/*---------------------------------------------------------------------------*\
+                Class Function1s::unitConversions Declaration
+\*---------------------------------------------------------------------------*/
+
+namespace Function1s
+{
+struct unitConversions
+{
+    // Public Data
+
+        //- Unit conversion for x-axis values
+        unitConversion x;
+
+        //- Unit conversion for result values
+        unitConversion value;
+
+
+    // Constructors
+
+        //- Construct from initialiser list
+        unitConversions(std::initializer_list<unitConversion>);
+
+        //- Construct from stream
+        unitConversions(Istream& is);
+
+        //- Construct a clone
+        autoPtr<unitConversions> clone() const;
+
+
+    // Member Functions
+
+        //- Update if found in the dictionary
+        bool readIfPresent(const word& keyword, const dictionary&);
+};
+}
+
+
+// Global Functions
+
+//- Generate an error in an context where unit conversions are not supported
+void assertNoConvertUnits
+(
+    const word& typeName,
+    const Function1s::unitConversions& units,
+    const dictionary& dict
+);
+
+//- Write a units entry
+void writeEntry(Ostream& os, const Function1s::unitConversions& units);
+
+
+// IOStream Operators
+
+//- Read from stream
+Istream& operator>>(Istream& is, Function1s::unitConversions&);
+
+//- Write to stream
+Ostream& operator<<(Ostream& os, const Function1s::unitConversions&);
+
+
 /*---------------------------------------------------------------------------*\
                           Class Function1 Declaration
 \*---------------------------------------------------------------------------*/
@@ -90,9 +151,10 @@ public:
             dictionary,
             (
                 const word& name,
+                const Function1s::unitConversions& units,
                 const dictionary& dict
             ),
-            (name, dict)
+            (name, units, dict)
         );
 
         declareRunTimeSelectionTable
@@ -102,9 +164,10 @@ public:
             Istream,
             (
                 const word& name,
+                const Function1s::unitConversions& units,
                 Istream& is
             ),
-            (name, is)
+            (name, units, is)
         );
 
 
@@ -126,6 +189,16 @@ public:
         static autoPtr<Function1<Type>> New
         (
             const word& name,
+            const Function1s::unitConversions& units,
+            const dictionary& dict
+        );
+
+        //- Select from dictionary
+        static autoPtr<Function1<Type>> New
+        (
+            const word& name,
+            const unitConversion& xUnits,
+            const unitConversion& valueUnits,
             const dictionary& dict
         );
 
@@ -133,6 +206,17 @@ public:
         static autoPtr<Function1<Type>> New
         (
             const word& name,
+            const Function1s::unitConversions& units,
+            const word& Function1Type,
+            Istream& is
+        );
+
+        //- Select from Istream
+        static autoPtr<Function1<Type>> New
+        (
+            const word& name,
+            const unitConversion& xUnits,
+            const unitConversion& valueUnits,
             const word& Function1Type,
             Istream& is
         );
@@ -167,7 +251,11 @@ public:
         virtual bool constant() const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const = 0;
+        virtual void write
+        (
+            Ostream& os,
+            const Function1s::unitConversions&
+        ) const = 0;
 
 
     // Member Operators
@@ -190,6 +278,23 @@ public:
 template<class Type>
 void writeEntry(Ostream& os, const Function1<Type>& f1);
 
+template<class Type>
+void writeEntry
+(
+    Ostream& os,
+    const Function1s::unitConversions& units,
+    const Function1<Type>& f1
+);
+
+template<class Type>
+void writeEntry
+(
+    Ostream& os,
+    const unitConversion& xUnits,
+    const unitConversion& valueUnits,
+    const Function1<Type>& f1
+);
+
 
 /*---------------------------------------------------------------------------*\
                        Class FieldFunction1 Declaration
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H
index 7b1146e819..b9c9b64331 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,21 +27,17 @@ License
 #define Function1Fwd_H
 
 #include "Function1.H"
-#include "vector.H"
-#include "symmTensor.H"
-#include "sphericalTensor.H"
-#include "tensor.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef Function1<label> labelFunction1;
-    typedef Function1<scalar> scalarFunction1;
-    typedef Function1<vector> vectorFunction1;
-    typedef Function1<symmTensor> symmTensorFunction1;
-    typedef Function1<sphericalTensor> sphericalTensorFunction1;
-    typedef Function1<tensor> tensorFunction1;
+    #define TYPEDEF_TYPE_FUNCTION1(Type, nullArg) \
+        typedef Function1<Type> Type##Function1;
+    FOR_ALL_FIELD_TYPES(TYPEDEF_TYPE_FUNCTION1);
+    TYPEDEF_TYPE_FUNCTION1(label, );
+    #undef TYPEDEF_TYPE_FUNCTION1
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
index bea72951ae..758b299554 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
 (
     const word& name,
+    const Function1s::unitConversions& units,
     const dictionary& dict
 )
 {
@@ -55,7 +56,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
                 << exit(FatalError);
         }
 
-        return cstrIter()(name, coeffsDict);
+        return cstrIter()(name, units, coeffsDict);
     }
 
     // Find the entry
@@ -73,7 +74,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
     // construct the function from the stream
     if (!firstToken.isWord() || !is.eof())
     {
-        return New(name, Function1Type, is);
+        return New(name, units, Function1Type, is);
     }
 
     // Otherwise, construct from the current or coeffs dictionary
@@ -98,6 +99,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
         dictCstrIter()
         (
             name,
+            units,
             haveCoeffsDict ? dict.subDict(name + "Coeffs") : dict
         )
     );
@@ -108,7 +110,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
             << "Using deprecated "
             << (name + "Coeffs") << " sub-dictionary."<< nl
             << "    Please use the simpler form" << endl;
-        funcPtr->write(Info);
+        funcPtr->write(Info, units);
     }
 
     return funcPtr;
@@ -119,6 +121,20 @@ template<class Type>
 Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
 (
     const word& name,
+    const unitConversion& xUnits,
+    const unitConversion& valueUnits,
+    const dictionary& dict
+)
+{
+    return New(name, {xUnits, valueUnits}, dict);
+}
+
+
+template<class Type>
+Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
+(
+    const word& name,
+    const Function1s::unitConversions& units,
     const word& Function1Type,
     Istream& is
 )
@@ -154,7 +170,21 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
             << exit(FatalError);
     }
 
-    return isCstrIter()(name, is);
+    return isCstrIter()(name, units, is);
+}
+
+
+template<class Type>
+Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
+(
+    const word& name,
+    const unitConversion& xUnits,
+    const unitConversion& valueUnits,
+    const word& Function1Type,
+    Istream& is
+)
+{
+    return New(name, {xUnits, valueUnits}, Function1Type, is);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1UnitConversions.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1UnitConversions.C
new file mode 100644
index 0000000000..d4dac7a034
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1UnitConversions.C
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Function1.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::Function1s::unitConversions::unitConversions
+(
+    std::initializer_list<unitConversion> l
+)
+:
+    x(dimless),
+    value(dimless)
+{
+    auto i = l.begin();
+    x.reset(*i);
+    value.reset(*(++i));
+}
+
+
+Foam::Function1s::unitConversions::unitConversions(Istream& is)
+:
+    x(dimless),
+    value(dimless)
+{
+    is >> *this;
+}
+
+
+Foam::autoPtr<Foam::Function1s::unitConversions>
+Foam::Function1s::unitConversions::clone() const
+{
+    return autoPtr<unitConversions>(new unitConversions(*this));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::Function1s::unitConversions::readIfPresent
+(
+    const word& keyword,
+    const dictionary& dict
+)
+{
+    const entry* entryPtr = dict.lookupEntryPtr(keyword, false, true);
+
+    if (entryPtr)
+    {
+        ITstream& is = entryPtr->stream();
+
+        is.readBegin("unitConversions");
+        x.readIfPresent(keyword, dict, is);
+        value.readIfPresent(keyword, dict, is);
+        is.readEnd("unitConversions");
+
+        return true;
+    }
+    else
+    {
+        if (dictionary::writeOptionalEntries)
+        {
+            IOInfoInFunction(dict)
+                << "Optional entry '" << keyword << "' is not present,"
+                << " the default value '" << token::BEGIN_LIST << x.info()
+                << token::SPACE << value.info() << token::END_LIST
+                << "' will be used." << endl;
+        }
+
+        return false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+void Foam::assertNoConvertUnits
+(
+    const word& typeName,
+    const Function1s::unitConversions& units,
+    const dictionary& dict
+)
+{
+    if (!units.x.standard() || !units.value.standard())
+    {
+        FatalIOErrorInFunction(dict)
+            << "Unit conversions are not supported by "
+            << typeName << " function1 types" << abort(FatalError);
+    }
+}
+
+
+void Foam::writeEntry(Ostream& os, const Function1s::unitConversions& units)
+{
+    os << units;
+}
+
+
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    Function1s::unitConversions& units
+)
+{
+    is.readBegin("unitConversions");
+    is >> units.x >> units.value;
+    is.readEnd("unitConversions");
+
+    is.check("Istream& operator>>(Istream&, unitConversions&)");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const Function1s::unitConversions& units
+)
+{
+    os  << token::BEGIN_LIST
+        << units.x << token::SPACE << units.value
+        << token::END_LIST;
+
+    os.check("Ostream& operator<<(Ostream&, const unitConversions&)");
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.C b/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.C
index 2f0fd974bd..ac8e668d24 100644
--- a/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function1s::NonUniformTable<Type>::NonUniformTable
 (
     const word& name,
+    const Function1s::unitConversions& units,
     const dictionary& dict
 )
 :
@@ -39,9 +40,11 @@ Foam::Function1s::NonUniformTable<Type>::NonUniformTable
     high_(-great),
     values_(),
     delta_(great),
-    reader_(TableReader<Type>::New(name, dict))
+    reader_(TableReader<Type>::New(name, units, dict))
 {
-    values_ = reader_->read(dict);
+    assertNoConvertUnits(typeName, units, dict);
+
+    values_ = reader_->read(units, dict);
 
     if (values_.size() < 2)
     {
@@ -142,9 +145,13 @@ Type Foam::Function1s::NonUniformTable<Type>::dfdT
 
 
 template<class Type>
-void Foam::Function1s::NonUniformTable<Type>::write(Ostream& os) const
+void Foam::Function1s::NonUniformTable<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    reader_->write(os, values_);
+    reader_->write(os, units, values_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.H b/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.H
index 464d50834b..aa200bc32e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/NonUniformTable1/NonUniformTable1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        NonUniformTable(const word& name, const dictionary& dict);
+        NonUniformTable
+        (
+            const word& name,
+            const Function1s::unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Copy constructor
         NonUniformTable(const NonUniformTable<Type>& nut);
@@ -139,7 +144,7 @@ public:
         Type dfdT(scalar T) const;
 
         //- Write the function coefficients
-        void write(Ostream& os) const;
+        void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/None/None.C b/src/OpenFOAM/primitives/functions/Function1/None/None.C
index 5f899088f0..d2b560bd65 100644
--- a/src/OpenFOAM/primitives/functions/Function1/None/None.C
+++ b/src/OpenFOAM/primitives/functions/Function1/None/None.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function1s::None<Type>::None
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -75,7 +76,11 @@ Type Foam::Function1s::None<Type>::integral(const scalar, const scalar) const
 
 
 template<class Type>
-void Foam::Function1s::None<Type>::write(Ostream& os) const
+void Foam::Function1s::None<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/None/None.H b/src/OpenFOAM/primitives/functions/Function1/None/None.H
index bfb5fa9342..2c36c1efef 100644
--- a/src/OpenFOAM/primitives/functions/Function1/None/None.H
+++ b/src/OpenFOAM/primitives/functions/Function1/None/None.H
@@ -65,7 +65,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        None(const word& name, const dictionary& dict);
+        None
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     //- Destructor
@@ -81,7 +86,7 @@ public:
         virtual Type integral(const scalar x1, const scalar x2) const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
index bc89b4a829..4402b6f84e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,7 @@ template<class Type>
 Foam::Function1s::OneConstant<Type>::OneConstant
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -55,7 +56,11 @@ Foam::Function1s::OneConstant<Type>::~OneConstant()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::OneConstant<Type>::write(Ostream& os) const
+void Foam::Function1s::OneConstant<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
index 11b138e826..ea2c4b300b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,12 @@ public:
         OneConstant(const word& name);
 
         //- Construct from name and dictionary
-        OneConstant(const word& name, const dictionary& dict);
+        OneConstant
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     //- Destructor
@@ -87,7 +92,7 @@ public:
         virtual inline Type integral(const scalar x1, const scalar x2) const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.C b/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.C
index 521a135dcf..8e1572184c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.C
@@ -25,17 +25,63 @@ License
 
 #include "Polynomial1.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Foam::List<Type> Foam::Function1s::Polynomial<Type>::convertRead
+(
+    const unitConversions& units,
+    List<Type> coeffs
+)
+{
+    unitConversion unitsXPowI(units.x);
+    forAll(coeffs, i)
+    {
+        coeffs[i] = units.value.toStandard(unitsXPowI.toUser(coeffs[i]));
+        unitsXPowI.reset(units.x*unitsXPowI);
+    }
+    return coeffs;
+}
+
+
+template<class Type>
+Foam::List<Type> Foam::Function1s::Polynomial<Type>::convertWrite
+(
+    const unitConversions& units,
+    List<Type> coeffs
+)
+{
+    unitConversion unitsXPowI(units.x);
+    forAll(coeffs, i)
+    {
+        coeffs[i] = units.value.toUser(unitsXPowI.toStandard(coeffs[i]));
+        unitsXPowI.reset(units.x*unitsXPowI);
+    }
+    return coeffs;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::Function1s::Polynomial<Type>::Polynomial
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<Type, Polynomial<Type>>(name),
-    coeffs_(dict.lookup("coeffs"))
+    coeffs_
+    (
+        convertRead
+        (
+            dict.found("units")
+          ? Function1s::unitConversions(dict.lookup("units"))
+          : units,
+            dict.lookup("coeffs")
+        )
+    )
 {
     if (!coeffs_.size())
     {
@@ -51,11 +97,12 @@ template<class Type>
 Foam::Function1s::Polynomial<Type>::Polynomial
 (
     const word& name,
+    const unitConversions& units,
     Istream& is
 )
 :
     FieldFunction1<Type, Polynomial<Type>>(name),
-    coeffs_(is)
+    coeffs_(convertRead(units, is))
 {
     if (!coeffs_.size())
     {
@@ -118,9 +165,15 @@ Type Foam::Function1s::Polynomial<Type>::integral
 
 
 template<class Type>
-void Foam::Function1s::Polynomial<Type>::write(Ostream& os) const
+void Foam::Function1s::Polynomial<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeKeyword(os, "coeffs") << coeffs_ << token::END_STATEMENT << nl;
+    writeKeyword(os, "coeffs")
+        << convertWrite(units, coeffs_)
+        << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.H b/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.H
index 1c8b35508f..0ed65e0fc1 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial1/Polynomial1.H
@@ -78,6 +78,15 @@ class Polynomial
         const List<Type> coeffs_;
 
 
+    // Private Member Functions
+
+        //- Do unit conversions on input data
+        static List<Type> convertRead(const unitConversions&, List<Type>);
+
+        //- Do unit conversions in order to output data
+        static List<Type> convertWrite(const unitConversions&, List<Type>);
+
+
 public:
 
     //- Runtime type information
@@ -87,10 +96,20 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        Polynomial(const word& name, const dictionary& dict);
+        Polynomial
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Construct from name and Istream
-        Polynomial(const word& name, Istream& is);
+        Polynomial
+        (
+            const word& name,
+            const unitConversions& units,
+            Istream& is
+        );
 
         //- Copy constructor
         Polynomial(const Polynomial& poly);
@@ -112,7 +131,7 @@ public:
 
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
index 16482417bf..4647807a3d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
@@ -31,12 +31,13 @@ template<class Function1Type>
 Foam::Function1s::Ramp<Function1Type>::Ramp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<scalar, Function1Type>(name),
-    start_(dict.lookupOrDefault<scalar>("start", 0)),
-    duration_(dict.lookup<scalar>("duration"))
+    start_(dict.lookupOrDefault<scalar>("start", units.x, 0)),
+    duration_(dict.lookup<scalar>("duration", units.x))
 {}
 
 
@@ -50,10 +51,14 @@ Foam::Function1s::Ramp<Function1Type>::~Ramp()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Function1Type>
-void Foam::Function1s::Ramp<Function1Type>::write(Ostream& os) const
+void Foam::Function1s::Ramp<Function1Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, "start", start_);
-    writeEntry(os, "duration", duration_);
+    writeEntry(os, "start", units.x, start_);
+    writeEntry(os, "duration", units.x, duration_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
index b194892ebf..bb20ba5b42 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
@@ -142,6 +142,7 @@ public:
         Ramp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -156,7 +157,7 @@ public:
         virtual scalar value(const scalar t) const = 0;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
index 43380748c3..7e8b598309 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
@@ -49,18 +49,19 @@ template<class Type>
 Foam::Function1s::Scale<Type>::Scale
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<Type, Scale<Type>>(name),
-    scale_(Function1<scalar>::New("scale", dict)),
+    scale_(Function1<scalar>::New("scale", units.x, unitless, dict)),
     xScale_
     (
         dict.found("xScale")
-      ? Function1<scalar>::New("xScale", dict)
+      ? Function1<scalar>::New("xScale", units.x, units.x, dict)
       : autoPtr<Function1<scalar>>(new Constant<scalar>("xScale", 1))
     ),
-    value_(Function1<Type>::New("value", dict)),
+    value_(Function1<Type>::New("value", units, dict)),
     integrableScale_(xScale_->constant() && scale_->constant()),
     integrableValue_(xScale_->constant() && value_->constant())
 {}
@@ -88,11 +89,15 @@ Foam::Function1s::Scale<Type>::~Scale()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Scale<Type>::write(Ostream& os) const
+void Foam::Function1s::Scale<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, scale_());
-    writeEntry(os, xScale_());
-    writeEntry(os, value_());
+    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/Scale/Scale.H b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
index 116d821202..5080e870f6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
@@ -177,6 +177,7 @@ public:
         Scale
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -200,7 +201,7 @@ public:
         virtual inline bool constant() const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index a5499fbd29..59729440b6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -31,14 +31,15 @@ template<class Type>
 Foam::Function1s::Sine<Type>::Sine
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<Type, Sine<Type>>(name),
-    amplitude_(Function1<Type>::New("amplitude", dict)),
-    frequency_(dict.lookup<scalar>("frequency")),
-    start_(dict.lookupOrDefault<scalar>("start", 0)),
-    level_(Function1<Type>::New("level", dict)),
+    amplitude_(Function1<Type>::New("amplitude", units, dict)),
+    frequency_(dict.lookup<scalar>("frequency", unitless/units.x)),
+    start_(dict.lookupOrDefault<scalar>("start", units.x, 0)),
+    level_(Function1<Type>::New("level", units, dict)),
     integrable_(amplitude_->constant() && level_->constant())
 {}
 
@@ -65,12 +66,16 @@ Foam::Function1s::Sine<Type>::~Sine()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Sine<Type>::write(Ostream& os) const
+void Foam::Function1s::Sine<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, amplitude_());
-    writeEntry(os, "frequency", frequency_);
-    writeEntry(os, "start", start_);
-    writeEntry(os, level_());
+    writeEntry(os, units, amplitude_());
+    writeEntry(os, "frequency", unitless/units.x, frequency_);
+    writeEntry(os, "start", units.x, start_);
+    writeEntry(os, units, level_());
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index 72dfa3b783..fa62b1be91 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -121,6 +121,7 @@ public:
         Sine
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -141,7 +142,7 @@ public:
         virtual inline Type integral(const scalar x1, const scalar x2) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
index 721872572c..3dc7d5e151 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
@@ -31,15 +31,16 @@ template<class Type>
 Foam::Function1s::Square<Type>::Square
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<Type, Square<Type>>(name),
-    amplitude_(Function1<Type>::New("amplitude", dict)),
-    frequency_(dict.lookup<scalar>("frequency")),
-    start_(dict.lookupOrDefault<scalar>("start", 0)),
-    level_(Function1<Type>::New("level", dict)),
-    markSpace_(dict.lookupOrDefault<scalar>("markSpace", 1)),
+    amplitude_(Function1<Type>::New("amplitude", units, dict)),
+    frequency_(dict.lookup<scalar>("frequency", unitless/units.x)),
+    start_(dict.lookupOrDefault<scalar>("start", units.x, 0)),
+    level_(Function1<Type>::New("level", units, dict)),
+    markSpace_(dict.lookupOrDefault<scalar>("markSpace", unitless, 1)),
     integrable_(amplitude_->constant() && level_->constant())
 {}
 
@@ -67,13 +68,17 @@ Foam::Function1s::Square<Type>::~Square()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Square<Type>::write(Ostream& os) const
+void Foam::Function1s::Square<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, amplitude_());
-    writeEntry(os, "frequency", frequency_);
-    writeEntry(os, "start", start_);
-    writeEntry(os, level_());
-    writeEntry(os, "markSpace", markSpace_);
+    writeEntry(os, units, amplitude_());
+    writeEntry(os, "frequency", unitless/units.x, frequency_);
+    writeEntry(os, "start", units.x, start_);
+    writeEntry(os, units, level_());
+    writeEntry(os, "markSpace", unitless, markSpace_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
index b6bc8bee76..3ebfd104a9 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -132,6 +132,7 @@ public:
         Square
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -152,7 +153,7 @@ public:
         virtual inline Type integral(const scalar x1, const scalar x2) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
index 692ed15b09..f7e5a14ff7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,6 +154,7 @@ template<class Type>
 Foam::Function1s::Table<Type>::Table
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -172,8 +173,8 @@ Foam::Function1s::Table<Type>::Table
             linearInterpolationWeights::typeName
         )
     ),
-    reader_(TableReader<Type>::New(name, dict)),
-    values_(reader_->read(dict))
+    reader_(TableReader<Type>::New(name, units, dict)),
+    values_(reader_->read(units, dict))
 {
     check();
 }
@@ -183,6 +184,7 @@ template<class Type>
 Foam::Function1s::Table<Type>::Table
 (
     const word& name,
+    const unitConversions& units,
     Istream& is
 )
 :
@@ -190,7 +192,7 @@ Foam::Function1s::Table<Type>::Table
     boundsHandling_(tableBase::boundsHandling::clamp),
     interpolationScheme_(linearInterpolationWeights::typeName),
     reader_(new TableReaders::Embedded<Type>()),
-    values_(is)
+    values_(TableReaders::Embedded<Type>().read(units, is))
 {
     check();
 }
@@ -314,7 +316,11 @@ Foam::Function1s::Table<Type>::y() const
 
 
 template<class Type>
-void Foam::Function1s::Table<Type>::write(Ostream& os) const
+void Foam::Function1s::Table<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntryIfDifferent
     (
@@ -332,7 +338,7 @@ void Foam::Function1s::Table<Type>::write(Ostream& os) const
         interpolationScheme_
     );
 
-    reader_->write(os, values_);
+    reader_->write(os, units, values_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index fd50fa2b9c..004ac33cf3 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,10 +181,20 @@ public:
         );
 
         //- Construct from name and dictionary
-        Table(const word& name, const dictionary& dict);
+        Table
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Construct from name and Istream
-        Table(const word& name, Istream& dict);
+        Table
+        (
+            const word& name,
+            const unitConversions& units,
+            Istream& dict
+        );
 
         //- Copy constructor
         Table(const Table<Type>& tbl);
@@ -227,7 +237,7 @@ public:
         virtual tmp<Field<Type>> y() const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.C
index 114331659f..d463e80a65 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,30 +39,30 @@ namespace TableReaders
 template<>
 label Csv<label>::readValue(const List<string>& split) const
 {
-    if (componentColumns_[0] >= split.size())
+    if (component(columns_.second(), 0) >= split.size())
     {
         FatalErrorInFunction
-            << "No column " << componentColumns_[0] << " in "
+            << "No column " << component(columns_.second(), 0) << " in "
             << split << endl
             << exit(FatalError);
     }
 
-    return readLabel(IStringStream(split[componentColumns_[0]])());
+    return readLabel(IStringStream(split[component(columns_.second(), 0)])());
 }
 
 
 template<>
 scalar Csv<scalar>::readValue(const List<string>& split) const
 {
-    if (componentColumns_[0] >= split.size())
+    if (component(columns_.second(), 0) >= split.size())
     {
         FatalErrorInFunction
-            << "No column " << componentColumns_[0] << " in "
+            << "No column " << component(columns_.second(), 0) << " in "
             << split << endl
             << exit(FatalError);
     }
 
-    return readScalar(IStringStream(split[componentColumns_[0]])());
+    return readScalar(IStringStream(split[component(columns_.second(), 0)])());
 }
 
 
@@ -71,19 +71,19 @@ Type Csv<Type>::readValue(const List<string>& split) const
 {
     Type result;
 
-    for(label i = 0;i < pTraits<Type>::nComponents; i++)
+    for (label i = 0; i < pTraits<Type>::nComponents; i++)
     {
-        if (componentColumns_[i] >= split.size())
+        if (component(columns_.second(), i) >= split.size())
         {
             FatalErrorInFunction
-                << "No column " << componentColumns_[i] << " in "
+                << "No column " << component(columns_.second(), i) << " in "
                 << split << endl
                 << exit(FatalError);
         }
 
         result[i] = readScalar
         (
-            IStringStream(split[componentColumns_[i]])()
+            IStringStream(split[component(columns_.second(), i)])()
         );
     }
 
@@ -113,7 +113,7 @@ void Foam::TableReaders::Csv<Type>::read
         is.getLine(line);
     }
 
-    const label nEntries = max(refColumn_, max(componentColumns_));
+    const label nEntries = max(columns_.first(), cmptMax(columns_.second()));
 
     // Read data
     while (is.good())
@@ -188,10 +188,10 @@ void Foam::TableReaders::Csv<Type>::read
             break;
         }
 
-        scalar x = readScalar(IStringStream(split[refColumn_])());
+        scalar x = readScalar(IStringStream(split[columns_.first()])());
         Type value = readValue(split);
 
-        values.append(Tuple2<scalar,Type>(x, value));
+        values.append(Tuple2<scalar, Type>(x, value));
     }
 
     data.transfer(values);
@@ -204,24 +204,31 @@ template<class Type>
 Foam::TableReaders::Csv<Type>::Csv
 (
     const word& name,
+    const Function1s::unitConversions& units,
     const dictionary& dict
 )
 :
-    TableFileReader<Type>(dict),
+    TableFileReader<Type>(units, dict),
     nHeaderLine_(dict.lookup<label>("nHeaderLine")),
-    refColumn_(dict.lookup<label>("refColumn")),
-    componentColumns_(dict.lookup("componentColumns")),
+    columns_
+    (
+        !dict.found("refColumn") || !dict.found("componentColumns")
+      ? columnIndices(dict.lookup("columns"))
+      : columnIndices
+        (
+            dict.lookup<label>("refColumn"),
+            CsvLabelType<Type>()
+            (
+                dict.lookup<typename CsvLabelType<Type>::oldType>
+                (
+                    "componentColumns"
+                )
+            )
+        )
+    ),
     separator_(dict.lookupOrDefault<string>("separator", string(","))[0]),
     mergeSeparators_(readBool(dict.lookup("mergeSeparators")))
-{
-    if (componentColumns_.size() != pTraits<Type>::nComponents)
-    {
-        FatalErrorInFunction
-            << componentColumns_ << " does not have the expected length "
-            << pTraits<Type>::nComponents << endl
-            << exit(FatalError);
-    }
-}
+{}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -237,14 +244,14 @@ template<class Type>
 void Foam::TableReaders::Csv<Type>::write
 (
     Ostream& os,
+    const Function1s::unitConversions& units,
     const List<Tuple2<scalar, Type>>& table
 ) const
 {
-    TableFileReader<Type>::write(os, table);
+    TableFileReader<Type>::write(os, units, table);
 
     writeEntry(os, "nHeaderLine", nHeaderLine_);
-    writeEntry(os, "refColumn", refColumn_);
-    writeEntry(os, "componentColumns", componentColumns_);
+    writeEntry(os, "columns", columns_);
     writeEntry(os, "separator", string(separator_));
     writeEntry(os, "mergeSeparators", mergeSeparators_);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.H
index 279a6967fc..6958884429 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Csv/CsvTableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,18 +26,18 @@ Class
 
 Description
     Reads an interpolation table from a file in CSV-format. Entries govern the
-    layout of the CSV file. The index of the first (x) column of the table is
-    given by the refColumn entry, and is always scalar. The indices of the
-    components of the second (y) column are given by the componentColumns
-    entry.
+    layout of the CSV file. The indices of the columns of the table that are to
+    be used are given by the columns entry. This is a tuple for which the first
+    part is the index of the column used for the x-axis, and the second part is
+    the column index used for the scalar values, or a list of column indices
+    used for the components of vector, tensor, etc..., values.
 
 Usage
     \verbatim
-        nHeaderLine         4;          // number of header lines
-        refColumn           0;          // reference column index
-        componentColumns    (1 2 3);    // component column indices
-        separator           ",";        // optional (defaults to ",")
-        mergeSeparators     no;         // merge multiple separators
+        nHeaderLine         4;           // number of header lines
+        columns             (0 (1 2 3)); // column indices for vector values
+        separator           ",";         // optional (defaults to ",")
+        mergeSeparators     no;          // merge multiple separators
     \endverbatim
 
 SourceFiles
@@ -58,6 +58,51 @@ namespace Foam
 namespace TableReaders
 {
 
+/*---------------------------------------------------------------------------*\
+                           Using CsvVoid Declaration
+\*---------------------------------------------------------------------------*/
+
+template<typename T>
+using CsvVoid = void;
+
+
+/*---------------------------------------------------------------------------*\
+                        Struct CsvLabelType Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, typename = void>
+struct CsvLabelType
+{
+    typedef label type;
+
+    typedef FixedList<label, 1> oldType;
+
+    type operator()(const oldType& ot)
+    {
+        return ot[0];
+    }
+};
+
+
+template<class Type>
+struct CsvLabelType<Type, CsvVoid<typename pTraits<Type>::labelType>>
+{
+    typedef typename pTraits<Type>::labelType type;
+
+    typedef FixedList<label, pTraits<Type>::nComponents> oldType;
+
+    type operator()(const oldType& ot) const
+    {
+        type t;
+        for (direction i = 0; i < pTraits<Type>::nComponents; ++ i)
+        {
+            setComponent(t, i) = ot[i];
+        }
+        return t;
+    }
+};
+
+
 /*---------------------------------------------------------------------------*\
                              Class Csv Declaration
 \*---------------------------------------------------------------------------*/
@@ -67,16 +112,19 @@ class Csv
 :
     public TableFileReader<Type>
 {
+    // Private Typedefs
+
+        //- Type of the column indices
+        typedef Tuple2<label, typename CsvLabelType<Type>::type> columnIndices;
+
+
     // Private Data
 
         //- Number of header lines
         const label nHeaderLine_;
 
-        //- Reference column
-        const label refColumn_;
-
-        //- Labels of the components
-        const labelList componentColumns_;
+        //- Column indices
+        const columnIndices columns_;
 
         //- Separator character
         const char separator_;
@@ -103,7 +151,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        Csv(const word& name, const dictionary& dict);
+        Csv
+        (
+            const word& name,
+            const Function1s::unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Construct and return a copy
         virtual autoPtr<TableReader<Type>> clone() const
@@ -122,6 +175,7 @@ public:
         virtual void write
         (
             Ostream& os,
+            const Function1s::unitConversions& units,
             const List<Tuple2<scalar, Type>>& table
         ) const;
 };
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.C
index 671470ab70..0fd1456473 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,7 @@ template<class Type>
 Foam::TableReaders::Embedded<Type>::Embedded
 (
     const word& name,
+    const Function1s::unitConversions& units,
     const dictionary& dict
 )
 :
@@ -56,9 +57,27 @@ Foam::TableReaders::Embedded<Type>::~Embedded()
 
 template<class Type>
 Foam::List<Foam::Tuple2<Foam::scalar, Type>>
-Foam::TableReaders::Embedded<Type>::read(const dictionary& dict) const
+Foam::TableReaders::Embedded<Type>::read
+(
+    const Function1s::unitConversions& defaultUnits,
+    const dictionary& dict
+) const
 {
-    return dict.lookup<List<Tuple2<scalar, Type>>>("values");
+    Function1s::unitConversions units(defaultUnits);
+    units.readIfPresent("units", dict);
+    return TableReader<Type>::convertRead(units, dict.lookup("values"));
+}
+
+
+template<class Type>
+Foam::List<Foam::Tuple2<Foam::scalar, Type>>
+Foam::TableReaders::Embedded<Type>::read
+(
+    const Function1s::unitConversions& units,
+    Istream& is
+)
+{
+    return TableReader<Type>::convertRead(units, is);
 }
 
 
@@ -66,10 +85,13 @@ template<class Type>
 void Foam::TableReaders::Embedded<Type>::write
 (
     Ostream& os,
+    const Function1s::unitConversions& units,
     const List<Tuple2<scalar, Type>>& table
 ) const
 {
-    writeEntry(os, "values", table);
+    TableReader<Type>::write(os, units, table);
+
+    writeEntry(os, "values", TableReader<Type>::convertWrite(units, table));
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.H
index 30f6be30ec..d026a0b140 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Embedded/EmbeddedTableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,12 @@ public:
         Embedded();
 
         //- Construct from name and dictionary
-        Embedded(const word& name, const dictionary& dict);
+        Embedded
+        (
+            const word& name,
+            const Function1s::unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Construct and return a copy
         virtual autoPtr<TableReader<Type>> clone() const
@@ -94,12 +99,24 @@ public:
     // Member Functions
 
         //- Read values
-        virtual List<Tuple2<scalar, Type>> read(const dictionary& dict) const;
+        virtual List<Tuple2<scalar, Type>> read
+        (
+            const Function1s::unitConversions& units,
+            const dictionary& dict
+        ) const;
+
+        //- Read values
+        List<Tuple2<scalar, Type>> read
+        (
+            const Function1s::unitConversions& units,
+            Istream& is
+        );
 
         //- Write settings and values
         virtual void write
         (
             Ostream& os,
+            const Function1s::unitConversions& units,
             const List<Tuple2<scalar, Type>>& table
         ) const;
 };
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.C
index be7be1f062..d6a1521443 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,10 +44,11 @@ template<class Type>
 Foam::TableReaders::Foam<Type>::Foam
 (
     const word& name,
+    const Function1s::unitConversions& units,
     const dictionary& dict
 )
 :
-    TableFileReader<Type>(dict)
+    TableFileReader<Type>(units, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.H
index cd170e104c..38f2cf9e78 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/Foam/FoamTableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        Foam(const word& name, const dictionary& dict);
+        Foam
+        (
+            const word& name,
+            const Function1s::unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Construct and return a copy
         virtual autoPtr<TableReader<Type>> clone() const
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.C
index dbcd1c11a5..46ab55a1a8 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,34 @@ License
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
+template<class Type>
+Foam::autoPtr<Foam::Function1s::unitConversions>
+Foam::TableFileReader<Type>::readUnits
+(
+    const Function1s::unitConversions& defaultUnits,
+    const dictionary& dict
+) const
+{
+    if (dict.found("units"))
+    {
+        autoPtr<Function1s::unitConversions> unitsPtr
+        (
+            new Function1s::unitConversions(defaultUnits)
+        );
+        unitsPtr->readIfPresent("units", dict);
+        return unitsPtr;
+    }
+    else
+    {
+        return autoPtr<Function1s::unitConversions>(nullptr);
+    }
+}
+
+
 template<class Type>
 void Foam::TableFileReader<Type>::read
 (
+    const Function1s::unitConversions& defaultUnits,
     const dictionary& dict,
     List<Tuple2<scalar, Type>>& table
 ) const
@@ -45,7 +70,7 @@ void Foam::TableFileReader<Type>::read
     if (!is.good())
     {
         FatalIOErrorInFunction(is)
-            << "Cannot open file" << fName_ << nl
+            << "Cannot open file " << fName_ << nl
             << exit(FatalIOError);
     }
 
@@ -59,16 +84,40 @@ void Foam::TableFileReader<Type>::read
             << "Table read from " << fName_ << " is empty" << nl
             << exit(FatalIOError);
     }
+
+    // Convert units
+    TableReader<Type>::convertRead
+    (
+        unitsPtr_.valid() ? unitsPtr_() : defaultUnits,
+        table
+    );
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableFileReader<Type>::TableFileReader(const dictionary& dict)
+Foam::TableFileReader<Type>::TableFileReader
+(
+    const Function1s::unitConversions& defaultUnits,
+    const dictionary& dict
+)
 :
     TableReader<Type>(),
-    fName_(dict.lookup("file"))
+    fName_(dict.lookup("file")),
+    unitsPtr_(readUnits(defaultUnits, dict))
+{}
+
+
+template<class Type>
+Foam::TableFileReader<Type>::TableFileReader
+(
+    const TableFileReader<Type>& tfr
+)
+:
+    TableReader<Type>(tfr),
+    fName_(tfr.fName_),
+    unitsPtr_(tfr.unitsPtr_, false)
 {}
 
 
@@ -83,10 +132,14 @@ Foam::TableFileReader<Type>::~TableFileReader()
 
 template<class Type>
 Foam::List<Foam::Tuple2<Foam::scalar, Type>>
-Foam::TableFileReader<Type>::read(const dictionary& dict) const
+Foam::TableFileReader<Type>::read
+(
+    const Function1s::unitConversions& units,
+    const dictionary& dict
+) const
 {
     List<Tuple2<scalar, Type>> data;
-    read(dict, data);
+    read(units, dict, data);
     return data;
 }
 
@@ -95,11 +148,19 @@ template<class Type>
 void Foam::TableFileReader<Type>::write
 (
     Ostream& os,
+    const Function1s::unitConversions& units,
     const List<Tuple2<scalar, Type>>& table
 ) const
 {
+    TableReader<Type>::write(os, units, table);
+
     writeEntry(os, "format", this->type());
     writeEntry(os, "file", fName_);
+
+    if (unitsPtr_.valid())
+    {
+        writeEntry(os, "units", unitsPtr_());
+    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.H
index e8bdafa154..7f7ef6465f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableFileReader/TableFileReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,9 +56,19 @@ class TableFileReader
         //- File name for table
         const fileName fName_;
 
+        //- Unit conversions
+        const autoPtr<Function1s::unitConversions> unitsPtr_;
+
 
     // Private Member Functions
 
+        //- Read the units, if any
+        autoPtr<Function1s::unitConversions> readUnits
+        (
+            const Function1s::unitConversions& defaultUnits,
+            const dictionary& dict
+        ) const;
+
         //- Read a 1D table
         virtual void read(ISstream&, List<Tuple2<scalar, Type>>&) const = 0;
 
@@ -68,7 +78,12 @@ protected:
     // Protected Member Functions
 
         //- Read a 1D table
-        void read(const dictionary& dict, List<Tuple2<scalar, Type>>&) const;
+        void read
+        (
+            const Function1s::unitConversions& defaultUnits,
+            const dictionary& dict,
+            List<Tuple2<scalar, Type>>&
+        ) const;
 
 
 public:
@@ -76,7 +91,14 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        TableFileReader(const dictionary& dict);
+        TableFileReader
+        (
+            const Function1s::unitConversions& defaultUnits,
+            const dictionary& dict
+        );
+
+        //- Copy construct
+        TableFileReader(const TableFileReader<Type>&);
 
 
     //- Destructor
@@ -86,12 +108,17 @@ public:
     // Member Functions
 
         //- Read values
-        virtual List<Tuple2<scalar, Type>> read(const dictionary& dict) const;
+        virtual List<Tuple2<scalar, Type>> read
+        (
+            const Function1s::unitConversions& units,
+            const dictionary& dict
+        ) const;
 
         //- Write additional information
         virtual void write
         (
             Ostream& os,
+            const Function1s::unitConversions& units,
             const List<Tuple2<scalar, Type>>& table
         ) const;
 };
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.C
index 1784e0d6d8..d1caf1e9c2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,57 @@ License
 
 #include "TableReader.H"
 
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class Type>
+void Foam::TableReader<Type>::convertRead
+(
+    const Function1s::unitConversions& units,
+    List<Tuple2<scalar, Type>>& table
+) const
+{
+    forAll(table, i)
+    {
+        table[i].first() = units.x.toStandard(table[i].first());
+        table[i].second() = units.value.toStandard(table[i].second());
+    }
+}
+
+
+template<class Type>
+Foam::List<Foam::Tuple2<Foam::scalar, Type>>
+Foam::TableReader<Type>::convertRead
+(
+    const Function1s::unitConversions& units,
+    const List<Tuple2<scalar, Type>>& table
+) const
+{
+    List<Tuple2<scalar, Type>> tableCopy(table);
+    convertRead(units, tableCopy);
+    return tableCopy;
+}
+
+
+template<class Type>
+Foam::List<Foam::Tuple2<Foam::scalar, Type>>
+Foam::TableReader<Type>::convertWrite
+(
+    const Function1s::unitConversions& units,
+    const List<Tuple2<scalar, Type>>& table
+) const
+{
+    List<Tuple2<scalar, Type>> tableCopy(table);
+
+    forAll(tableCopy, i)
+    {
+        tableCopy[i].first() = units.x.toUser(tableCopy[i].first());
+        tableCopy[i].second() = units.value.toUser(tableCopy[i].second());
+    }
+
+    return tableCopy;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -39,4 +90,16 @@ Foam::TableReader<Type>::~TableReader()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::TableReader<Type>::write
+(
+    Ostream& os,
+    const Function1s::unitConversions& units,
+    const List<Tuple2<scalar, Type>>& table
+) const
+{}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H
index e018fec6c2..f7933e5593 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,8 +35,8 @@ SourceFiles
 #ifndef TableReader_H
 #define TableReader_H
 
-#include "dictionary.H"
-#include "addToRunTimeSelectionTable.H"
+#include "Function1.H"
+#include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +50,31 @@ namespace Foam
 template<class Type>
 class TableReader
 {
+protected:
+
+    // Protected Member Functions
+
+        //- Do unit conversions on input data
+        void convertRead
+        (
+            const Function1s::unitConversions& units,
+            List<Tuple2<scalar, Type>>& table
+        ) const;
+
+        //- Do unit conversions on input data
+        List<Tuple2<scalar, Type>> convertRead
+        (
+            const Function1s::unitConversions& units,
+            const List<Tuple2<scalar, Type>>& table
+        ) const;
+
+        //- Do unit conversions in order to output data
+        List<Tuple2<scalar, Type>> convertWrite
+        (
+            const Function1s::unitConversions& units,
+            const List<Tuple2<scalar, Type>>& table
+        ) const;
+
 
 public:
 
@@ -66,9 +91,10 @@ public:
             dictionary,
             (
                 const word& name,
+                const Function1s::unitConversions& units,
                 const dictionary& dict
             ),
-            (name, dict)
+            (name, units, dict)
         );
 
 
@@ -85,6 +111,7 @@ public:
     static autoPtr<TableReader<Type>> New
     (
         const word& name,
+        const Function1s::unitConversions& units,
         const dictionary& dict
     );
 
@@ -98,6 +125,7 @@ public:
         //- Read values
         virtual List<Tuple2<scalar, Type>> read
         (
+            const Function1s::unitConversions& units,
             const dictionary& dict
         ) const = 0;
 
@@ -105,8 +133,9 @@ public:
         virtual void write
         (
             Ostream& os,
+            const Function1s::unitConversions& units,
             const List<Tuple2<scalar, Type>>& table
-        ) const = 0;
+        ) const;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReaderNew.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReaderNew.C
index 6e0c2a2a8f..a8dd7ab556 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReaderNew.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReaderNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,7 @@ template<class Type>
 Foam::autoPtr<Foam::TableReader<Type>> Foam::TableReader<Type>::New
 (
     const word& name,
+    const Function1s::unitConversions& units,
     const dictionary& dict
 )
 {
@@ -52,7 +53,7 @@ Foam::autoPtr<Foam::TableReader<Type>> Foam::TableReader<Type>::New
                 << exit(FatalError);
         }
 
-        return autoPtr<TableReader<Type>>(cstrIter()(name, dict));
+        return autoPtr<TableReader<Type>>(cstrIter()(name, units, dict));
     }
     else
     {
@@ -60,14 +61,14 @@ Foam::autoPtr<Foam::TableReader<Type>> Foam::TableReader<Type>::New
         {
             return autoPtr<TableReader<Type>>
             (
-                new TableReaders::Foam<Type>(name, dict)
+                new TableReaders::Foam<Type>(name, units, dict)
             );
         }
         else
         {
             return autoPtr<TableReader<Type>>
             (
-                new TableReaders::Embedded<Type>(name, dict)
+                new TableReaders::Embedded<Type>(name, units, dict)
             );
         }
     }
diff --git a/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.C b/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.C
index fcca041c25..2ad890f0a0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function1s::UniformTable<Type>::UniformTable
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -40,13 +41,15 @@ Foam::Function1s::UniformTable<Type>::UniformTable
     high_(dict.lookup<scalar>("high")),
     values_(dict.lookup("values"))
 {
+    assertNoConvertUnits(typeName, units, dict);
+
     if (values_.size() < 2)
     {
-        FatalErrorInFunction
+        FatalIOErrorInFunction(dict)
             << "Table " << nl
             << "    " << dictName_ << nl
             << "    has less than 2 entries."
-            << exit(FatalError);
+            << exit(FatalIOError);
     }
     else
     {
@@ -92,7 +95,11 @@ Type Foam::Function1s::UniformTable<Type>::integral
 
 
 template<class Type>
-void Foam::Function1s::UniformTable<Type>::write(Ostream& os) const
+void Foam::Function1s::UniformTable<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "low", low_);
     writeEntry(os, "high", high_);
diff --git a/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.H b/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.H
index 858436602c..020b91a099 100644
--- a/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/UniformTable1/UniformTable1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        UniformTable(const word& name, const dictionary& dict);
+        UniformTable
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     // Member Functions
@@ -116,7 +121,7 @@ public:
         virtual Type integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        void write(Ostream& os) const;
+        void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
index 1c47568bd1..0477c0c7b1 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function1s::ZeroConstant<Type>::ZeroConstant
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -48,7 +49,11 @@ Foam::Function1s::ZeroConstant<Type>::~ZeroConstant()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::ZeroConstant<Type>::write(Ostream& os) const
+void Foam::Function1s::ZeroConstant<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
index 981d239284..de8f002534 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        ZeroConstant(const word& name, const dictionary& dict);
+        ZeroConstant
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     //- Destructor
@@ -84,7 +89,7 @@ public:
         virtual inline Type integral(const scalar x1, const scalar x2) const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.C b/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.C
index 43b458b836..04b2649da7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,11 @@ namespace Function1s
 Foam::Function1s::exponentialSqrRamp::exponentialSqrRamp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    Ramp<exponentialSqrRamp>(name, dict)
+    Ramp<exponentialSqrRamp>(name, units, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.H b/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.H
index 4924bdfe13..49326cbe78 100644
--- a/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/exponentialSqrRamp/exponentialSqrRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,6 +73,7 @@ public:
         exponentialSqrRamp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
index 2c489d9edd..fbb71c9200 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,11 @@ namespace Function1s
 Foam::Function1s::halfCosineRamp::halfCosineRamp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    Ramp<halfCosineRamp>(name, dict)
+    Ramp<halfCosineRamp>(name, units, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
index 10ee898652..4fdcc69aca 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,7 @@ public:
         halfCosineRamp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
index a355560485..542d90c0c0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,11 @@ namespace Function1s
 Foam::Function1s::linearRamp::linearRamp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    Ramp<linearRamp>(name, dict)
+    Ramp<linearRamp>(name, units, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
index 6260f87ebe..e4b33691c4 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,6 +114,7 @@ public:
         linearRamp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.C b/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.C
index b0de317394..e6527940cd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.C
@@ -24,12 +24,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "omega1.H"
-#include "mathematicalConstants.H"
+#include "Time.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::Function1<Foam::scalar>> Foam::Function1s::omega::init
 (
+    const Time& time,
     const dictionary& dict
 )
 {
@@ -50,23 +51,28 @@ Foam::autoPtr<Foam::Function1<Foam::scalar>> Foam::Function1s::omega::init
             << dict.name() << exit(FatalIOError);
     }
 
-    return Function1<scalar>::New(foundOmega ? "omega" : "rpm", dict);
+    return
+        Function1<scalar>::New
+        (
+            foundOmega ? "omega" : "rpm",
+            time.userUnits(),
+            foundOmega ? unitRadians/dimTime : units()["rpm"],
+            dict
+        );
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::Function1s::omega::omega(const dictionary& dict)
+Foam::Function1s::omega::omega(const Time& time, const dictionary& dict)
 :
-    omega_(init(dict)),
-    factor_(omega_->name() == "omega" ? 1 : constant::mathematical::pi/30)
+    omega_(init(time, dict))
 {}
 
 
 Foam::Function1s::omega::omega(const omega& o)
 :
-    omega_(o.omega_, false),
-    factor_(o.factor_)
+    omega_(o.omega_, false)
 {}
 
 
@@ -74,7 +80,13 @@ Foam::Function1s::omega::omega(const omega& o)
 
 void Foam::Function1s::omega::write(Ostream& os) const
 {
-    writeEntry(os, omega_());
+    writeEntry
+    (
+        os,
+        dimTime,
+        omega_->name() == "omega" ? unitRadians/dimTime : units()["rpm"],
+        omega_()
+    );
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.H b/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.H
index 4b06288cac..0ab8796066 100644
--- a/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/omega1/omega1.H
@@ -99,6 +99,9 @@ SourceFiles
 
 namespace Foam
 {
+
+class Time;
+
 namespace Function1s
 {
 
@@ -113,14 +116,15 @@ class omega
         //- The omega function
         const autoPtr<Function1<scalar>> omega_;
 
-        //- Conversion factor. 1 for omega. pi/30 for rpm.
-        const scalar factor_;
-
 
     // Private Member Functions
 
         //- Read and construct the omega function
-        autoPtr<Function1<scalar>> init(const dictionary& dict);
+        autoPtr<Function1<scalar>> init
+        (
+            const Time& time,
+            const dictionary& dict
+        );
 
 
 public:
@@ -128,7 +132,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        omega(const dictionary& dict);
+        omega(const Time& time, const dictionary& dict);
 
         //- Copy constructor
         omega(const omega&);
diff --git a/src/OpenFOAM/primitives/functions/Function1/omega1/omega1I.H b/src/OpenFOAM/primitives/functions/Function1/omega1/omega1I.H
index 716a7f59af..8342ff58f7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/omega1/omega1I.H
+++ b/src/OpenFOAM/primitives/functions/Function1/omega1/omega1I.H
@@ -29,7 +29,7 @@ License
 
 inline Foam::scalar Foam::Function1s::omega::value(const scalar t) const
 {
-    return factor_*omega_->value(t);
+    return omega_->value(t);
 }
 
 
@@ -39,7 +39,7 @@ inline Foam::scalar Foam::Function1s::omega::integral
     const scalar t2
 ) const
 {
-    return factor_*omega_->integral(t1, t2);
+    return omega_->integral(t1, t2);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
index 629c1fe661..69049ac16d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,11 @@ namespace Function1s
 Foam::Function1s::quadraticRamp::quadraticRamp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    Ramp<quadraticRamp>(name, dict)
+    Ramp<quadraticRamp>(name, units, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
index 8511515b93..4c7cac38c8 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,7 @@ public:
         quadraticRamp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
index 85a17efc87..4ed4392900 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,11 @@ namespace Function1s
 Foam::Function1s::quarterCosineRamp::quarterCosineRamp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    Ramp<quarterCosineRamp>(name, dict)
+    Ramp<quarterCosineRamp>(name, units, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
index cecd162a5e..e824d04e1a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,7 @@ public:
         quarterCosineRamp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
index fb0e051a79..8c732b415f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,11 @@ namespace Function1s
 Foam::Function1s::quarterSineRamp::quarterSineRamp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    Ramp<quarterSineRamp>(name, dict)
+    Ramp<quarterSineRamp>(name, units, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
index f5d5fd1fd5..69707ae905 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,7 @@ public:
         quarterSineRamp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C
index 1cf1f3250c..9c009bf1dd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,11 +41,12 @@ namespace Function1s
 Foam::Function1s::reverseRamp::reverseRamp
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    Ramp<reverseRamp>(name, dict),
-    ramp_(Function1<scalar>::New("ramp", dict))
+    Ramp<reverseRamp>(name, units, dict),
+    ramp_(Function1<scalar>::New("ramp", units.x, dimless, dict))
 {}
 
 
@@ -67,10 +68,14 @@ Foam::Function1s::reverseRamp::~reverseRamp()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::Function1s::reverseRamp::write(Ostream& os) const
+void Foam::Function1s::reverseRamp::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    Ramp<reverseRamp>::write(os);
-    writeEntry(os, ramp_());
+    Ramp<reverseRamp>::write(os, units);
+    writeEntry(os, units, ramp_());
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
index f343d02304..cab9f959ef 100644
--- a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,6 +102,7 @@ public:
         reverseRamp
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -126,7 +127,7 @@ public:
         ) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.C b/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.C
index 1268096f97..7f95f3604f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.C
+++ b/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.C
@@ -41,12 +41,13 @@ namespace Function1s
 Foam::Function1s::squarePulse::squarePulse
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<scalar, squarePulse>(name),
-    start_(dict.lookupOrDefault<scalar>("start", 0)),
-    duration_(dict.lookup<scalar>("duration"))
+    start_(dict.lookupOrDefault<scalar>("start", units.x, 0)),
+    duration_(dict.lookup<scalar>("duration", units.x))
 {}
 
 
@@ -58,10 +59,14 @@ Foam::Function1s::squarePulse::~squarePulse()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::Function1s::squarePulse::write(Ostream& os) const
+void Foam::Function1s::squarePulse::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, "start", start_);
-    writeEntry(os, "duration", duration_);
+    writeEntry(os, "start", units.x, start_);
+    writeEntry(os, "duration", units.x, duration_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.H b/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.H
index 2db4fc7fca..d179ba5da6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.H
+++ b/src/OpenFOAM/primitives/functions/Function1/squarePulse/squarePulse.H
@@ -104,6 +104,7 @@ public:
         squarePulse
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -125,7 +126,7 @@ public:
         ) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.C b/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.C
index 56f77fa012..3e0cf881e6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,10 +30,12 @@ License
 Foam::unknownTypeFunction1::unknownTypeFunction1
 (
     const word& name,
+    const unitConversion& xUnits,
     const dictionary& dict
 )
 :
     name_(name),
+    xUnits_(xUnits),
     topDict_(dict.topDict()),
     topDictKeyword_(dict.topDictKeyword())
 {}
diff --git a/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.H b/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.H
index fbc9fb2bdd..cc55ada2fb 100644
--- a/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,6 +72,9 @@ class unknownTypeFunction1
         //- Name of the function
         const word name_;
 
+        //- Unit conversion for x-axis values
+        const unitConversion xUnits_;
+
         //- Top-level dictionary from which to read the function
         const dictionary& topDict_;
 
@@ -87,15 +90,20 @@ class unknownTypeFunction1
 
         //- Build the function of a given primitive type
         template<class Type>
-        void build() const;
+        void build(const unitConversion& valueUnits) const;
 
 
 public:
 
     // Constructors
 
-        //- Construct from an name and a dictionary
-        unknownTypeFunction1(const word& name, const dictionary& dict);
+        //- Construct from a name and a dictionary
+        unknownTypeFunction1
+        (
+            const word& name,
+            const unitConversion& xUnits,
+            const dictionary& dict
+        );
 
         //- Disallow default bitwise copy construction
         unknownTypeFunction1(const unknownTypeFunction1&) = delete;
@@ -107,6 +115,10 @@ public:
 
     // Member Functions
 
+        //- Set the value units
+        template<class Type>
+        void setValueUnits(const unitConversion&) const;
+
         //- Return value as a function of scalar x
         template<class Type>
         Type value(const scalar x) const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1Templates.C b/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1Templates.C
index 6ddf802ae7..aa3ddf036d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1Templates.C
+++ b/src/OpenFOAM/primitives/functions/Function1/unknownTypeFunction1/unknownTypeFunction1Templates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::unknownTypeFunction1::build() const
+void Foam::unknownTypeFunction1::build(const unitConversion& valueUnits) const
 {
     if (!functionPtr_.autoPtr<Function1<Type>>::valid())
     {
@@ -37,6 +37,8 @@ void Foam::unknownTypeFunction1::build() const
             Function1<Type>::New
             (
                 name_,
+                xUnits_,
+                valueUnits,
                 topDict_.scopedDict(topDictKeyword_)
             ).ptr()
         );
@@ -46,13 +48,23 @@ void Foam::unknownTypeFunction1::build() const
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::unknownTypeFunction1::setValueUnits
+(
+    const unitConversion& valueUnits
+) const
+{
+    build<Type>(valueUnits);
+}
+
+
 template<class Type>
 Type Foam::unknownTypeFunction1::value
 (
     const scalar x
 ) const
 {
-    build<Type>();
+    build<Type>(unitAny);
 
     return functionPtr_.autoPtr<Function1<Type>>::operator*().value(x);
 }
@@ -64,7 +76,7 @@ Foam::tmp<Foam::Field<Type>> Foam::unknownTypeFunction1::value
     const scalarField& x
 ) const
 {
-    build<Type>();
+    build<Type>(unitAny);
 
     return functionPtr_.autoPtr<Function1<Type>>::operator*().value(x);
 }
@@ -77,7 +89,7 @@ Type Foam::unknownTypeFunction1::integral
     const scalar x2
 ) const
 {
-    build<Type>();
+    build<Type>(unitAny);
 
     return functionPtr_.autoPtr<Function1<Type>>::operator*().integral(x1, x2);
 }
@@ -90,7 +102,7 @@ Foam::tmp<Foam::Field<Type>> Foam::unknownTypeFunction1::integral
     const scalarField& x2
 ) const
 {
-    build<Type>();
+    build<Type>(unitAny);
 
     return functionPtr_.autoPtr<Function1<Type>>::operator*().integral(x1, x2);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C
index de63ee86d2..60b2b8c33a 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C
@@ -98,7 +98,7 @@ Foam::Function2s::Coded<Type>::compileNew()
     dictionary redirectDict(codeDict());
     redirectDict.set(codeName(), codeName());
 
-    return Function2<Type>::New(codeName(), redirectDict);
+    return Function2<Type>::New(codeName(), this->units_, redirectDict);
 }
 
 
@@ -108,11 +108,13 @@ template<class Type>
 Foam::Function2s::Coded<Type>::Coded
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     Function2<Type>(name),
-    codedBase(name, dict)
+    codedBase(name, dict),
+    units_(units)
 {
     redirectFunction2Ptr_ = compileNew();
 }
@@ -120,10 +122,11 @@ Foam::Function2s::Coded<Type>::Coded
 
 
 template<class Type>
-Foam::Function2s::Coded<Type>::Coded(const Coded<Type>& cf1)
+Foam::Function2s::Coded<Type>::Coded(const Coded<Type>& cf2)
 :
-    Function2<Type>(cf1),
-    codedBase(cf1)
+    Function2<Type>(cf2),
+    codedBase(cf2),
+    units_(cf2.units_)
 {
     redirectFunction2Ptr_ = compileNew();
 }
@@ -152,12 +155,24 @@ Foam::tmp<Foam::Field<Type>> Foam::Function2s::Coded<Type>::value
     const scalarField& y
 ) const
 {
-    return redirectFunction2Ptr_->value(x, y);
+    return
+        units_.value.toStandard
+        (
+            redirectFunction2Ptr_->value
+            (
+                units_.x.toUser(x),
+                units_.y.toUser(y)
+            )
+        );
 }
 
 
 template<class Type>
-void Foam::Function2s::Coded<Type>::write(Ostream& os) const
+void Foam::Function2s::Coded<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeCode(os);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
index 868b1d9474..711a069b83 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
@@ -77,6 +77,9 @@ class Coded
         //- The dynamically generated Function2 pointer
         mutable autoPtr<Function2<Type>> redirectFunction2Ptr_;
 
+        //- Cache of the unit conversions
+        const unitConversions units_;
+
 
     // Private Member Functions
 
@@ -108,6 +111,7 @@ public:
         Coded
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -135,7 +139,7 @@ public:
         ) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2I.H b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2I.H
index c2183d3123..526f9bce81 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2I.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,15 @@ inline Type Foam::Function2s::Coded<Type>::value
     // Make sure library containing user-defined Function2 is up-to-date
     this->updateLibrary();
 
-    return redirectFunction2Ptr_->value(x, y);
+    return
+        units_.value.toStandard
+        (
+            redirectFunction2Ptr_->value
+            (
+                units_.x.toUser(x),
+                units_.y.toUser(y)
+            )
+        );
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C
index e2647b8377..777d2745d4 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,33 @@ License
 
 #include "Constant2.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::Function2s::Constant<Type>::readValue
+(
+    const unitConversions& defaultUnits,
+    Istream& is
+)
+{
+    // Read the units if they are before the value
+    unitConversion units(defaultUnits.value);
+    const bool haveUnits = units.readIfPresent(is);
+
+    // Read the value
+    const Type value = pTraits<Type>(is);
+
+    // Read the units if they are after the value
+    if (!haveUnits && !is.eof())
+    {
+        units.readIfPresent(is);
+    }
+
+    // Modify the value by the unit conversion and return
+    return units.toStandard(value);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -43,11 +70,12 @@ template<class Type>
 Foam::Function2s::Constant<Type>::Constant
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction2<Type, Constant<Type>>(name),
-    value_(dict.lookup<Type>("value"))
+    value_(dict.lookup<Type>("value", units.value))
 {}
 
 
@@ -55,11 +83,12 @@ template<class Type>
 Foam::Function2s::Constant<Type>::Constant
 (
     const word& name,
+    const unitConversions& units,
     Istream& is
 )
 :
     FieldFunction2<Type, Constant<Type>>(name),
-    value_(pTraits<Type>(is))
+    value_(readValue(units, is))
 {}
 
 
@@ -81,9 +110,13 @@ Foam::Function2s::Constant<Type>::~Constant()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function2s::Constant<Type>::write(Ostream& os) const
+void Foam::Function2s::Constant<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, "value", value_);
+    writeEntry(os, "value", units.value, value_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
index 5ca88c1785..b5a5373294 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,6 +71,12 @@ class Constant
         const Type value_;
 
 
+    // Private Member Functions
+
+        //- Read the value
+        static Type readValue(const unitConversions& units, Istream& is);
+
+
 public:
 
     // Runtime type information
@@ -83,12 +89,17 @@ public:
         Constant(const word& name, const Type& val);
 
         //- Construct from name and dictionary
-        Constant(const word& name, const dictionary& dict);
+        Constant
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
         //- Construct from name and Istream
         //  Reads the constant value without the Function2 type
         //  for backward compatibility
-        Constant(const word& name, Istream& is);
+        Constant(const word& name, const unitConversions& units, Istream& is);
 
         //- Copy constructor
         Constant(const Constant<Type>& cnst);
@@ -117,7 +128,7 @@ public:
         ) const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.C b/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.C
index 51a4fe3b88..3643f903ee 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.C
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function2s::Function12<Type>::Function12
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -59,7 +60,13 @@ Foam::Function2s::Function12<Type>::Function12
 
     index_ = found2;
 
-    f_ = Function1<Type>::New(found2 ? name2 : name1, dict);
+    f_ =
+        Function1<Type>::New
+        (
+            found2 ? name2 : name1,
+            {found2 ? units.y : units.x, units.value},
+            dict
+        );
 }
 
 
@@ -82,9 +89,13 @@ Foam::Function2s::Function12<Type>::~Function12()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function2s::Function12<Type>::write(Ostream& os) const
+void Foam::Function2s::Function12<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, f_());
+    writeEntry(os, {index_ ? units.y : units.x, units.value}, f_());
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.H b/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.H
index b8825b1f64..6b5af25961 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Function1/Function12.H
@@ -101,6 +101,7 @@ public:
         Function12
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -118,7 +119,7 @@ public:
         virtual inline Type value(const scalar x, const scalar y) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
index 0370af986c..22dbd32a64 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,10 +43,7 @@ Foam::Function2<Type>::Function2(const Function2<Type>& f2)
 
 
 template<class Type, class Function2Type>
-Foam::FieldFunction2<Type, Function2Type>::FieldFunction2
-(
-    const word& name
-)
+Foam::FieldFunction2<Type, Function2Type>::FieldFunction2(const word& name)
 :
     Function2<Type>(name)
 {}
@@ -120,19 +117,45 @@ void Foam::Function2<Type>::operator=(const Function2<Type>& f)
 // * * * * * * * * * * * * * * * IOstream Functions  * * * * * * * * * * * * //
 
 template<class Type>
-void  Foam::writeEntry(Ostream& os, const Function2<Type>& f2)
+void Foam::writeEntry(Ostream& os, const Function2<Type>& f2)
+{
+    writeEntry(os, {unitAny, unitAny, unitAny}, f2);
+}
+
+
+template<class Type>
+void Foam::writeEntry
+(
+    Ostream& os,
+    const Function2s::unitConversions& units,
+    const Function2<Type>& f2
+)
 {
     writeKeyword(os, f2.name())
         << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
 
     writeEntry(os, "type", f2.type());
 
-    f2.write(os);
+    f2.write(os, units);
 
     os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 
 
+template<class Type>
+void Foam::writeEntry
+(
+    Ostream& os,
+    const unitConversion& xUnits,
+    const unitConversion& yUnits,
+    const unitConversion& valueUnits,
+    const Function2<Type>& f2
+)
+{
+    writeEntry(os, {xUnits, yUnits, valueUnits}, f2);
+}
+
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 template<class Type>
@@ -142,14 +165,11 @@ Foam::Ostream& Foam::operator<<
     const Function2<Type>& f2
 )
 {
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const Function2<Type>&)"
-    );
-
     f2.write(os);
 
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const Function2<Type>&)");
+
     return os;
 }
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
index 1569b81829..3be06b6d9d 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,6 +40,7 @@ SourceFiles
 #define Function2_H
 
 #include "dictionary.H"
+#include "unitConversion.H"
 #include "tmp.H"
 #include "typeInfo.H"
 #include "Field.H"
@@ -54,6 +55,39 @@ namespace Foam
 template<class Type> class Function2;
 template<class Type> Ostream& operator<<(Ostream&, const Function2<Type>&);
 
+/*---------------------------------------------------------------------------*\
+                 Class Function2s::unitConversions Declaration
+\*---------------------------------------------------------------------------*/
+
+namespace Function2s
+{
+struct unitConversions
+{
+    // Public Data
+
+        //- Unit conversion for x-axis values
+        unitConversion x;
+
+        //- Unit conversion for y-axis values
+        unitConversion y;
+
+        //- Unit conversion for result values
+        unitConversion value;
+};
+}
+
+
+// Global Functions
+
+//- Generate an error in an context where unit conversions are not supported
+void assertNoConvertUnits
+(
+    const word& typeName,
+    const Function2s::unitConversions& units,
+    const dictionary& dict
+);
+
+
 /*---------------------------------------------------------------------------*\
                           Class Function2 Declaration
 \*---------------------------------------------------------------------------*/
@@ -90,9 +124,10 @@ public:
             dictionary,
             (
                 const word& name,
+                const Function2s::unitConversions& units,
                 const dictionary& dict
             ),
-            (name, dict)
+            (name, units, dict)
         );
 
         declareRunTimeSelectionTable
@@ -102,9 +137,10 @@ public:
             Istream,
             (
                 const word& name,
+                const Function2s::unitConversions& units,
                 Istream& is
             ),
-            (name, is)
+            (name, units, is)
         );
 
 
@@ -126,6 +162,17 @@ public:
         static autoPtr<Function2<Type>> New
         (
             const word& name,
+            const Function2s::unitConversions& units,
+            const dictionary& dict
+        );
+
+        //- Select from dictionary
+        static autoPtr<Function2<Type>> New
+        (
+            const word& name,
+            const unitConversion& xUnits,
+            const unitConversion& yUnits,
+            const unitConversion& valueUnits,
             const dictionary& dict
         );
 
@@ -133,6 +180,18 @@ public:
         static autoPtr<Function2<Type>> New
         (
             const word& name,
+            const Function2s::unitConversions& units,
+            const word& Function2Type,
+            Istream& is
+        );
+
+        //- Select from Istream
+        static autoPtr<Function2<Type>> New
+        (
+            const word& name,
+            const unitConversion& xUnits,
+            const unitConversion& yUnits,
+            const unitConversion& valueUnits,
             const word& Function2Type,
             Istream& is
         );
@@ -158,7 +217,11 @@ public:
         ) const = 0;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const = 0;
+        virtual void write
+        (
+            Ostream& os,
+            const Function2s::unitConversions&
+        ) const = 0;
 
 
     // Member Operators
@@ -181,6 +244,24 @@ public:
 template<class Type>
 void writeEntry(Ostream& os, const Function2<Type>& f2);
 
+template<class Type>
+void writeEntry
+(
+    Ostream& os,
+    const Function2s::unitConversions& units,
+    const Function2<Type>& f2
+);
+
+template<class Type>
+void writeEntry
+(
+    Ostream& os,
+    const unitConversion& xUnits,
+    const unitConversion& yUnits,
+    const unitConversion& valueUnits,
+    const Function2<Type>& f2
+);
+
 
 /*---------------------------------------------------------------------------*\
                        Class FieldFunction2 Declaration
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2Fwd.H b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2Fwd.H
index dd7bf6d45a..eb8587591d 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2Fwd.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2Fwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,21 +27,17 @@ License
 #define Function2Fwd_H
 
 #include "Function2.H"
-#include "vector.H"
-#include "symmTensor.H"
-#include "sphericalTensor.H"
-#include "tensor.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef Function2<label> labelFunction2;
-    typedef Function2<scalar> scalarFunction2;
-    typedef Function2<vector> vectorFunction2;
-    typedef Function2<symmTensor> symmTensorFunction2;
-    typedef Function2<sphericalTensor> sphericalTensorFunction2;
-    typedef Function2<tensor> tensorFunction2;
+    #define TYPEDEF_TYPE_FUNCTION2(Type, nullArg) \
+        typedef Function2<Type> Type##Function2;
+    FOR_ALL_FIELD_TYPES(TYPEDEF_TYPE_FUNCTION2);
+    TYPEDEF_TYPE_FUNCTION2(label, );
+    #undef TYPEDEF_TYPE_FUNCTION2
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C
index 24123cab8a..66d323293e 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,84 +25,13 @@ License
 
 #include "Constant2.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-/*
-template<class Type>
-Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
-(
-    const word& name,
-    const dictionary& dict
-)
-{
-    if (dict.isDict(name))
-    {
-        const dictionary& coeffsDict(dict.subDict(name));
-
-        const word Function2Type(coeffsDict.lookup("type"));
-
-        typename dictionaryConstructorTable::iterator cstrIter =
-            dictionaryConstructorTablePtr_->find(Function2Type);
-
-        if (cstrIter == dictionaryConstructorTablePtr_->end())
-        {
-            FatalErrorInFunction
-                << "Unknown Function2 type "
-                << Function2Type << " for Function2 "
-                << name << nl << nl
-                << "Valid Function2 types are:" << nl
-                << dictionaryConstructorTablePtr_->sortedToc() << nl
-                << exit(FatalError);
-        }
-
-        return cstrIter()(name, coeffsDict);
-    }
-    else
-    {
-        Istream& is(dict.lookup(name, false));
-
-        token firstToken(is);
-        word Function2Type;
-
-        if (!firstToken.isWord())
-        {
-            is.putBack(firstToken);
-            return autoPtr<Function2<Type>>
-            (
-                new Function2s::Constant<Type>(name, is)
-            );
-        }
-        else
-        {
-            Function2Type = firstToken.wordToken();
-        }
-
-        typename dictionaryConstructorTable::iterator cstrIter =
-            dictionaryConstructorTablePtr_->find(Function2Type);
-
-        if (cstrIter == dictionaryConstructorTablePtr_->end())
-        {
-            FatalErrorInFunction
-                << "Unknown Function2 type "
-                << Function2Type << " for Function2 "
-                << name << nl << nl
-                << "Valid Function2 types are:" << nl
-                << dictionaryConstructorTablePtr_->sortedToc() << nl
-                << exit(FatalError);
-        }
-
-        return cstrIter()(name, dict);
-    }
-}
-*/
-
-
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
 (
     const word& name,
+    const Function2s::unitConversions& units,
     const dictionary& dict
 )
 {
@@ -127,7 +56,7 @@ Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
                 << exit(FatalError);
         }
 
-        return cstrIter()(name, coeffsDict);
+        return cstrIter()(name, units, coeffsDict);
     }
 
     // Find the entry
@@ -145,7 +74,7 @@ Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
     // construct the function from the stream
     if (!firstToken.isWord() || !is.eof())
     {
-        return New(name, Function2Type, is);
+        return New(name, units, Function2Type, is);
     }
 
     // Otherwise, construct from the current dictionary
@@ -163,7 +92,7 @@ Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
             << exit(FatalError);
     }
 
-    return dictCstrIter()(name, dict);
+    return dictCstrIter()(name, units, dict);
 }
 
 
@@ -171,6 +100,21 @@ template<class Type>
 Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
 (
     const word& name,
+    const unitConversion& xUnits,
+    const unitConversion& yUnits,
+    const unitConversion& valueUnits,
+    const dictionary& dict
+)
+{
+    return New(name, {xUnits, yUnits, valueUnits}, dict);
+}
+
+
+template<class Type>
+Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
+(
+    const word& name,
+    const Function2s::unitConversions& units,
     const word& Function2Type,
     Istream& is
 )
@@ -205,7 +149,22 @@ Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
             << exit(FatalError);
     }
 
-    return isCstrIter()(name, is);
+    return isCstrIter()(name, units, is);
+}
+
+
+template<class Type>
+Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
+(
+    const word& name,
+    const unitConversion& xUnits,
+    const unitConversion& yUnits,
+    const unitConversion& valueUnits,
+    const word& Function2Type,
+    Istream& is
+)
+{
+    return New(name, {xUnits, yUnits, valueUnits}, Function2Type, is);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2UnitConversions.C b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2UnitConversions.C
new file mode 100644
index 0000000000..17064296d9
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2UnitConversions.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Function2.H"
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+void Foam::assertNoConvertUnits
+(
+    const word& typeName,
+    const Function2s::unitConversions& units,
+    const dictionary& dict
+)
+{
+    if (!units.x.standard() || !units.y.standard() || !units.value.standard())
+    {
+        FatalIOErrorInFunction(dict)
+            << "Unit conversions are not supported by "
+            << typeName << " function2 types" << abort(FatalError);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function2/None/None2.C b/src/OpenFOAM/primitives/functions/Function2/None/None2.C
index b6646d71c4..c18200dcdb 100644
--- a/src/OpenFOAM/primitives/functions/Function2/None/None2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/None/None2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function2s::None<Type>::None
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -62,7 +63,11 @@ Type Foam::Function2s::None<Type>::value(const scalar, const scalar) const
 
 
 template<class Type>
-void Foam::Function2s::None<Type>::write(Ostream& os) const
+void Foam::Function2s::None<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/None/None2.H b/src/OpenFOAM/primitives/functions/Function2/None/None2.H
index a2a856b236..d6a3422554 100644
--- a/src/OpenFOAM/primitives/functions/Function2/None/None2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/None/None2.H
@@ -65,7 +65,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        None(const word& name, const dictionary& dict);
+        None
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     //- Destructor
@@ -78,7 +83,7 @@ public:
         virtual inline Type value(const scalar x, const scalar y) const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C
index 3fad47e7d1..fa3d3b19f3 100644
--- a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,7 @@ template<class Type>
 Foam::Function2s::OneConstant<Type>::OneConstant
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -55,7 +56,11 @@ Foam::Function2s::OneConstant<Type>::~OneConstant()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function2s::OneConstant<Type>::write(Ostream& os) const
+void Foam::Function2s::OneConstant<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
index 8d89568804..7ea96b6e2f 100644
--- a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,12 @@ public:
         OneConstant(const word& name);
 
         //- Construct from name and dictionary
-        OneConstant(const word& name, const dictionary& dict);
+        OneConstant
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     //- Destructor
@@ -91,7 +96,7 @@ public:
         ) const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/Product/Product2.C b/src/OpenFOAM/primitives/functions/Function2/Product/Product2.C
index 1bccd8bc76..5e3f46456e 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Product/Product2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Product/Product2.C
@@ -30,11 +30,12 @@ License
 template<class Type, Foam::direction rank>
 Foam::Function2s::ProductFunction1s<Type, rank>::ProductFunction1s
 (
+    const unitConversions& units,
     const dictionary& dict,
     const Pair<Tuple2<word, label>>& typeAndRanks
 )
 :
-    ProductFunction1s<Type, rank - 1>(dict, typeAndRanks)
+    ProductFunction1s<Type, rank - 1>(units, dict, typeAndRanks)
 {
     forAll(fs, i)
     {
@@ -44,6 +45,7 @@ Foam::Function2s::ProductFunction1s<Type, rank>::ProductFunction1s
                 function1Type::New
                 (
                     valueName(i, typeAndRanks[i]),
+                    {i ? units.y : units.x, unitAny},
                     dict
                 );
         }
@@ -54,6 +56,7 @@ Foam::Function2s::ProductFunction1s<Type, rank>::ProductFunction1s
 template<class Type>
 Foam::Function2s::ProductFunction1s<Type, 0>::ProductFunction1s
 (
+    const unitConversions& units,
     const dictionary& dict,
     const Pair<Tuple2<word, label>>& typeAndRanks
 )
@@ -66,6 +69,7 @@ Foam::Function2s::ProductFunction1s<Type, 0>::ProductFunction1s
                 Function1<scalar>::New
                 (
                     valueName(i, typeAndRanks[i]),
+                    {i ? units.y : units.x, unitAny},
                     dict
                 );
         }
@@ -106,11 +110,12 @@ template<class Type>
 Foam::Function2s::Product<Type>::Product
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction2<Type, Product<Type>>(name),
-    fs_(dict, lookupValueTypeAndRanks<Type>(dict))
+    fs_(units, dict, lookupValueTypeAndRanks<Type>(dict))
 {}
 
 
@@ -132,37 +137,49 @@ Foam::Function2s::Product<Type>::~Product()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, Foam::direction rank>
-void Foam::Function2s::ProductFunction1s<Type, rank>::write(Ostream& os) const
+void Foam::Function2s::ProductFunction1s<Type, rank>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    ProductFunction1s<Type, rank - 1>::write(os);
+    ProductFunction1s<Type, rank - 1>::write(os, units);
 
     forAll(fs, i)
     {
         if (fs[i].valid())
         {
-            writeEntry(os, fs[i]());
+            writeEntry(os, {i ? units.y : units.x, unitAny}, fs[i]());
         }
     }
 }
 
 
 template<class Type>
-void Foam::Function2s::ProductFunction1s<Type, 0>::write(Ostream& os) const
+void Foam::Function2s::ProductFunction1s<Type, 0>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     forAll(fs, i)
     {
         if (fs[i].valid())
         {
-            writeEntry(os, fs[i]());
+            writeEntry(os, {i ? units.y : units.x, unitAny}, fs[i]());
         }
     }
 }
 
 
 template<class Type>
-void Foam::Function2s::Product<Type>::write(Ostream& os) const
+void Foam::Function2s::Product<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    fs_.write(os);
+    fs_.write(os, units);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Product/Product2.H b/src/OpenFOAM/primitives/functions/Function2/Product/Product2.H
index 7dea70c8ee..240e22e5d2 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Product/Product2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Product/Product2.H
@@ -176,6 +176,7 @@ public:
         //- Construct from a dictionary
         ProductFunction1s
         (
+            const unitConversions& units,
             const dictionary& dict,
             const Pair<Tuple2<word, label>>& typeAndRanks
         );
@@ -190,7 +191,7 @@ public:
         inline Type value(const scalar x, const scalar y) const;
 
         //- Write to a stream
-        void write(Ostream& os) const;
+        void write(Ostream& os, const unitConversions& units) const;
 };
 
 
@@ -214,6 +215,7 @@ public:
         //- Construct from a dictionary
         ProductFunction1s
         (
+            const unitConversions& units,
             const dictionary& dict,
             const Pair<Tuple2<word, label>>& typeAndRanks
         );
@@ -228,7 +230,7 @@ public:
         inline Type value(const scalar x, const scalar y) const;
 
         //- Write to a stream
-        void write(Ostream& os) const;
+        void write(Ostream& os, const unitConversions& units) const;
 };
 
 
@@ -259,6 +261,7 @@ public:
         Product
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -275,8 +278,8 @@ public:
         //- Return value
         virtual inline Type value(const scalar x, const scalar y) const;
 
-        //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        //- Write in dictionary format
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.C b/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.C
index 0c9677d6ec..d986ce8180 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.C
@@ -31,11 +31,15 @@ template<class Type>
 Foam::Function2s::Radial<Type>::Radial
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction2<Type, Radial<Type>>(name),
-    value_(Function1<Type>::New("value", dict))
+    value_
+    (
+        Function1<Type>::New("value", {units.x + units.y, units.value}, dict)
+    )
 {}
 
 
@@ -57,9 +61,13 @@ Foam::Function2s::Radial<Type>::~Radial()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function2s::Radial<Type>::write(Ostream& os) const
+void Foam::Function2s::Radial<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    value_->write(os);
+    writeEntry(os, {units.x + units.y, units.value}, value_());
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.H b/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.H
index 0d6e4d79f2..7aad976f27 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Radial/Radial2.H
@@ -87,6 +87,7 @@ public:
         Radial
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -104,7 +105,7 @@ public:
         virtual inline Type value(const scalar x, const scalar y) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
index 50252d1dd6..594af9c048 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
@@ -31,15 +31,16 @@ template<class Type>
 Foam::Function2s::Scale<Type>::Scale
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction2<Type, Scale<Type>>(name),
-    scale_(Function2<scalar>::New("scale", dict)),
+    scale_(Function2<scalar>::New("scale", units.x, units.y, unitless, dict)),
     xScale_
     (
         dict.found("xScale")
-      ? Function1<scalar>::New("xScale", dict)
+      ? Function1<scalar>::New("xScale", units.x, units.x, dict)
       : autoPtr<Function1<scalar>>
         (
             new Function1s::Constant<scalar>("xScale", 1)
@@ -48,13 +49,13 @@ Foam::Function2s::Scale<Type>::Scale
     yScale_
     (
         dict.found("yScale")
-      ? Function1<scalar>::New("yScale", dict)
+      ? Function1<scalar>::New("yScale", units.y, units.y, dict)
       : autoPtr<Function1<scalar>>
         (
             new Function1s::Constant<scalar>("yScale", 1)
         )
     ),
-    value_(Function2<Type>::New("value", dict))
+    value_(Function2<Type>::New("value", units, dict))
 {}
 
 
@@ -79,12 +80,16 @@ Foam::Function2s::Scale<Type>::~Scale()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function2s::Scale<Type>::write(Ostream& os) const
+void Foam::Function2s::Scale<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
-    writeEntry(os, scale_());
-    writeEntry(os, xScale_());
-    writeEntry(os, yScale_());
-    writeEntry(os, value_());
+    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/Scale/Scale2.H b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
index 49dd1ba5cb..5aac472f19 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
@@ -87,6 +87,7 @@ public:
         Scale
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -104,7 +105,7 @@ public:
         virtual inline Type value(const scalar x, const scalar y) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.C b/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.C
index aad030287b..dd85d93c2d 100644
--- a/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function2s::UniformTable<Type>::UniformTable
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -39,6 +40,8 @@ Foam::Function2s::UniformTable<Type>::UniformTable
     high_(dict.lookup("high")),
     values_(dict.lookup("values"))
 {
+    assertNoConvertUnits(typeName, units, dict);
+
     if (values_.m() < 2 || values_.n() < 2)
     {
         FatalErrorInFunction
@@ -181,7 +184,11 @@ Type Foam::Function2s::UniformTable<Type>::dfdT
 
 
 template<class Type>
-void Foam::Function2s::UniformTable<Type>::write(Ostream& os) const
+void Foam::Function2s::UniformTable<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "low", low_);
     writeEntry(os, "high", high_);
diff --git a/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.H b/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.H
index ba9d3ff9fe..7900d6320f 100644
--- a/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/UniformTable2/UniformTable2.H
@@ -120,7 +120,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        UniformTable(const word& name, const dictionary& dict);
+        UniformTable
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     // Member Functions
@@ -141,7 +146,7 @@ public:
         Type dfdT(scalar p, scalar T) const;
 
         //- Write the function coefficients
-        void write(Ostream& os) const;
+        void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C
index cafb0c70e6..6ff5a66269 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class Type>
 Foam::Function2s::ZeroConstant<Type>::ZeroConstant
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -48,7 +49,11 @@ Foam::Function2s::ZeroConstant<Type>::~ZeroConstant()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function2s::ZeroConstant<Type>::write(Ostream& os) const
+void Foam::Function2s::ZeroConstant<Type>::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
index c200d382c9..d6b454ef2d 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,12 @@ public:
     // Constructors
 
         //- Construct from name and dictionary
-        ZeroConstant(const word& name, const dictionary& dict);
+        ZeroConstant
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     //- Destructor
@@ -88,7 +93,7 @@ public:
         ) const;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index 7afda439f5..1a155cdd9c 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,6 +93,17 @@ inline label component(const label l, const direction)
     return l;
 }
 
+inline label cmptMax(const label l)
+{
+    return l;
+}
+
+inline label cmptMin(const label l)
+{
+    return l;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/omega/omega.C b/src/OpenFOAM/primitives/omega/omega.C
index 260b13b0f2..16f8a9ff2f 100644
--- a/src/OpenFOAM/primitives/omega/omega.C
+++ b/src/OpenFOAM/primitives/omega/omega.C
@@ -51,8 +51,8 @@ Foam::omega::omega(const dictionary& dict)
 
     value() =
         foundOmega
-      ? dict.lookup<scalar>("omega")
-      : constant::mathematical::pi/30*dict.lookup<scalar>("rpm");
+      ? dict.lookup<scalar>("omega", unitRadians/dimTime)
+      : dict.lookup<scalar>("rpm", units()["rpm"]);
 }
 
 
diff --git a/src/OpenFOAM/symbols/symbols.C b/src/OpenFOAM/symbols/symbols.C
new file mode 100644
index 0000000000..c2e01ba40d
--- /dev/null
+++ b/src/OpenFOAM/symbols/symbols.C
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "symbols.H"
+#include "IStringStream.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::symbols::tokeniser::push(const token& t)
+{
+    label end = (start_+size_)%tokens_.size();
+    tokens_[end] = t;
+    if (size_ == tokens_.size())
+    {
+        start_ = tokens_.fcIndex(start_);
+    }
+    else
+    {
+        size_++;
+    }
+}
+
+
+Foam::token Foam::symbols::tokeniser::pop()
+{
+    token t = tokens_[start_];
+    start_ = tokens_.fcIndex(start_);
+    --size_;
+    return t;
+}
+
+
+void Foam::symbols::tokeniser::unpop(const token& t)
+{
+    ++size_;
+    start_ = tokens_.rcIndex(start_);
+    tokens_[start_] = t;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::symbols::tokeniser::tokeniser(Istream& is)
+:
+    is_(is),
+    tokens_(100),
+    start_(0),
+    size_(0)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::symbols::tokeniser::stream()
+{
+    return is_;
+}
+
+
+bool Foam::symbols::tokeniser::hasToken() const
+{
+    return size_ || is_.good();
+}
+
+
+Foam::token Foam::symbols::tokeniser::nextToken()
+{
+    if (size_ == 0)
+    {
+        token t(is_);
+        if (t.isWord())
+        {
+            splitWord(t.wordToken());
+            return pop();
+        }
+        else
+        {
+            return t;
+        }
+    }
+    else
+    {
+        return pop();
+    }
+}
+
+
+void Foam::symbols::tokeniser::putBack(const token& t)
+{
+    if (size_ == 0)
+    {
+        push(t);
+    }
+    else
+    {
+        unpop(t);
+    }
+}
+
+
+void Foam::symbols::tokeniser::splitWord(const word& w)
+{
+    size_t start = 0;
+    for (size_t i=0; i<w.size(); ++i)
+    {
+        if (!valid(w[i]))
+        {
+            if (i > start)
+            {
+                word subWord = w(start, i-start);
+                if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
+                {
+                    push(token(readScalar(IStringStream(subWord)())));
+                }
+                else
+                {
+                    push(token(subWord));
+                }
+            }
+            if (w[i] != token::SPACE)
+            {
+                if (isdigit(w[i]))
+                {
+                    push(token(readScalar(IStringStream(w[i])())));
+                }
+                else
+                {
+                    push(token::punctuationToken(w[i]));
+                }
+            }
+            start = i+1;
+        }
+    }
+    if (start < w.size())
+    {
+        word subWord = w(start, w.size()-start);
+        if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
+        {
+            push(token(readScalar(IStringStream(subWord)())));
+        }
+        else
+        {
+            push(token(subWord));
+        }
+    }
+}
+
+
+bool Foam::symbols::tokeniser::valid(char c)
+{
+    return
+    (
+        !isspace(c)
+     && c != '"'   // string quote
+     && c != '\''  // string quote
+     && c != '/'   // div
+     && c != ';'   // end statement
+     && c != '{'   // beg subdict
+     && c != '}'   // end subdict
+     && c != '('   // beg expr
+     && c != ')'   // end expr
+     && c != '['   // beg dim
+     && c != ']'   // end dim
+     && c != '^'   // power
+     && c != '*'   // mult
+    );
+}
+
+
+Foam::label Foam::symbols::tokeniser::priority(const token& t)
+{
+    if (!t.isPunctuation())
+    {
+        return 0;
+    }
+    else if
+    (
+        t.pToken() == token::MULTIPLY
+     || t.pToken() == token::DIVIDE
+    )
+    {
+        return 2;
+    }
+    else if (t.pToken() == '^')
+    {
+        return 3;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/symbols/symbols.H b/src/OpenFOAM/symbols/symbols.H
new file mode 100644
index 0000000000..c6cea6ee71
--- /dev/null
+++ b/src/OpenFOAM/symbols/symbols.H
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::symbols
+
+Description
+    ...
+
+SourceFiles
+    ...
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef symbols_H
+#define symbols_H
+
+#include "List.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace symbols
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class tokeniser Declaration
+\*---------------------------------------------------------------------------*/
+
+class tokeniser
+{
+    // Private Data
+
+        //- Reference to the stream
+        Istream& is_;
+
+        //- List of tokens
+        List<token> tokens_;
+
+        //- Index of the first token
+        label start_;
+
+        //- Total number of tokens
+        label size_;
+
+
+    // Private Member Functions
+
+        //- Add a token to the end of the stack
+        void push(const token&);
+
+        //- Remove a token from the end of the stack
+        token pop();
+
+        //- Add a popped token back to the end of the stack
+        void unpop(const token&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct for an input stream
+        tokeniser(Istream&);
+
+
+    // Member Functions
+
+        //- Access the stream
+        Istream& stream();
+
+        //- ...
+        bool hasToken() const;
+
+        //- ...
+        token nextToken();
+
+        //- ...
+        void putBack(const token&);
+
+        //- ...
+        void splitWord(const word&);
+
+        //- ...
+        static bool valid(char c);
+
+        //- ...
+        static label priority(const token& t);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+//- Parse tokens into a dimension set or unit conversion, assuming that the '['
+//  has already been read
+template<class Type>
+Type parseNoBegin
+(
+    const label lastPrior,
+    tokeniser& tis,
+    const Type& identity,
+    const HashTable<Type>& table
+);
+
+//- Parse a dimension set or unit conversion, assuming that the '[' has already
+//  been read
+template<class Type>
+Type parseNoBegin
+(
+    Istream& is,
+    const Type& identity,
+    const HashTable<Type>& table
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace symbols
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "symbolsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/symbols/symbolsTemplates.C b/src/OpenFOAM/symbols/symbolsTemplates.C
new file mode 100644
index 0000000000..d84c991307
--- /dev/null
+++ b/src/OpenFOAM/symbols/symbolsTemplates.C
@@ -0,0 +1,211 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "symbols.H"
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::symbols::parseNoBegin
+(
+    const label lastPrior,
+    tokeniser& tis,
+    const Type& identity,
+    const HashTable<Type>& table
+)
+{
+    Type result(identity);
+
+    // Get initial token
+    token nextToken(tis.nextToken());
+
+    // Store type of last token read. Used to detect two consecutive
+    // symbols and assume multiplication.
+    bool haveReadSymbol = false;
+
+    while (true)
+    {
+        if (nextToken.isWord())
+        {
+            // Named unit conversion. Multiply.
+            result.reset(result*table[nextToken.wordToken()]);
+            haveReadSymbol = true;
+        }
+        else if (nextToken.isNumber())
+        {
+            // A number. This makes no sense.
+            FatalIOErrorInFunction(tis.stream())
+                << "Illegal token " << nextToken << exit(FatalIOError);
+        }
+        else if (nextToken.isPunctuation())
+        {
+            const label nextPrior = tokeniser::priority(nextToken);
+
+            if (nextToken.pToken() == token::BEGIN_SQR)
+            {
+                // Start another set of symbols? This makes no sense.
+                FatalIOErrorInFunction(tis.stream())
+                    << "Illegal token " << nextToken << exit(FatalIOError);
+                return result;
+            }
+            else if (nextToken.pToken() == token::END_SQR)
+            {
+                // End the units
+                tis.putBack(nextToken);
+                return result;
+            }
+            else if (nextToken.pToken() == token::BEGIN_LIST)
+            {
+                // Parenthesis. Evaluate the sub-units and multiply.
+                result.reset
+                (
+                    result*parseNoBegin(nextPrior, tis, identity, table)
+                );
+
+                // Check that the parentheses end
+                token t = tis.nextToken();
+                if (!t.isPunctuation() || t.pToken() != token::END_LIST)
+                {
+                    FatalIOErrorInFunction(tis.stream())
+                        << "Illegal token " << t << exit(FatalIOError);
+                }
+
+                haveReadSymbol = true;
+            }
+            else if (nextToken.pToken() == token::END_LIST)
+            {
+                // End the sub-units
+                tis.putBack(nextToken);
+                return result;
+            }
+            else if (nextToken.pToken() == token::MULTIPLY)
+            {
+                // Multiply operator
+                if (nextPrior > lastPrior)
+                {
+                    // This has priority. Evaluate the next units and multiply.
+                    result.reset
+                    (
+                        result*parseNoBegin(nextPrior, tis, identity, table)
+                    );
+                }
+                else
+                {
+                    // Restore the token
+                    tis.putBack(nextToken);
+                    return result;
+                }
+
+                haveReadSymbol = false;
+            }
+            else if (nextToken.pToken() == token::DIVIDE)
+            {
+                // Divide operator. As above.
+                if (nextPrior > lastPrior)
+                {
+                    result.reset
+                    (
+                        result/parseNoBegin(nextPrior, tis, identity, table)
+                    );
+                }
+                else
+                {
+                    tis.putBack(nextToken);
+                    return result;
+                }
+
+                haveReadSymbol = false;
+            }
+            else if (nextToken.pToken() == '^')
+            {
+                // Power operator
+                if (nextPrior > lastPrior)
+                {
+                    token t = tis.nextToken();
+                    if (!t.isScalar())
+                    {
+                        FatalIOErrorInFunction(tis.stream())
+                            << "Invalid power " << t << exit(FatalIOError);
+                    }
+                    result.reset(pow(result, t.scalarToken()));
+                }
+                else
+                {
+                    tis.putBack(nextToken);
+                    return result;
+                }
+
+                haveReadSymbol = true;
+            }
+            else
+            {
+                FatalIOErrorInFunction(tis.stream())
+                    << "Illegal token " << nextToken << exit(FatalIOError);
+            }
+        }
+        else
+        {
+            FatalIOErrorInFunction(tis.stream())
+                << "Illegal token " << nextToken << exit(FatalIOError);
+        }
+
+        if (!tis.hasToken())
+        {
+            break;
+        }
+
+        nextToken = tis.nextToken();
+        if (nextToken.error())
+        {
+            break;
+        }
+
+        if (haveReadSymbol && (nextToken.isWord() || nextToken.isNumber()))
+        {
+            // Consecutive symbols are multiplied
+            tis.putBack(nextToken);
+            nextToken = token(token::MULTIPLY);
+        }
+    }
+
+    return result;
+}
+
+
+template<class Type>
+Type Foam::symbols::parseNoBegin
+(
+    Istream& is,
+    const Type& identity,
+    const HashTable<Type>& table
+)
+{
+    symbols::tokeniser tis(is);
+
+    return parseNoBegin(0, tis, identity, table);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalarFwd.H b/src/OpenFOAM/unitConversion/namedUnitConversion.C
similarity index 68%
rename from src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalarFwd.H
rename to src/OpenFOAM/unitConversion/namedUnitConversion.C
index a8839d2ef6..687b613e22 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalarFwd.H
+++ b/src/OpenFOAM/unitConversion/namedUnitConversion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,33 +21,26 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedScalarFwd_H
-#define dimensionedScalarFwd_H
+#include "namedUnitConversion.H"
+#include "IStringStream.H"
 
-#include "scalar.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(namedUnitConversion, 0);
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type>
-class dimensioned;
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-typedef dimensioned<scalar> dimensionedScalar;
+Foam::namedUnitConversion::namedUnitConversion(const string& name)
+:
+    unitConversion(IStringStream(name)()),
+    name_(name)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/namedUnitConversion.H b/src/OpenFOAM/unitConversion/namedUnitConversion.H
new file mode 100644
index 0000000000..d8a1aec535
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/namedUnitConversion.H
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::namedUnitConversion
+
+Description
+    ...
+
+SourceFiles
+    ...
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef namedUnitConversion_H
+#define namedUnitConversion_H
+
+#include "unitConversion.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class Istream;
+class Ostream;
+class entry;
+
+// Forward declaration of friend functions and operators
+class namedUnitConversion;
+Istream& operator>>(Istream&, namedUnitConversion&);
+Ostream& operator<<(Ostream&, const namedUnitConversion&);
+
+/*---------------------------------------------------------------------------*\
+                          Class namedUnitConversion Declaration
+\*---------------------------------------------------------------------------*/
+
+class namedUnitConversion
+:
+    public unitConversion
+{
+private:
+
+    // Private Data
+
+        //- The name
+        string name_;
+
+
+    // Private Member Functions
+
+        //- Read the name
+        void readName(const entry& e);
+
+        //- Read the name
+        void readName(const word& keyword, const dictionary&);
+
+
+public:
+
+    // Static Data Members
+
+        //- Run time type information
+        ClassName("namedUnitConversion");
+
+
+    // Constructors
+
+        //- Construct from name
+        namedUnitConversion(const string&);
+
+        //- Copy constructor
+        namedUnitConversion(const namedUnitConversion&) = default;
+
+        //- Move constructor
+        namedUnitConversion(namedUnitConversion&&) = default;
+
+
+    // Member Functions
+
+        //- Update
+        void read(const word& keyword, const dictionary&);
+
+        //- Update if found in the dictionary
+        bool readIfPresent(const word& keyword, const dictionary&);
+
+
+    // IOstream Operators
+
+        //- Read from stream
+        friend Istream& operator>>(Istream&, namedUnitConversion&);
+
+        //- Write to stream
+        friend Ostream& operator<<(Ostream&, const namedUnitConversion&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/namedUnitConversionIO.C b/src/OpenFOAM/unitConversion/namedUnitConversionIO.C
new file mode 100644
index 0000000000..27a516b3c8
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/namedUnitConversionIO.C
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "namedUnitConversion.H"
+#include "dictionary.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::namedUnitConversion::readName(const entry& e)
+{
+    // Read the entry characters directly
+    OStringStream oss;
+    dynamicCast<const primitiveEntry>(e).write(oss, true);
+    name_ = oss.str();
+
+    // Beautify slightly by removing unnecessary spaces
+    static const string a(List<char>({token::BEGIN_SQR, token::SPACE}));
+    static const string b(List<char>({token::BEGIN_SQR}));
+    name_.replace(a, b);
+}
+
+
+void Foam::namedUnitConversion::readName
+(
+    const word& keyword,
+    const dictionary& dict
+)
+{
+    readName(dict.lookupEntry(keyword, false, true));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::namedUnitConversion::read
+(
+    const word& keyword,
+    const dictionary& dict
+)
+{
+    unitConversion::read(keyword, dict);
+
+    readName(keyword, dict);
+}
+
+
+bool Foam::namedUnitConversion::readIfPresent
+(
+    const word& keyword,
+    const dictionary& dict
+)
+{
+    if (unitConversion::readIfPresent(keyword, dict))
+    {
+        readName(keyword, dict);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, namedUnitConversion& u)
+{
+    const primitiveEntry e(word::null, is);
+    u.reset(unitConversion(e.stream()));
+    u.readName(e);
+
+    // Check state of Istream
+    is.check("Istream& operator>>(Istream&, namedUnitConversion&)");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const namedUnitConversion& u)
+{
+    os << u.name_.c_str();
+
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const namedUnitConversion&)");
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/unitConversion.C b/src/OpenFOAM/unitConversion/unitConversion.C
new file mode 100644
index 0000000000..b303450324
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/unitConversion.C
@@ -0,0 +1,218 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "unitConversion.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(unitConversion, 0);
+
+    template<>
+    const char* NamedEnum<unitConversion::dimlessUnitType, 2>::names[] =
+    {
+        "fraction",
+        "angle"
+    };
+}
+
+
+const Foam::NamedEnum<Foam::unitConversion::dimlessUnitType, 2>
+    Foam::unitConversion::dimlessUnitTypeNames_;
+
+
+namespace Foam
+{
+    const scalar unitConversion::smallExponent = rootSmall;
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::unitConversion::compare
+(
+    const unitConversion& a,
+    const unitConversion& b,
+    const bool compareMultiplier
+)
+{
+    if (a.any()) return true;
+    if (b.any()) return true;
+    if (a.none()) return false;
+    if (b.none()) return false;
+
+    // Check the dimensions are the same
+    if (a.dimensions_ != b.dimensions_) return false;
+
+    // Check the dimensionless units are the same
+    for (int i = unitConversion::nDimlessUnits; i < 0; ++ i)
+    {
+        if
+        (
+            mag(a.exponents_[i] - b.exponents_[i])
+          > unitConversion::smallExponent
+        )
+        {
+            return false;
+        }
+    }
+
+    // If specified, check the unit conversion factors are the same
+    return !compareMultiplier || a.multiplier_ == b.multiplier_;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::unitConversion::unitConversion
+(
+    const dimensionSet& dimensions,
+    const scalar fraction,
+    const scalar angle,
+    const scalar multiplier
+)
+:
+    dimensions_(dimensions),
+    multiplier_(multiplier)
+{
+    exponents_[FRACTION] = fraction;
+    exponents_[ANGLE] = angle;
+}
+
+
+Foam::unitConversion::unitConversion(const dimensionSet& dimensions)
+:
+    dimensions_(dimensions),
+    multiplier_(1)
+{
+    exponents_[FRACTION] = 0;
+    exponents_[ANGLE] = 0;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::unitConversion::reset(const unitConversion& units)
+{
+    dimensions_.reset(units.dimensions_);
+    for (int i = 0; i < unitConversion::nDimlessUnits; ++ i)
+    {
+        exponents_[i] = units.exponents_[i];
+    }
+    multiplier_ = units.multiplier_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+
+Foam::unitConversion Foam::pow(const unitConversion& units, const scalar exp)
+{
+    if (units.any()) return units;
+    if (units.none()) return unitNone;
+
+    return
+        unitConversion
+        (
+            pow(units.dimensions_, exp),
+            units.exponents_[0]*exp,
+            units.exponents_[1]*exp,
+            pow(units.multiplier_, exp)
+        );
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+const Foam::unitConversion& Foam::operator+
+(
+    const unitConversion& a,
+    const unitConversion& b
+)
+{
+    if (a.any()) return b;
+    if (b.any()) return a;
+    if (a.none()) return unitNone;
+    if (b.none()) return unitNone;
+
+    if (!unitConversion::compare(a, b, true))
+    {
+        FatalErrorInFunction
+            << "Different units for +" << endl
+            << "     units : "
+            << a << " {" << a.multiplier_ << "} + "
+            << b << " {" << b.multiplier_ << "} + " << endl
+            << abort(FatalError);
+    }
+
+    return a;
+}
+
+
+Foam::unitConversion Foam::operator*
+(
+    const unitConversion& a,
+    const unitConversion& b
+)
+{
+    if (a.any()) return a;
+    if (b.any()) return b;
+    if (a.none()) return unitNone;
+    if (b.none()) return unitNone;
+
+    return
+        unitConversion
+        (
+            a.dimensions_*b.dimensions_,
+            a.exponents_[0] + b.exponents_[0],
+            a.exponents_[1] + b.exponents_[1],
+            a.multiplier_*b.multiplier_
+        );
+}
+
+
+Foam::unitConversion Foam::operator/
+(
+    const unitConversion& a,
+    const unitConversion& b
+)
+{
+    if (a.any()) return a;
+    if (b.any()) return b;
+    if (a.none()) return unitNone;
+    if (b.none()) return unitNone;
+
+    return
+        unitConversion
+        (
+            a.dimensions_/b.dimensions_,
+            a.exponents_[0] - b.exponents_[0],
+            a.exponents_[1] - b.exponents_[1],
+            a.multiplier_/b.multiplier_
+        );
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/unitConversion.H b/src/OpenFOAM/unitConversion/unitConversion.H
new file mode 100644
index 0000000000..c5010fa7e5
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/unitConversion.H
@@ -0,0 +1,313 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::unitConversion
+
+Description
+    Unit conversion structure. Contains the associated dimensions and the
+    multiplier with which to convert values.
+
+SourceFiles
+    unitConversion.C
+    unitConversionIO.C
+    unitConversionI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef unitConversion_H
+#define unitConversion_H
+
+#include "dimensionSet.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class Istream;
+class Ostream;
+template<class Type> class List;
+template<class Type> class Field;
+
+// Forward declaration of friend functions and operators
+class unitConversion;
+unitConversion pow(const unitConversion&, const scalar);
+const unitConversion& operator+(const unitConversion&, const unitConversion&);
+unitConversion operator*(const unitConversion&, const unitConversion&);
+unitConversion operator/(const unitConversion&, const unitConversion&);
+Istream& operator>>(Istream&, unitConversion&);
+Ostream& operator<<(Ostream&, const unitConversion&);
+Ostream& operator<<(Ostream&, const InfoProxy<unitConversion>&);
+
+/*---------------------------------------------------------------------------*\
+                          Class unitConversion Declaration
+\*---------------------------------------------------------------------------*/
+
+class unitConversion
+{
+public:
+
+    // Member constants
+
+        //- Define an enumeration for the number of dimensionless units
+        enum
+        {
+            nDimlessUnits = 2
+        };
+
+        //- Define an enumeration for the names of the dimensionless unit
+        //  exponents
+        enum dimlessUnitType
+        {
+            FRACTION,           // fraction   %
+            ANGLE               // angle      rad, rot, deg
+        };
+
+        //- Names of the dimensionless units
+        static const NamedEnum<dimlessUnitType, 2> dimlessUnitTypeNames_;
+
+
+    // Static Data Members
+
+        //- A small exponent with which to perform inexact comparisons
+        static const scalar smallExponent;
+
+
+private:
+
+    // Private Data
+
+        //- The dimensions
+        dimensionSet dimensions_;
+
+        //- Array of dimensionless unit exponents
+        scalar exponents_[nDimlessUnits];
+
+        //- The conversion multiplier with which to multiply quantities
+        //  in this unit in order to recover the quantity in standard units
+        scalar multiplier_;
+
+
+    // Private Member Functions
+
+        //- Compare two unit conversions and return if they are the same.
+        //  An additional control determines whether the multiplier is compared
+        //  as well as the dimensions and dimensionless units.
+        static bool compare
+        (
+            const unitConversion&,
+            const unitConversion&,
+            const bool compareMultiplier
+        );
+
+
+public:
+
+    // Static Data Members
+
+        //- Run time type information
+        ClassName("unitConversion");
+
+
+    // Constructors
+
+        //- Construct from components
+        unitConversion
+        (
+            const dimensionSet&,
+            const scalar fraction,
+            const scalar angle,
+            const scalar multiplier
+        );
+
+        //- Construct from a dimension set. No dimensionless units. Unity
+        //  multiplier.
+        unitConversion(const dimensionSet&);
+
+        //- Copy constructor
+        unitConversion(const unitConversion&) = default;
+
+        //- Move constructor
+        unitConversion(unitConversion&&) = default;
+
+        //- Construct from stream
+        unitConversion(Istream& is);
+
+
+    // Member Functions
+
+        //- Access the dimensions
+        inline const dimensionSet& dimensions() const;
+
+        //- Convert a value to standard units
+        template<class T>
+        T toStandard(const T&) const;
+
+        //- Convert a list of values to standard units
+        template<class T>
+        List<T> toStandard(const List<T>&) const;
+
+        //- Convert a field of values to standard units
+        template<class T>
+        tmp<Field<T>> toStandard(const Field<T>&) const;
+
+        //- Convert a tmp field of values to standard units
+        template<class T>
+        tmp<Field<T>> toStandard(const tmp<Field<T>>&) const;
+
+        //- Convert a value to standard units
+        template<class T>
+        void makeStandard(T&) const;
+
+        //- Convert a list of values to standard units
+        template<class T>
+        void makeStandard(List<T>&) const;
+
+        //- Convert a value to user units
+        template<class T>
+        T toUser(const T&) const;
+
+        //- Convert a list of values to user units
+        template<class T>
+        List<T> toUser(const List<T>&) const;
+
+        //- Convert a field of values to user units
+        template<class T>
+        tmp<Field<T>> toUser(const Field<T>&) const;
+
+        //- Convert a tmp field of values to user units
+        template<class T>
+        tmp<Field<T>> toUser(const tmp<Field<T>>&) const;
+
+        //- Return whether this is the "any" unit. I.e., the case where
+        //  dimensions and dimensionless units are not checked, and any
+        //  conversion is permitted.
+        inline bool any() const;
+
+        //- Return whether this is the "none" unit. I.e., the case where unit
+        //  conversions are prohibited.
+        inline bool none() const;
+
+        //- Return whether this unit is standard. I.e., is its multiplier one?
+        inline bool standard() const;
+
+        //- Reset the unit conversion
+        void reset(const unitConversion&);
+
+        //- Update
+        void read(const word& keyword, const dictionary&);
+
+        //- Update if found in the dictionary
+        bool readIfPresent(const word& keyword, const dictionary&);
+
+        //- Update if found on the stream
+        bool readIfPresent(Istream& is);
+
+        //- Update if found on the dictionary stream
+        bool readIfPresent(const word& keyword, const dictionary&, Istream& is);
+
+        //- Return info proxy
+        inline InfoProxy<unitConversion> info() const
+        {
+            return *this;
+        }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const unitConversion&) = delete;
+
+        //- Disallow default bitwise move assignment
+        void operator=(const unitConversion&&) = delete;
+
+
+    // Friend Functions
+
+        //- Raise to a power
+        friend unitConversion pow(const unitConversion&, const scalar);
+
+
+    // Friend Operators
+
+        //- Combine
+        friend const unitConversion& operator+
+        (
+            const unitConversion&,
+            const unitConversion&
+        );
+
+        //- Multiply
+        friend unitConversion operator*
+        (
+            const unitConversion&,
+            const unitConversion&
+        );
+
+        //- Divide
+        friend unitConversion operator/
+        (
+            const unitConversion&,
+            const unitConversion&
+        );
+
+
+    // IOstream Operators
+
+        //- Read from stream
+        friend Istream& operator>>(Istream&, unitConversion&);
+
+        //- Write to stream
+        friend Ostream& operator<<(Ostream&, const unitConversion&);
+
+        //- Write info to stream
+        friend Ostream& operator<<(Ostream&, const InfoProxy<unitConversion>&);
+};
+
+
+// Global Functions
+
+//- Write a type with a given unit conversion
+template<class Type>
+void writeEntry(Ostream& os, const unitConversion&, const Type& t);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "unitConversionI.H"
+
+#ifdef NoRepository
+    #include "unitConversionTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/unitConversionI.H b/src/OpenFOAM/unitConversion/unitConversionI.H
new file mode 100644
index 0000000000..4f297ce00e
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/unitConversionI.H
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "unitConversion.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::dimensionSet& Foam::unitConversion::dimensions() const
+{
+    return dimensions_;
+}
+
+
+inline bool Foam::unitConversion::any() const
+{
+    return multiplier_ == 0;
+}
+
+
+inline bool Foam::unitConversion::none() const
+{
+    return multiplier_ == -1;
+}
+
+
+inline bool Foam::unitConversion::standard() const
+{
+    return multiplier_ == 1 || any() || none();
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/unitConversionIO.C b/src/OpenFOAM/unitConversion/unitConversionIO.C
new file mode 100644
index 0000000000..a5f28eb790
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/unitConversionIO.C
@@ -0,0 +1,386 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "unitConversion.H"
+#include "dictionary.H"
+#include "symbols.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::unitConversion::unitConversion(Istream& is)
+:
+    dimensions_(dimless),
+    multiplier_(NaN)
+{
+    is >> *this;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::unitConversion::read(const word& keyword, const dictionary& dict)
+{
+    const unitConversion units(dict.lookup(keyword));
+
+    if (!compare(*this, units, false))
+    {
+        FatalIOErrorInFunction(dict)
+            << "The units " << units.info() << " provided do not match "
+            << "the required units " << info()
+            << abort(FatalIOError);
+    }
+
+    reset(units);
+}
+
+
+bool Foam::unitConversion::readIfPresent
+(
+    const word& keyword,
+    const dictionary& dict
+)
+{
+    const entry* entryPtr = dict.lookupEntryPtr(keyword, false, true);
+
+    if (entryPtr)
+    {
+        const unitConversion units(entryPtr->stream());
+
+        if (!compare(*this, units, false))
+        {
+            FatalIOErrorInFunction(dict)
+                << "The units " << units.info() << " provided do not match "
+                << "the required units " << info()
+                << abort(FatalIOError);
+        }
+
+        reset(units);
+
+        return true;
+    }
+    else
+    {
+        if (dictionary::writeOptionalEntries)
+        {
+            IOInfoInFunction(dict)
+                << "Optional entry '" << keyword << "' is not present,"
+                << " the default value '" << info() << "' will be used."
+                << endl;
+        }
+
+        return false;
+    }
+}
+
+
+bool Foam::unitConversion::readIfPresent(Istream& is)
+{
+    token nextToken(is);
+    is.putBack(nextToken);
+
+    if (nextToken != token::BEGIN_SQR) return false;
+
+    unitConversion u(is);
+
+    if (!unitConversion::compare(u, *this, false))
+    {
+        FatalIOErrorInFunction(is)
+            << "The units " << u.info() << " provided do not match "
+            << "the required units " << info()
+            << abort(FatalIOError);
+    }
+
+    if (debug && (any() || !unitConversion::compare(u, *this, true)))
+    {
+        Info<< "Unit conversion at line " << is.lineNumber()
+            << " of file " << is.name()
+            << " with factor " << u.multiplier_ << endl;
+    }
+
+    reset(u);
+
+    return true;
+}
+
+
+bool Foam::unitConversion::readIfPresent
+(
+    const word& keyword,
+    const dictionary& dict,
+    Istream& is
+)
+{
+    token nextToken(is);
+    is.putBack(nextToken);
+
+    if (nextToken != token::BEGIN_SQR) return false;
+
+    unitConversion u(is);
+
+    if (!unitConversion::compare(u, *this, false))
+    {
+        FatalIOErrorInFunction(is)
+            << "The units " << u.info() << " of " << keyword
+            << " in dictionary " << dict.name() << " do not match "
+            << "the required units " << info()
+            << abort(FatalIOError);
+    }
+
+    if (debug && (any() || !unitConversion::compare(u, *this, true)))
+    {
+        Info<< "Unit conversion of " << keyword
+            << " in dictionary " << dict.name()
+            << " with factor " << u.multiplier_ << endl;
+    }
+
+    reset(u);
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, unitConversion& units)
+{
+    // Read beginning of unitConversion
+    token startToken(is);
+
+    if (startToken != token::BEGIN_SQR)
+    {
+        FatalIOErrorInFunction(is)
+            << "expected a " << token::BEGIN_SQR << " in unitConversion"
+            << endl << "in stream " << is.info()
+            << exit(FatalIOError);
+    }
+
+    // Peek at the next token
+    token nextToken(is);
+    is.putBack(nextToken);
+
+    if (!nextToken.isNumber())
+    {
+        // Named units. Parse.
+        units.reset(symbols::parseNoBegin(is, unitless, Foam::units()));
+    }
+    else
+    {
+        // Read the dimensions
+        units.dimensions_.readNoBegin(is);
+
+        // Read the dimensionless units if present, or set to zero
+        token nextToken;
+        if (!is.eof())
+        {
+            is  >> nextToken;
+        }
+        if (nextToken == token::BEGIN_SQR)
+        {
+            for (int i = 0; i < unitConversion::nDimlessUnits; ++ i)
+            {
+                is  >> units.exponents_[i];
+            }
+
+            // Check end of dimensionless units
+            token endToken(is);
+            if (endToken != token::END_SQR)
+            {
+                FatalIOErrorInFunction(is)
+                    << "expected a " << token::END_SQR
+                    << " in unitConversion " << endl << "in stream "
+                    << is.info() << exit(FatalIOError);
+            }
+
+            // Read the multiplier if present, or set to unity
+            token nextToken;
+            if (!is.eof())
+            {
+                is  >> nextToken;
+            }
+            if (nextToken == token::BEGIN_SQR)
+            {
+                is  >> units.multiplier_;
+
+                // Check end of multiplier
+                token endToken(is);
+                if (endToken != token::END_SQR)
+                {
+                    FatalIOErrorInFunction(is)
+                        << "expected a " << token::END_SQR
+                        << " in unitConversion " << endl << "in stream "
+                        << is.info() << exit(FatalIOError);
+                }
+            }
+            else
+            {
+                units.multiplier_ = 1;
+                if (!nextToken.undefined())
+                {
+                    is.putBack(nextToken);
+                }
+            }
+        }
+        else
+        {
+            for (int i = 0; i < unitConversion::nDimlessUnits; ++ i)
+            {
+                units.exponents_[i] = 0;
+            }
+            units.multiplier_ = 1;
+            if (!nextToken.undefined())
+            {
+                is.putBack(nextToken);
+            }
+        }
+    }
+
+    // Check state of Istream
+    is.check("Istream& operator>>(Istream&, unitConversion&)");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const unitConversion& units)
+{
+    // Write the dimensions
+    os  << units.dimensions_;
+
+    // Determine if any dimensionless units are non-zero
+    bool nonZeroDimlessUnits = false;
+    for (int i = 0; i < unitConversion::nDimlessUnits; ++ i)
+    {
+        nonZeroDimlessUnits =
+            nonZeroDimlessUnits
+         || mag(units.exponents_[i]) > unitConversion::smallExponent;
+    }
+
+    // Determine if the multiplier is non-unity
+    bool nonUnityMultiplier = units.multiplier_ != 1;
+
+    // Write the dimensionless units if any are non-zero or we have a
+    // multiplier to write out afterwards
+    if (nonZeroDimlessUnits || nonUnityMultiplier)
+    {
+        os  << token::BEGIN_SQR;
+        for (int i = 0; i < unitConversion::nDimlessUnits; ++ i)
+        {
+            if (i) os  << token::SPACE;
+            os  << units.exponents_[i];
+        }
+        os  << token::END_SQR;
+    }
+
+    // Write the multiplier if it is non-unity
+    if (nonUnityMultiplier)
+    {
+        os  << token::BEGIN_SQR << units.multiplier_ << token::END_SQR;
+    }
+
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const unitConversion&)");
+
+    return os;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<unitConversion>& ip
+)
+{
+    const unitConversion& units = ip.t_;
+
+    // Filter out special cases
+    if (units.any())
+    {
+        return os << token::BEGIN_SQR << "<any>" << token::END_SQR;
+    }
+    if (units.none())
+    {
+        return os << token::BEGIN_SQR << "<none>" << token::END_SQR;
+    }
+
+    // Write the dimensions
+    os << units.dimensions_.info();
+
+    // Determine if any dimensionless units are non-zero
+    bool nonZeroDimlessUnits = false;
+    for (int i = 0; i < unitConversion::nDimlessUnits; ++ i)
+    {
+        nonZeroDimlessUnits =
+            nonZeroDimlessUnits
+         || mag(units.exponents_[i]) > unitConversion::smallExponent;
+    }
+
+    // Determine if the multiplier is non-unity
+    bool nonUnityMultiplier = units.multiplier_ != 1;
+
+    // Write the dimensionless units if any are non-zero or we have a
+    // multiplier to write out afterwards
+    if (nonZeroDimlessUnits || nonUnityMultiplier)
+    {
+        // Write the dimensionless units
+        os << token::BEGIN_SQR;
+
+        for (int first=true, i=0; i<unitConversion::nDimlessUnits; i++)
+        {
+            if (mag(units.exponents_[i]) > unitConversion::smallExponent)
+            {
+                if (!first)
+                {
+                    os << token::SPACE;
+                }
+
+                os << unitConversion::dimlessUnitTypeNames_
+                      [static_cast<unitConversion::dimlessUnitType>(i)];
+
+                if (units.exponents_[i] != 1)
+                {
+                    os << '^' << units.exponents_[i];
+                }
+
+                first = false;
+            }
+        }
+
+        os << token::END_SQR;
+    }
+
+    // Write the multiplier if it is non-unity
+    if (nonUnityMultiplier)
+    {
+        os  << token::BEGIN_SQR << units.multiplier_ << token::END_SQR;
+    }
+
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const InfoProxy<unitConversion>&)");
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/unitConversionTemplates.C b/src/OpenFOAM/unitConversion/unitConversionTemplates.C
new file mode 100644
index 0000000000..8fb300d098
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/unitConversionTemplates.C
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "unitConversion.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class T>
+T Foam::unitConversion::toStandard(const T& t) const
+{
+    return standard() ? t : t*multiplier_;
+}
+
+
+template<class T>
+Foam::List<T> Foam::unitConversion::toStandard(const List<T>& l) const
+{
+    List<T> result(l.size());
+    forAll(l, i)
+    {
+        result[i] = toStandard(l[i]);
+    }
+    return result;
+}
+
+
+template<class T>
+Foam::tmp<Foam::Field<T>>
+Foam::unitConversion::toStandard(const Field<T>& f) const
+{
+    return standard() ? tmp<Field<T>>(f) : f*multiplier_;
+}
+
+
+template<class T>
+Foam::tmp<Foam::Field<T>>
+Foam::unitConversion::toStandard(const tmp<Field<T>>& tf) const
+{
+    return standard() ? tf : tf*multiplier_;
+}
+
+
+template<class T>
+void Foam::unitConversion::makeStandard(T& t) const
+{
+    if (!standard())
+    {
+        t *= multiplier_;
+    }
+}
+
+
+template<class T>
+void Foam::unitConversion::makeStandard(List<T>& l) const
+{
+    if (!standard())
+    {
+        forAll(l, i)
+        {
+            makeStandard(l[i]);
+        }
+    }
+}
+
+
+template<class T>
+T Foam::unitConversion::toUser(const T& t) const
+{
+    return standard() ? t : t/multiplier_;
+}
+
+
+template<class T>
+Foam::List<T> Foam::unitConversion::toUser(const List<T>& l) const
+{
+    List<T> result(l.size());
+    forAll(l, i)
+    {
+        result[i] = toUser(l[i]);
+    }
+    return result;
+}
+
+
+template<class T>
+Foam::tmp<Foam::Field<T>>
+Foam::unitConversion::toUser(const Field<T>& f) const
+{
+    return standard() ? tmp<Field<T>>(f) : f/multiplier_;
+}
+
+
+template<class T>
+Foam::tmp<Foam::Field<T>>
+Foam::unitConversion::toUser(const tmp<Field<T>>& tf) const
+{
+    return standard() ? tf : tf/multiplier_;
+}
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::writeEntry
+(
+    Ostream& os,
+    const unitConversion& defaultUnits,
+    const Type& t
+)
+{
+    return writeEntry(os, defaultUnits.toUser(t));
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/unitConversion/unitConversions.C b/src/OpenFOAM/unitConversion/unitConversions.C
new file mode 100644
index 0000000000..8589d693c2
--- /dev/null
+++ b/src/OpenFOAM/unitConversion/unitConversions.C
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "unitConversions.H"
+#include "demandDrivenData.H"
+#include "dictionary.H"
+
+using namespace Foam::constant::mathematical;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+dictionary* unitsDictPtr_(nullptr);
+
+const dictionary& unitsDict()
+{
+    if (!unitsDictPtr_)
+    {
+        dictionary* cachedPtr = nullptr;
+
+        unitsDictPtr_ = new dictionary
+        (
+            debug::switchSet
+            (
+                debug::controlDict().found("UnitConversions")
+              ? "UnitConversions"
+              : debug::controlDict().found("DimensionSets")
+              ? "DimensionSets"
+              : "UnitConversions",
+                cachedPtr
+            )
+        );
+    }
+
+    return *unitsDictPtr_;
+}
+
+HashTable<unitConversion>* addedUnitsPtr_(nullptr);
+HashTable<unitConversion>* unitsPtr_(nullptr);
+
+// Delete the above data at the end of the run
+struct deleteUnitsPtr
+{
+    ~deleteUnitsPtr()
+    {
+        deleteDemandDrivenData(unitsDictPtr_);
+        deleteDemandDrivenData(addedUnitsPtr_);
+        deleteDemandDrivenData(unitsPtr_);
+    }
+};
+
+deleteUnitsPtr deleteUnitsPtr_;
+
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+const Foam::unitConversion Foam::unitless(dimless, 0, 0, 1);
+
+const Foam::unitConversion Foam::unitAny(dimless, 0, 0, 0);
+const Foam::unitConversion Foam::unitNone(dimless, 0, 0, -1);
+
+const Foam::unitConversion Foam::unitFraction(dimless, 1, 0, 1);
+const Foam::unitConversion Foam::unitPercent(dimless, 1, 0, 0.01);
+
+const Foam::unitConversion Foam::unitRadians(dimless, 0, 1, 1);
+const Foam::unitConversion Foam::unitRotations(dimless, 0, 1, 2*pi);
+const Foam::unitConversion Foam::unitDegrees(dimless, 0, 1, pi/180);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::scalar Foam::degToRad(const scalar deg)
+{
+    return unitDegrees.toStandard(deg);
+}
+
+
+Foam::scalar Foam::radToDeg(const scalar rad)
+{
+    return unitDegrees.toUser(rad);
+}
+
+
+void Foam::addUnits(const word& name, const unitConversion& units)
+{
+    deleteDemandDrivenData(unitsDictPtr_);
+
+    if (!addedUnitsPtr_)
+    {
+        addedUnitsPtr_ = new HashTable<unitConversion>();
+    }
+
+    addedUnitsPtr_->insert(name, units);
+
+    deleteDemandDrivenData(unitsPtr_);
+}
+
+
+const Foam::HashTable<Foam::unitConversion>& Foam::units()
+{
+    if (!unitsPtr_)
+    {
+        unitsPtr_ = new HashTable<unitConversion>();
+
+        unitsPtr_->insert("%", unitPercent);
+
+        unitsPtr_->insert("rad", unitRadians);
+        unitsPtr_->insert("rot", unitRotations);
+        unitsPtr_->insert("deg", unitDegrees);
+
+        // Get the relevant part of the control dictionary
+        const dictionary& unitSetDict =
+            unitsDict().subDict(unitsDict().lookup<word>("unitSet") + "Coeffs");
+
+        // Add units from the control dictionary
+        forAllConstIter(dictionary, unitSetDict, iter)
+        {
+            ITstream& is = iter().stream();
+
+            const unitConversion units(is);
+            const scalar multiplier = pTraits<scalar>(is);
+
+            const bool ok =
+                unitsPtr_->insert
+                (
+                    iter().keyword(),
+                    units*unitConversion(dimless, 0, 0, multiplier)
+                );
+
+            if (!ok)
+            {
+                FatalIOErrorInFunction(unitsDict())
+                    << "Duplicate unit " << iter().keyword()
+                    << " read from dictionary"
+                    << exit(FatalIOError);
+            }
+        }
+
+        // Add programmatically defined units
+        if (addedUnitsPtr_)
+        {
+            forAllConstIter(HashTable<unitConversion>, *addedUnitsPtr_, iter)
+            {
+                const bool ok = unitsPtr_->insert(iter.key(), iter());
+
+                if (!ok)
+                {
+                    FatalIOErrorInFunction(unitsDict())
+                        << "Duplicate unit " << iter.key()
+                        << " added to dictionary"
+                        << exit(FatalIOError);
+                }
+            }
+        }
+    }
+
+    return *unitsPtr_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/unitConversion/unitConversion.H b/src/OpenFOAM/unitConversion/unitConversions.H
similarity index 62%
rename from src/OpenFOAM/global/unitConversion/unitConversion.H
rename to src/OpenFOAM/unitConversion/unitConversions.H
index 95bf81b76e..49fef60ce4 100644
--- a/src/OpenFOAM/global/unitConversion/unitConversion.H
+++ b/src/OpenFOAM/unitConversion/unitConversions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,18 +21,22 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-InNamespace
-    Foam
+Global
+    unitConversions
 
 Description
-    Unit conversion functions
+    Useful unit conversions
+
+SourceFiles
+    unitConversions.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef unitConversion_H
-#define unitConversion_H
+#ifndef unitConversions_H
+#define unitConversions_H
 
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
+#include "dimensionSets.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,29 +45,33 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Conversion from degrees to radians
-inline scalar degToRad(const scalar deg)
-{
-    return deg*constant::mathematical::pi/180.0;
-}
+extern const unitConversion unitless;
 
-//- Conversion from radians to degrees
-inline scalar radToDeg(const scalar rad)
-{
-    return rad*180.0/constant::mathematical::pi;
-}
+extern const unitConversion unitAny;
+extern const unitConversion unitNone;
 
-//- Conversion from atm to Pa
-inline scalar atmToPa(const scalar atm)
-{
-    return atm*101325.0;
-}
+extern const unitConversion unitFraction;
+extern const unitConversion unitPercent;
+
+extern const unitConversion unitRadians;
+extern const unitConversion unitRotations;
+extern const unitConversion unitDegrees;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Convert degrees to radians
+scalar degToRad(const scalar deg);
+
+//- Convert radians to degrees
+scalar radToDeg(const scalar rad);
+
+//- Add a unit conversion
+void addUnits(const word& name, const unitConversion& units);
+
+//- Get the table of unit conversions
+const HashTable<unitConversion>& units();
 
-//- Conversion from atm to Pa
-inline scalar paToAtm(const scalar pa)
-{
-    return pa/101325.0;
-}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C
index bf7b57dedf..e0e09db777 100644
--- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ coupledTemperatureFvPatchScalarField
                 << exit(FatalIOError);
         }
 
-        qs_ = new scalarField("qs", dict, p.size());
+        qs_ = new scalarField("qs", dimPower/dimTime, dict, p.size());
     }
     else if (dict.found("Qs"))
     {
@@ -186,14 +186,25 @@ coupledTemperatureFvPatchScalarField
         qs_ = new scalarField(p.size(), Qs_/gSum(patch().magSf()));
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    fvPatchScalarField::operator=
+    (
+        scalarField("value", iF.dimensions(), dict, p.size())
+    );
 
     if (dict.found("refValue"))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
+        refValue() = scalarField("refValue", iF.dimensions(), dict, p.size());
+        refGrad() =
+            scalarField
+            (
+                "refGradient",
+                iF.dimensions()/dimLength,
+                dict,
+                p.size()
+            );
+        valueFraction() =
+            scalarField("valueFraction", unitFraction, dict, p.size());
     }
     else
     {
diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C
index ef7b153e60..7ce86f2536 100644
--- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,41 +78,82 @@ externalTemperatureFvPatchScalarField
     Q_
     (
         haveQ_
-      ? Function1<scalar>::New("Q", dict)
+      ? Function1<scalar>::New("Q", db().time().userUnits(), dimPower, dict)
       : autoPtr<Function1<scalar>>()
     ),
     haveq_(dict.found("q")),
     q_
     (
         haveq_
-      ? Function1<scalar>::New("q", dict)
+      ? Function1<scalar>::New
+        (
+            "q",
+            db().time().userUnits(),
+            dimPower/dimArea,
+            dict
+        )
       : autoPtr<Function1<scalar>>()
     ),
     haveh_(dict.found("h")),
-    h_(haveh_ ? Function1<scalar>::New("h", dict).ptr() : nullptr),
-    Ta_(haveh_ ? Function1<scalar>::New("Ta", dict).ptr() : nullptr),
-    emissivity_(dict.lookupOrDefault<scalar>("emissivity", 0)),
+    h_
+    (
+        haveh_
+      ? Function1<scalar>::New
+        (
+            "h",
+            db().time().userUnits(),
+            dimPower/dimArea/dimTemperature,
+            dict
+        ).ptr()
+      : nullptr
+    ),
+    Ta_
+    (
+        haveh_
+      ? Function1<scalar>::New
+        (
+            "Ta",
+            db().time().userUnits(),
+            dimTemperature,
+            dict
+        ).ptr()
+      : nullptr
+    ),
+    emissivity_(dict.lookupOrDefault<scalar>("emissivity", unitFraction, 0)),
     thicknessLayers_
     (
-        dict.lookupOrDefault<scalarList>("thicknessLayers", scalarList())
+        dict.lookupOrDefault<scalarList>
+        (
+            "thicknessLayers",
+            dimLength,
+            scalarList()
+        )
     ),
     kappaLayers_
     (
-        dict.lookupOrDefault<scalarList>("kappaLayers", scalarList())
+        dict.lookupOrDefault<scalarList>
+        (
+            "kappaLayers",
+            dimThermalConductivity,
+            scalarList()
+        )
     ),
-    relax_(dict.lookupOrDefault<scalar>("relaxation", 1)),
+    relax_(dict.lookupOrDefault<scalar>("relaxation", unitFraction, 1)),
     qrName_(dict.lookupOrDefault<word>("qr", word::null)),
-    qrRelax_(dict.lookupOrDefault<scalar>("qrRelaxation", 1)),
+    qrRelax_(dict.lookupOrDefault<scalar>("qrRelaxation", unitFraction, 1)),
     qrPrevious_
     (
         qrName_ != word::null
       ? dict.found("qrPrevious")
-      ? scalarField("qrPrevious", dict, p.size())
+      ? scalarField("qrPrevious", dimPower/dimArea, dict, p.size())
       : scalarField(0, p.size())
       : scalarField()
     )
 {
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    fvPatchScalarField::operator=
+    (
+        scalarField("value", iF.dimensions(), dict, p.size())
+    );
 
     if (!haveQ_ && !haveq_ && !haveh_)
     {
@@ -133,9 +174,17 @@ externalTemperatureFvPatchScalarField
     if (dict.found("refValue"))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
+        refValue() = scalarField("refValue", iF.dimensions(), dict, p.size());
+        refGrad() =
+            scalarField
+            (
+                "refGradient",
+                iF.dimensions()/dimLength,
+                dict,
+                p.size()
+            );
+        valueFraction() =
+            scalarField("valueFraction", unitFraction, dict, p.size());
     }
     else
     {
@@ -263,11 +312,11 @@ void Foam::externalTemperatureFvPatchScalarField::updateCoeffs()
     scalarField sumq(qr);
     if (haveQ_)
     {
-        sumq += Q_->value(db().time().userTimeValue())/gSum(patch().magSf());
+        sumq += Q_->value(db().time().value())/gSum(patch().magSf());
     }
     if (haveq_)
     {
-        sumq += q_->value(db().time().userTimeValue());
+        sumq += q_->value(db().time().value());
     }
 
     scalarField kappa(size(), 0);
@@ -303,8 +352,8 @@ void Foam::externalTemperatureFvPatchScalarField::updateCoeffs()
             }
         }
 
-        const scalar h = h_->value(this->db().time().userTimeValue());
-        const scalar Ta = Ta_->value(this->db().time().userTimeValue());
+        const scalar h = h_->value(this->db().time().value());
+        const scalar Ta = Ta_->value(this->db().time().value());
 
         const scalarField hp
         (
@@ -375,18 +424,24 @@ void Foam::externalTemperatureFvPatchScalarField::write
 
     if (haveQ_)
     {
-        writeEntry(os, Q_());
+        writeEntry(os, db().time().userUnits(), dimPower, Q_());
     }
 
     if (haveq_)
     {
-        writeEntry(os, q_());
+        writeEntry(os, db().time().userUnits(), dimPower/dimArea, q_());
     }
 
     if (haveh_)
     {
-        writeEntry(os, h_());
-        writeEntry(os, Ta_());
+        writeEntry
+        (
+            os,
+            db().time().userUnits(),
+            dimPower/dimArea/dimTemperature,
+            h_()
+        );
+        writeEntry(os, db().time().userUnits(), dimTemperature, Ta_());
         writeEntryIfDifferent(os, "emissivity", scalar(0), emissivity_);
         writeEntryIfDifferent
         (
diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 8a49f382d3..77cabe37f3 100644
--- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -51,7 +51,7 @@ alphatJayatillekeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
+    Prt_(dict.lookupOrDefault<scalar>("Prt", dimless, 0.85))
 {}
 
 
diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index ec69d08540..63a67a87c8 100644
--- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
+    Prt_(dict.lookupOrDefault<scalar>("Prt", dimless, 0.85))
 {}
 
 
diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index 3f40e38947..597ad580ad 100644
--- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -45,7 +45,7 @@ convectiveHeatTransferFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    L_(dict.lookup<scalar>("L"))
+    L_(dict.lookup<scalar>("L", dimLength))
 {}
 
 
diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index a3dde0123c..b284664ab1 100644
--- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ thermalBaffle1DFvPatchScalarField
     solidDict_(dict),
     solidPtr_(),
     qrPrevious_(p.size(), 0.0),
-    qrRelaxation_(dict.lookupOrDefault<scalar>("qrRelaxation", 1)),
+    qrRelaxation_(dict.lookupOrDefault<scalar>("qrRelaxation", dimless, 1)),
     qrName_(dict.lookupOrDefault<word>("qr", "none"))
 {
     mappedPatchBaseBase::validateMapForField
@@ -67,33 +67,41 @@ thermalBaffle1DFvPatchScalarField
       & mappedPatchBaseBase::from::differentPatch
     );
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    fvPatchScalarField::operator=
+    (
+        scalarField("value", iF.dimensions(), dict, p.size())
+    );
 
     if (dict.found("thickness"))
     {
-        thickness_ = scalarField("thickness", dict, p.size());
+        thickness_ = scalarField("thickness", dimLength, dict, p.size());
     }
 
     if (dict.found("qs"))
     {
-        qs_ = scalarField("qs", dict, p.size());
-    }
-    else if (dict.found("Qs"))
-    {
-        qs_ = scalarField("Qs", dict, p.size());
+        qs_ = scalarField("qs", dimPower/dimArea, dict, p.size());
     }
 
     if (dict.found("qrPrevious"))
     {
-        qrPrevious_ = scalarField("qrPrevious", dict, p.size());
+        qrPrevious_ =
+            scalarField("qrPrevious", dimPower/dimArea, dict, p.size());
     }
 
     if (dict.found("refValue") && baffleActivated_)
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
+        refValue() = scalarField("refValue", iF.dimensions(), dict, p.size());
+        refGrad() =
+            scalarField
+            (
+                "refGradient",
+                iF.dimensions()/dimLength,
+                dict,
+                p.size()
+            );
+        valueFraction() =
+            scalarField("valueFraction", unitFraction, dict, p.size());
     }
     else
     {
diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index 05cfcf202c..67aefeb8e8 100644
--- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,9 +41,11 @@ totalFlowRateAdvectiveDiffusiveFvPatchScalarField
     mixedFvPatchField<scalar>(p, iF, dict, false),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "none")),
-    massFluxFraction_(dict.lookupOrDefault<scalar>("massFluxFraction", 1.0))
+    massFluxFraction_
+    (
+        dict.lookupOrDefault<scalar>("massFluxFraction", dimless, 1.0)
+    )
 {
-
     refValue() = 1.0;
     refGrad() = 0.0;
     valueFraction() = 0.0;
@@ -52,7 +54,7 @@ totalFlowRateAdvectiveDiffusiveFvPatchScalarField
     {
         fvPatchField<scalar>::operator=
         (
-            Field<scalar>("value", dict, p.size())
+            Field<scalar>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
index b5909fa1ac..a0c54d75f9 100644
--- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
+++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,6 +65,7 @@ class totalFlowRateAdvectiveDiffusiveFvPatchScalarField
         //- Mass flux fraction
         scalar massFluxFraction_;
 
+
 public:
 
     //- Runtime type information
diff --git a/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.C b/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.C
index d67a2830b6..e05dabd5ce 100644
--- a/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.C
+++ b/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ void Fickian<BasicThermophysicalTransportModel>::updateDm() const
     {
         forAll(Y, i)
         {
-            Dm_.set(i, evaluate(DmFuncs_[i], dimViscosity, p, T));
+            Dm_.set(i, evaluate(DmFuncs_[i], dimKinematicViscosity, p, T));
         }
     }
     else
@@ -63,7 +63,7 @@ void Fickian<BasicThermophysicalTransportModel>::updateDm() const
             (
                 "sumXbyD",
                 T.mesh(),
-                dimless/dimViscosity/Wm.dimensions()
+                dimless/dimKinematicViscosity/Wm.dimensions()
             )
         );
 
@@ -78,11 +78,23 @@ void Fickian<BasicThermophysicalTransportModel>::updateDm() const
                     sumXbyD +=
                         Y[j]
                        /(
-                           this->thermo().Wi(j)
-                          *(
-                               i < j
-                             ? evaluate(DFuncs_[i][j], dimViscosity, p, T)
-                             : evaluate(DFuncs_[j][i], dimViscosity, p, T)
+                            this->thermo().Wi(j)
+                           *(
+                                i < j
+                              ? evaluate
+                                (
+                                    DFuncs_[i][j],
+                                    dimKinematicViscosity,
+                                    p,
+                                    T
+                                )
+                              : evaluate
+                                (
+                                    DFuncs_[j][i],
+                                    dimKinematicViscosity,
+                                    p,
+                                    T
+                                )
                            )
                        );
                 }
@@ -151,10 +163,7 @@ Fickian<BasicThermophysicalTransportModel>::Fickian
 template<class BasicThermophysicalTransportModel>
 bool Fickian<BasicThermophysicalTransportModel>::read()
 {
-    if
-    (
-        BasicThermophysicalTransportModel::read()
-    )
+    if (BasicThermophysicalTransportModel::read())
     {
         const speciesTable& species = this->thermo().species();
 
@@ -170,7 +179,14 @@ bool Fickian<BasicThermophysicalTransportModel>::read()
                 DmFuncs_.set
                 (
                     i,
-                    Function2<scalar>::New(species[i], Ddict).ptr()
+                    Function2<scalar>::New
+                    (
+                        species[i],
+                        dimPressure,
+                        dimTemperature,
+                        dimKinematicViscosity,
+                        Ddict
+                    ).ptr()
                 );
             }
         }
@@ -225,7 +241,14 @@ bool Fickian<BasicThermophysicalTransportModel>::read()
                         DFuncs_[i].set
                         (
                             j,
-                            Function2<scalar>::New(Dname, Ddict).ptr()
+                            Function2<scalar>::New
+                            (
+                                Dname,
+                                dimPressure,
+                                dimTemperature,
+                                dimKinematicViscosity,
+                                Ddict
+                            ).ptr()
                         );
                     }
                 }
@@ -243,7 +266,14 @@ bool Fickian<BasicThermophysicalTransportModel>::read()
                 DTFuncs_.set
                 (
                     i,
-                    Function2<scalar>::New(species[i], DTdict).ptr()
+                    Function2<scalar>::New
+                    (
+                        species[i],
+                        dimPressure,
+                        dimTemperature,
+                        dimDynamicViscosity,
+                        DTdict
+                    ).ptr()
                 );
             }
         }
diff --git a/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.C b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.C
index 439bf4c4ce..baeb0e3477 100644
--- a/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.C
+++ b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,7 +256,7 @@ void MaxwellStefan<BasicThermophysicalTransportModel>::updateDii() const
             }
         }
 
-        Dii_.set(i, evaluate(DFuncs_[i][i], dimViscosity, p, T));
+        Dii_.set(i, evaluate(DFuncs_[i][i], dimKinematicViscosity, p, T));
 
         Dij[i].setSize(Y.size());
 
@@ -264,7 +264,11 @@ void MaxwellStefan<BasicThermophysicalTransportModel>::updateDii() const
         {
             if (j > i)
             {
-                Dij[i].set(j, evaluate(DFuncs_[i][j], dimViscosity, p, T));
+                Dij[i].set
+                (
+                    j,
+                    evaluate(DFuncs_[i][j], dimKinematicViscosity, p, T)
+                );
             }
             else if (j < i)
             {
@@ -448,7 +452,14 @@ bool MaxwellStefan<BasicThermophysicalTransportModel>::read()
                     DFuncs_[i].set
                     (
                         j,
-                        Function2<scalar>::New(Dname, Ddict).ptr()
+                        Function2<scalar>::New
+                        (
+                            Dname,
+                            dimPressure,
+                            dimTemperature,
+                            dimKinematicViscosity,
+                            Ddict
+                        ).ptr()
                     );
                 }
             }
@@ -465,7 +476,14 @@ bool MaxwellStefan<BasicThermophysicalTransportModel>::read()
                 DTFuncs_.set
                 (
                     i,
-                    Function2<scalar>::New(species[i], DTdict).ptr()
+                    Function2<scalar>::New
+                    (
+                        species[i],
+                        dimPressure,
+                        dimTemperature,
+                        dimDynamicViscosity,
+                        DTdict
+                    ).ptr()
                 );
             }
         }
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index 2294d743fe..80da145d93 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,19 +110,27 @@ Foam::atmBoundaryLayer::atmBoundaryLayer
     const dictionary& dict
 )
 :
-    flowDir_(dict.lookup("flowDir")),
-    zDir_(dict.lookup("zDir")),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", kappaDefault_)),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", CmuDefault_)),
-    Uref_(dict.lookup<scalar>("Uref")),
-    Zref_(dict.lookup<scalar>("Zref")),
-    z0_("z0", dict, p.size()),
-    zGround_("zGround", dict, p.size()),
+    flowDir_(dict.lookup<vector>("flowDir", dimless)),
+    zDir_(dict.lookup<vector>("zDir", dimless)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", dimless, kappaDefault_)),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", dimless, CmuDefault_)),
+    Uref_(dict.lookup<scalar>("Uref", dimVelocity)),
+    Zref_(dict.lookup<scalar>("Zref", dimLength)),
+    z0_("z0", dimLength, dict, p.size()),
+    zGround_("zGround", dimLength, dict, p.size()),
     Ustar_(p.size()),
     offset_(dict.found("Ulower")),
-    Ulower_(dict.lookupOrDefault<scalar>("Ulower", 0)),
-    kLower_(dict.lookupOrDefault<scalar>("kLower", 0)),
-    epsilonLower_(dict.lookupOrDefault<scalar>("epsilonLower", 0))
+    Ulower_(dict.lookupOrDefault<scalar>("Ulower", dimVelocity, 0)),
+    kLower_(dict.lookupOrDefault<scalar>("kLower", dimEnergy/dimMass, 0)),
+    epsilonLower_
+    (
+        dict.lookupOrDefault<scalar>
+        (
+            "epsilonLower",
+            dimEnergy/dimMass/dimTime,
+            0
+        )
+    )
 {
     init();
 }
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index 812bcc15d2..cc0b3b815c 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,10 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
 
     if (dict.found("value"))
     {
-        scalarField::operator=(scalarField("value", dict, p.size()));
+        scalarField::operator=
+        (
+            scalarField("value", iF.dimensions(), dict, p.size())
+        );
     }
     else
     {
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
index e00134c7ce..5f33063afb 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,10 @@ atmBoundaryLayerInletKFvPatchScalarField
 
     if (dict.found("value"))
     {
-        scalarField::operator=(scalarField("value", dict, p.size()));
+        scalarField::operator=
+        (
+            scalarField("value", iF.dimensions(), dict, p.size())
+        );
     }
     else
     {
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index 3e2fa0c0cc..b06bcbbefa 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,10 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
 
     if (dict.found("value"))
     {
-        vectorField::operator=(vectorField("value", dict, p.size()));
+        vectorField::operator=
+        (
+            vectorField("value", iF.dimensions(), dict, p.size())
+        );
     }
     else
     {
diff --git a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
index 638eee90ff..038d1a4b62 100644
--- a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ nutkAtmRoughWallFunctionFvPatchScalarField
 )
 :
     nutkWallFunctionFvPatchScalarField(p, iF, dict),
-    z0_("z0", dict, p.size())
+    z0_("z0", dimLength, dict, p.size())
 {}
 
 
diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
index bff58da3f0..035f897e89 100644
--- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
+++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
@@ -81,6 +81,8 @@ Foam::porosityModels::powerLawLopesdaCostaZone::powerLawLopesdaCostaZone
                 false,
                 true
             ).keyword(),
+            dimLength,
+            dimArea/dimVolume,
             dict
         )
     );
diff --git a/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.C b/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.C
index 26b9a5d5f9..a8a1854642 100644
--- a/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.C
+++ b/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.C
@@ -40,7 +40,7 @@ labelList primitivePatchGetZones
     const scalar includedAngle
 )
 {
-    const scalar minCos = Foam::cos(degToRad(180.0 - includedAngle));
+    const scalar minCos = Foam::cos(degToRad(180.0) - includedAngle);
 
     const labelListList& edgeFaces = pp.edgeFaces();
     const labelListList& faceEdges = pp.faceEdges();
@@ -154,7 +154,7 @@ boolList primitivePatchGetHalves
     {
         FatalErrorInFunction
             << "Patch did not divide into halves based on topology and an "
-            << "included angle of " << includedAngle << " degrees"
+            << "included angle of " << radToDeg(includedAngle) << " degrees"
             << exit(FatalError);
     }
 
diff --git a/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.H b/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.H
index 986a081fe5..168590d650 100644
--- a/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.H
+++ b/src/conversion/mergedCyclic/polyMeshUnMergeCyclics.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #define polyMeshUnMergeCyclics_H
 
 #include "polyMesh.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +39,11 @@ namespace Foam
 //- Find all patches of type "mergedCyclic" in the given mesh and split them
 //  into two "standard" cyclics, using the given included angle to
 //  geometrically separate the halves if they meet at an angle at the axis
-void polyMeshUnMergeCyclics(polyMesh& mesh, const scalar includedAngle=165);
+void polyMeshUnMergeCyclics
+(
+    polyMesh& mesh,
+    const scalar includedAngle=degToRad(165)
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 1005f6fd96..3affe27363 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,7 +175,7 @@ Foam::MRFZone::MRFZone
     cellSet_(mesh, coeffs_),
     origin_(coeffs_.lookup("origin")),
     axis_(coeffs_.lookup("axis")),
-    omega_(coeffs_)
+    omega_(mesh.time(), coeffs_)
 {
     axis_ = axis_/mag(axis_);
     setMRFFaces();
@@ -186,7 +186,7 @@ Foam::MRFZone::MRFZone
 
 Foam::vector Foam::MRFZone::Omega() const
 {
-    return omega_.value(mesh_.time().userTimeValue())*axis_;
+    return omega_.value(mesh_.time().value())*axis_;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C
index 7729da8135..9f99d7a120 100644
--- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ MRFFreestreamVelocityFvPatchVectorField
 :
     freestreamVelocityFvPatchVectorField(p, iF, dict),
     MRFPatchField(dict),
-    freestreamValue0_(dict.lookup("freestreamValue0"))
+    freestreamValue0_(dict.lookup<vector>("freestreamValue0", dimVelocity))
 {}
 
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C
index b336900ae5..5d65f1a0b2 100644
--- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::MRFnoSlipFvPatchVectorField::MRFnoSlipFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C
index c475fbb82c..505a02d693 100644
--- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::MRFslipFvPatchVectorField::MRFslipFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
index ae3cb084d0..5dd4ade746 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ Foam::porosityModels::solidification::solidification
     TName_(coeffs_.lookupOrDefault<word>("T", "T")),
     alphaName_(coeffs_.lookupOrDefault<word>("alpha", "none")),
     rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
-    D_(Function1<scalar>::New("D", coeffs_))
+    D_(Function1<scalar>::New("D", dimTemperature, dimless/dimTime, coeffs_))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvFieldSources/derived/turbulentIntensityKineticEnergy/turbulentIntensityKineticEnergyFvScalarFieldSource.C b/src/finiteVolume/fields/fvFieldSources/derived/turbulentIntensityKineticEnergy/turbulentIntensityKineticEnergyFvScalarFieldSource.C
index 99b21c2c36..4dc2012769 100644
--- a/src/finiteVolume/fields/fvFieldSources/derived/turbulentIntensityKineticEnergy/turbulentIntensityKineticEnergyFvScalarFieldSource.C
+++ b/src/finiteVolume/fields/fvFieldSources/derived/turbulentIntensityKineticEnergy/turbulentIntensityKineticEnergyFvScalarFieldSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ turbulentIntensityKineticEnergyFvScalarFieldSource
 )
 :
     fvScalarFieldSource(iF, dict),
-    intensity_(dict.lookup<scalar>("intensity")),
+    intensity_(dict.lookup<scalar>("intensity", unitFraction)),
     UName_(dict.lookupOrDefault<word>("U", "U"))
 {}
 
diff --git a/src/finiteVolume/fields/fvFieldSources/derived/uniformFixedValue/uniformFixedValueFvFieldSource.C b/src/finiteVolume/fields/fvFieldSources/derived/uniformFixedValue/uniformFixedValueFvFieldSource.C
index bcce225787..cb2728b397 100644
--- a/src/finiteVolume/fields/fvFieldSources/derived/uniformFixedValue/uniformFixedValueFvFieldSource.C
+++ b/src/finiteVolume/fields/fvFieldSources/derived/uniformFixedValue/uniformFixedValueFvFieldSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,16 @@ Foam::uniformFixedValueFvFieldSource<Type>::uniformFixedValueFvFieldSource
 )
 :
     fvFieldSource<Type>(iF, dict),
-    uniformValue_(Function1<Type>::New("uniformValue", dict))
+    uniformValue_
+    (
+        Function1<Type>::New
+        (
+            "uniformValue",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {}
 
 
@@ -67,8 +76,7 @@ Foam::uniformFixedValueFvFieldSource<Type>::sourceValue
     const fvSource& source
 ) const
 {
-    const scalar t = this->db().time().userTimeValue();
-    const Type v = uniformValue_->value(t);
+    const Type v = uniformValue_->value(this->db().time().value());
     return tmp<Field<Type>>(new Field<Type>(source.nCells(), v));
 }
 
@@ -88,7 +96,13 @@ template<class Type>
 void Foam::uniformFixedValueFvFieldSource<Type>::write(Ostream& os) const
 {
     fvFieldSource<Type>::write(os);
-    writeEntry(os, uniformValue_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        uniformValue_()
+    );
 }
 
 
diff --git a/src/finiteVolume/fields/fvFieldSources/derived/uniformInletOutlet/uniformInletOutletFvFieldSource.C b/src/finiteVolume/fields/fvFieldSources/derived/uniformInletOutlet/uniformInletOutletFvFieldSource.C
index e6a5fd28f2..e6c0047dc5 100644
--- a/src/finiteVolume/fields/fvFieldSources/derived/uniformInletOutlet/uniformInletOutletFvFieldSource.C
+++ b/src/finiteVolume/fields/fvFieldSources/derived/uniformInletOutlet/uniformInletOutletFvFieldSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,16 @@ Foam::uniformInletOutletFvFieldSource<Type>::uniformInletOutletFvFieldSource
 )
 :
     fvFieldSource<Type>(iF, dict),
-    uniformInletValue_(Function1<Type>::New("uniformInletValue", dict))
+    uniformInletValue_
+    (
+        Function1<Type>::New
+        (
+            "uniformInletValue",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {}
 
 
@@ -67,7 +76,7 @@ Foam::uniformInletOutletFvFieldSource<Type>::sourceValue
     const fvSource& source
 ) const
 {
-    const scalar t = this->db().time().userTimeValue();
+    const scalar t = this->db().time().value();
     const Type v = uniformInletValue_->value(t);
     return tmp<Field<Type>>(new Field<Type>(source.nCells(), v));
 }
@@ -90,7 +99,13 @@ template<class Type>
 void Foam::uniformInletOutletFvFieldSource<Type>::write(Ostream& os) const
 {
     fvFieldSource<Type>::write(os);
-    writeEntry(os, uniformInletValue_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        uniformInletValue_()
+    );
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
index 6b14a579fa..485fcfeffb 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,9 +51,9 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
 )
 :
     transformFvPatchField<Type>(p, iF, dict),
-    refValue_("refValue", dict, p.size()),
-    refGrad_("refGradient", dict, p.size()),
-    valueFraction_("valueFraction", dict, p.size())
+    refValue_("refValue", iF.dimensions(), dict, p.size()),
+    refGrad_("refGradient", iF.dimensions()/dimLength, dict, p.size()),
+    valueFraction_("valueFraction", unitFraction, dict, p.size())
 {
     evaluate();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index 86f2b31109..3ca4e46d7b 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,14 @@ Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
     {
         if (dict.found("gradient"))
         {
-            gradient_ = Field<Type>("gradient", dict, p.size());
+            gradient_ =
+                Field<Type>
+                (
+                    "gradient",
+                    iF.dimensions()/dimLength,
+                    dict,
+                    p.size()
+                );
             evaluate();
         }
         else
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index 34f4ce3fbc..60010dfb03 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,14 @@ Foam::mixedFvPatchField<Type>::mixedFvPatchField
     {
         if (dict.found("refValue"))
         {
-            refValue_ = Field<Type>("refValue", dict, p.size());
+            refValue_ =
+                Field<Type>
+                (
+                    "refValue",
+                    iF.dimensions(),
+                    dict,
+                    p.size()
+                );
         }
         else
         {
@@ -70,7 +77,14 @@ Foam::mixedFvPatchField<Type>::mixedFvPatchField
 
         if (dict.found("refGradient"))
         {
-            refGrad_ = Field<Type>("refGradient", dict, p.size());
+            refGrad_ =
+                Field<Type>
+                (
+                    "refGradient",
+                    iF.dimensions()/dimLength,
+                    dict,
+                    p.size()
+                );
         }
         else
         {
@@ -81,7 +95,8 @@ Foam::mixedFvPatchField<Type>::mixedFvPatchField
 
         if (dict.found("valueFraction"))
         {
-            valueFraction_ = Field<scalar>("valueFraction", dict, p.size());
+            valueFraction_ =
+                Field<scalar>("valueFraction", unitFraction, dict, p.size());
         }
         else
         {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 97611fca49..0706180f8f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     {
         fvPatchField<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -64,21 +64,19 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 
-    if (dict.readIfPresent("lInf", lInf_))
+    if (dict.readIfPresent<scalar>("lInf", dimLength, lInf_))
     {
-        dict.lookup("fieldInf") >> fieldInf_;
-
         if (lInf_ < 0.0)
         {
-            FatalIOErrorInFunction
-            (
-                dict
-            )   << "unphysical lInf specified (lInf < 0)" << nl
+            FatalIOErrorInFunction(dict)
+                << "unphysical lInf specified (lInf < 0)" << nl
                 << "    on patch " << this->patch().name()
                 << " of field " << this->internalField().name()
                 << " in file " << this->internalField().objectPath()
                 << exit(FatalIOError);
         }
+
+        fieldInf_ = dict.lookup<Type>("fieldInf", iF.dimensions());
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C
index 6daad19a1e..0578395f9e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,14 +120,14 @@ Foam::dynamicPressureFvPatchScalarField::dynamicPressureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF, dict, false),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     psiName_(dict.lookupOrDefault<word>("psi", "none")),
-    gamma_(dict.lookupOrDefault<scalar>("gamma", 1)),
-    p0_("p0", dict, p.size())
+    gamma_(dict.lookupOrDefault<scalar>("gamma", dimless, 1)),
+    p0_("p0", dimPressure, dict, p.size())
 {
     if (dict.found("value"))
     {
         fvPatchField<scalar>::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
index 489569378e..cd51697ef4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -464,7 +464,7 @@ externalCoupledMixedFvPatchField
     {
         fvPatchField<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
index 6dd8343a8a..4b0170711c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,16 @@ Foam::fanPressureFvPatchScalarField::fanPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(p, iF, dict),
-    fanCurve_(Function1<scalar>::New("fanCurve", dict)),
+    fanCurve_
+    (
+        Function1<scalar>::New
+        (
+            "fanCurve",
+            dimVolumetricFlux,
+            iF.dimensions(),
+            dict
+        )
+    ),
     direction_(fanFlowDirectionNames_.read(dict.lookup("direction")))
 {}
 
@@ -111,7 +120,7 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs()
 
     // Get the volumetric flow rate
     scalar volFlowRate = 0;
-    if (phip.internalField().dimensions() == dimFlux)
+    if (phip.internalField().dimensions() == dimVolumetricFlux)
     {
         volFlowRate = sign*gSum(phip);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
index 2206599d9b..585d4806e9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 Usage
     \table
         Property     | Description             | Required    | Default value
-        fanCurve     | fan curve file name     | yes         |
+        fanCurve     | fan curve function      | yes         |
         p0           | environmental total pressure | yes    |
     \endtable
 
@@ -46,8 +46,7 @@ Usage
             file            "$FOAM_CASE/constant/pressureVsQ";
             format          csv;
             nHeaderLine     1;
-            refColumn       0;
-            componentColumns 1(1);
+            columns         (0 1);
             separator       ",";
             mergeSeparators no;
             outOfBounds     clamp;
@@ -67,8 +66,7 @@ Usage
             file            "$FOAM_CASE/constant/pressureVsQ";
             format          csv;
             nHeaderLine     1;
-            refColumn       0;
-            componentColumns 1(1);
+            columns         (0 1);
             separator       ",";
             mergeSeparators no;
             outOfBounds     clamp;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C
index dc7b0d1b86..60994ae06f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C
@@ -56,20 +56,29 @@ Foam::fanPressureJumpFvPatchScalarField::fanPressureJumpFvPatchScalarField
 {
     if (cyclicPatch().owner())
     {
-        if (dict.found("fanCurve"))
-        {
-            // Preferred entry name
-            fanCurve_ = Function1<scalar>::New("fanCurve", dict);
-        }
-        else if (dict.found("jumpTable"))
+        if (!dict.found("fanCurve") && dict.found("jumpTable"))
         {
             // Backwards compatibility fallback
-            jumpTable_ = Function1<scalar>::New("jumpTable", dict);
+            jumpTable_ =
+                Function1<scalar>::New
+                (
+                    "jumpTable",
+                    dimVelocity,
+                    iF.dimensions(),
+                    dict
+                );
         }
         else
         {
-            // Call function construction for error message
-            fanCurve_ = Function1<scalar>::New("fanCurve", dict);
+            // Preferred entry name
+            fanCurve_ =
+                Function1<scalar>::New
+                (
+                    "fanCurve",
+                    dimVolumetricFlux,
+                    iF.dimensions(),
+                    dict
+                );
         }
     }
 }
@@ -129,7 +138,7 @@ void Foam::fanPressureJumpFvPatchScalarField::updateCoeffs()
 
             scalar volFlowRate = 0;
 
-            if (phip.internalField().dimensions() == dimFlux)
+            if (phip.internalField().dimensions() == dimVolumetricFlux)
             {
                 volFlowRate = gSum(phip);
             }
@@ -161,7 +170,7 @@ void Foam::fanPressureJumpFvPatchScalarField::updateCoeffs()
 
             scalarField Un(max(sign*phip/patch().magSf(), scalar(0)));
 
-            if (phip.internalField().dimensions() == dimFlux)
+            if (phip.internalField().dimensions() == dimVolumetricFlux)
             {
                 // Do nothing
             }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H
index 7320e48013..27f79254be 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H
@@ -57,8 +57,7 @@ Usage
             file            "$FOAM_CASE/constant/pressureVsQ";
             format          csv;
             nHeaderLine     1;
-            refColumn       0;
-            componentColumns 1(1);
+            columns         (0 1);
             separator       ",";
             mergeSeparators no;
             outOfBounds     clamp;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index 90debefbb8..57eeafa246 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,8 +43,12 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 {
     if (dict.found("value") && dict.found("gradient"))
     {
-        fvPatchField<scalar>::operator=(scalarField("value", dict, p.size()));
-        gradient() = scalarField("gradient", dict, p.size());
+        fvPatchField<scalar>::operator=
+        (
+            scalarField("value", iF.dimensions(), dict, p.size())
+        );
+        gradient() =
+            scalarField("gradient", iF.dimensions()/dimLength, dict, p.size());
     }
     else
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index 53dcba8b0f..4cd3e55cf6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -59,7 +59,7 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
     {
         if (this->cyclicPatch().owner())
         {
-            jump_ = Field<Type>("jump", dict, p.size());
+            jump_ = Field<Type>("jump", iF.dimensions(), dict, p.size());
         }
 
         this->evaluateNoUpdateCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index d5da00ab6e..dc4a13b717 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,16 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict),
-    meanValue_(Function1<Type>::New("meanValue", dict))
+    meanValue_
+    (
+        Function1<Type>::New
+        (
+            "meanValue",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {}
 
 
@@ -77,8 +86,7 @@ void Foam::fixedMeanFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    Type meanValue = meanValue_->value(t);
+    Type meanValue = meanValue_->value(this->db().time().value());
 
     Field<Type> newValues(this->patchInternalField());
 
@@ -105,7 +113,13 @@ template<class Type>
 void Foam::fixedMeanFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    writeEntry(os, meanValue_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        meanValue_()
+    );
     writeEntry(os, "value", *this);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
index 868602cd91..df0f5868ed 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,13 +38,22 @@ Foam::fixedMeanOutletInletFvPatchField<Type>::fixedMeanOutletInletFvPatchField
 )
 :
     outletInletFvPatchField<Type>(p, iF),
-    meanValue_(Function1<Type>::New("meanValue", dict))
+    meanValue_
+    (
+        Function1<Type>::New
+        (
+            "meanValue",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
 
     fvPatchField<Type>::operator=
     (
-        Field<Type>("value", dict, p.size())
+        Field<Type>("value", iF.dimensions(), dict, p.size())
     );
 
     this->refValue() = *this;
@@ -89,8 +98,7 @@ void Foam::fixedMeanOutletInletFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    Type meanValue = meanValue_->value(t);
+    Type meanValue = meanValue_->value(this->db().time().value());
 
     Field<Type> newValues(this->patchInternalField());
 
@@ -117,7 +125,13 @@ template<class Type>
 void Foam::fixedMeanOutletInletFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    writeEntry(os, meanValue_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        meanValue_()
+    );
     writeEntry(os, "value", *this);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index 4ca7c580fb..d560277a20 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,10 @@ fixedNormalInletOutletVelocityFvPatchVectorField
         fvPatchVectorField::New(p, iF, dict.subDict("normalVelocity"))
     )
 {
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    fvPatchVectorField::operator=
+    (
+        vectorField("value", iF.dimensions(), dict, p.size())
+    );
     refValue() = normalVelocity();
     refGrad() = Zero;
     valueFraction() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index a0c985ce8c..7322ca3926 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
 )
 :
     transformFvPatchField<Type>(p, iF),
-    fixedValue_("fixedValue", dict, p.size())
+    fixedValue_("fixedValue", iF.dimensions(), dict, p.size())
 {
     evaluate();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index d631dffb1d..b6738dfbd3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,9 +51,12 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict, false),
-    profile_(Function1<Type>::New("profile", dict)),
-    origin_(dict.lookup<scalar>("origin")),
-    direction_(dict.lookup("direction"))
+    profile_
+    (
+        Function1<Type>::New("profile", dimLength, iF.dimensions(), dict)
+    ),
+    origin_(dict.lookup<scalar>("origin", dimLength)),
+    direction_(dict.lookup<vector>("direction", dimless))
 {
     if (mag(direction_) == 0)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
index 59b03ffd45..47a533744d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,8 +48,7 @@ Usage
             file                "UProfile";
             format              csv;
             nHeaderLine         0;
-            refColumn           0;
-            componentColumns    (1 2 3);
+            columns             (0 (1 2 3));
             separator           ",";
             mergeSeparators     no;
             outOfBounds         clamp;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 7488b89f0b..81331cde34 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -76,7 +76,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateValues
 
     const scalar avgU =
        scale
-      *flowRate_->value(db().time().userTimeValue())
+      *flowRate_->value(db().time().value())
       /gSum(alpha*rho*profile*patch().magSf());
 
     operator==(- avgU*profile*patch().nf());
@@ -148,7 +148,7 @@ flowRateInletVelocityFvPatchVectorField
     volumetric_(),
     profile_(),
     rhoName_("rho"),
-    rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", -vGreat)),
+    rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", dimDensity, -vGreat)),
     alphaName_(dict.lookupOrDefault<word>("alpha", word::null)),
     y_(),
     area_(NaN)
@@ -157,19 +157,40 @@ flowRateInletVelocityFvPatchVectorField
     {
         meanVelocity_ = true;
         volumetric_ = false;
-        flowRate_ = Function1<scalar>::New("meanVelocity", dict);
+        flowRate_ =
+            Function1<scalar>::New
+            (
+                "meanVelocity",
+                db().time().userUnits(),
+                dimVelocity,
+                dict
+            );
     }
     else if (dict.found("volumetricFlowRate"))
     {
         meanVelocity_ = false;
         volumetric_ = true;
-        flowRate_ = Function1<scalar>::New("volumetricFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New
+            (
+                "volumetricFlowRate",
+                db().time().userUnits(),
+                dimVolumetricFlux,
+                dict
+            );
     }
     else if (dict.found("massFlowRate"))
     {
         meanVelocity_ = false;
         volumetric_ = false;
-        flowRate_ = Function1<scalar>::New("massFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New
+            (
+                "massFlowRate",
+                db().time().userUnits(),
+                dimMassFlux,
+                dict
+            );
         rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
     }
     else
@@ -181,7 +202,7 @@ flowRateInletVelocityFvPatchVectorField
 
     if (dict.found("profile"))
     {
-        profile_ = Function1<scalar>::New("profile", dict);
+        profile_ = Function1<scalar>::New("profile", dimless, dimless, dict);
     }
 
     if (canEvaluate())
@@ -193,7 +214,7 @@ flowRateInletVelocityFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -320,7 +341,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
 void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchField<vector>::write(os);
-    writeEntry(os, flowRate_());
+    writeEntry(os, db().time().userUnits(), unitAny, flowRate_());
     if (profile_.valid())
     {
         writeEntry(os, profile_());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.C
index 03bb9e7518..75ef5ccb49 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,7 @@ namespace Function1s
 Foam::Function1s::laminarBL::laminarBL
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -56,7 +57,11 @@ Foam::Function1s::laminarBL::~laminarBL()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::Function1s::laminarBL::write(Ostream& os) const
+void Foam::Function1s::laminarBL::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.H
index 098757c780..859188b04e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/laminarBL/laminarBL.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,6 +76,7 @@ public:
         laminarBL
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -97,7 +98,7 @@ public:
         ) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.C
index 5bc321d8c3..2b4f3097f6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.C
@@ -41,11 +41,12 @@ namespace Function1s
 Foam::Function1s::turbulentBL::turbulentBL
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     FieldFunction1<scalar, turbulentBL>(name),
-    exponent_(dict.lookupOrDefault<scalar>("exponent", 1.0/7.0))
+    exponent_(dict.lookupOrDefault<scalar>("exponent", unitless, 1.0/7.0))
 {}
 
 
@@ -57,7 +58,11 @@ Foam::Function1s::turbulentBL::~turbulentBL()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::Function1s::turbulentBL::write(Ostream& os) const
+void Foam::Function1s::turbulentBL::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "exponent", exponent_);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.H
index a7a30cfe34..9e1f034741 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/turbulentBL/turbulentBL.H
@@ -90,6 +90,7 @@ public:
         turbulentBL
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -111,7 +112,7 @@ public:
         ) const;
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index ea9fe7da7c..0cd742764a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -35,8 +35,6 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::updateValues
     const RhoType& rho
 )
 {
-    const scalar t = db().time().userTimeValue();
-
     const vectorField n(patch().nf());
 
     // Extrapolate patch velocity
@@ -51,7 +49,7 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::updateValues
     // Remove any reverse flow
     nUp = max(nUp, scalar(0));
 
-    const scalar flowRate = flowRate_->value(t);
+    const scalar flowRate = flowRate_->value(db().time().value());
     const scalar estimatedFlowRate = gSum(rho*(this->patch().magSf()*nUp));
 
     if (estimatedFlowRate/flowRate > 0.5)
@@ -85,16 +83,30 @@ flowRateOutletVelocityFvPatchVectorField
     flowRate_(),
     volumetric_(),
     rhoName_("rho"),
-    rhoOutlet_(dict.lookupOrDefault<scalar>("rhoOutlet", -vGreat))
+    rhoOutlet_(dict.lookupOrDefault<scalar>("rhoOutlet", dimDensity, -vGreat))
 {
     if (dict.found("volumetricFlowRate"))
     {
-        flowRate_ = Function1<scalar>::New("volumetricFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New
+            (
+                "volumetricFlowRate",
+                db().time().userUnits(),
+                dimVolumetricFlux,
+                dict
+            );
         volumetric_ = true;
     }
     else if (dict.found("massFlowRate"))
     {
-        flowRate_ = Function1<scalar>::New("massFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New
+            (
+                "massFlowRate",
+                db().time().userUnits(),
+                dimMassFlux,
+                dict
+            );
         volumetric_ = false;
         rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
     }
@@ -110,7 +122,7 @@ flowRateOutletVelocityFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -197,7 +209,7 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::updateCoeffs()
 void Foam::flowRateOutletVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchField<vector>::write(os);
-    writeEntry(os, flowRate_());
+    writeEntry(os, db().time().userUnits(), unitAny, flowRate_());
     if (!volumetric_)
     {
         writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index a534aaf475..9856c43741 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
     const vectorField n(patch().nf());
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         operator==(*this - n*(n & *this) + n*phip/magS);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 883a45025e..7eadaac016 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,15 +38,16 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 :
     inletOutletFvPatchField<Type>(p, iF)
 {
-    this->phiName_ = dict.lookupOrDefault<word>("phi","phi");
+    this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
 
-    freestreamValue() = Field<Type>("freestreamValue", dict, p.size());
+    freestreamValue() =
+        Field<Type>("freestreamValue", iF.dimensions(), dict, p.size());
 
     if (dict.found("value"))
     {
         fvPatchField<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index aa160d59d3..4aa7518345 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,13 +44,14 @@ freestreamPressureFvPatchScalarField
         dict.lookupOrDefault<Switch>("supersonic", false)
     )
 {
-    freestreamValue() = scalarField("freestreamValue", dict, p.size());
+    freestreamValue() =
+        scalarField("freestreamValue", dimPressure, dict, p.size());
 
     if (dict.found("value"))
     {
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
index 14406e3914..24cd0ed85e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,13 +37,14 @@ Foam::freestreamVelocityFvPatchVectorField::freestreamVelocityFvPatchVectorField
 :
     mixedFvPatchVectorField(p, iF, dict, false)
 {
-    freestreamValue() = vectorField("freestreamValue", dict, p.size());
+    freestreamValue() =
+        vectorField("freestreamValue", dimVelocity, dict, p.size());
 
     if (dict.found("value"))
     {
         fvPatchVectorField::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index fd7d8abf7c..bb12de8922 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,13 +55,14 @@ Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
     mixedFvPatchField<Type>(p, iF, dict, false),
     phiName_(dict.lookupOrDefault<word>("phi", "phi"))
 {
-    this->refValue() = Field<Type>("inletValue", dict, p.size());
+    this->refValue() =
+        Field<Type>("inletValue", iF.dimensions(), dict, p.size());
 
     if (dict.found("value"))
     {
         fvPatchField<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 6826613c7d..59ea77c06d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,8 @@ inletOutletTotalTemperatureFvPatchScalarField
     inletOutletFvPatchScalarField(p, iF),
     UName_(dict.lookupOrDefault<word>("U", "U")),
     psiName_(dict.lookupOrDefault<word>("psi", "psi")),
-    gamma_(dict.lookup<scalar>("gamma")),
-    T0_("T0", dict, p.size())
+    gamma_(dict.lookup<scalar>("gamma", dimless)),
+    T0_("T0", dimTemperature, dict, p.size())
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
 
@@ -52,7 +52,7 @@ inletOutletTotalTemperatureFvPatchScalarField
     {
         fvPatchField<scalar>::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index 579f5f217f..4e324f8a55 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ interstitialInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF, dict),
-    inletVelocity_("inletVelocity", dict, p.size()),
+    inletVelocity_("inletVelocity", dimVelocity, dict, p.size()),
     alphaName_(dict.lookupOrDefault<word>("alpha", "alpha"))
 {}
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C
index 944b95800e..644bd5bc95 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ void Foam::mappedFlowRateVelocityFvPatchVectorField::updateCoeffs()
 
     const vectorField np(patch().nf());
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         // volumetric flow-rate
         operator==(np*Unp);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C
index eca2cf3c41..10695ccaa2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,12 @@ mappedInternalValueFvPatchField
     (
         dict.lookupOrDefault<bool>("setAverage", dict.found("average"))
     ),
-    average_(setAverage_ ? dict.lookup<Type>("average") : Zero),
+    average_
+    (
+        setAverage_
+      ? dict.lookup<Type>("average", iF.dimensions())
+      : Zero
+    ),
     interpolationScheme_(dict.lookup<word>("interpolationScheme")),
     mapperPtr_
     (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C
index 84eeb6c964..e0b6f5d6f1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,12 @@ Foam::mappedValueFvPatchField<Type>::mappedValueFvPatchField
     (
         dict.lookupOrDefault<bool>("setAverage", dict.found("average"))
     ),
-    average_(setAverage_ ? dict.lookup<Type>("average") : Zero),
+    average_
+    (
+        setAverage_
+      ? dict.lookup<Type>("average", iF.dimensions())
+      : Zero
+    ),
     mapperPtr_
     (
         mappedPatchBase::specified(dict)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
index 3d5476442a..fcbd40c2ef 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ matchedFlowRateOutletVelocityFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C
index 6e44f71a0c..09555589bf 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,10 @@ movingWallSlipVelocityFvPatchVectorField
 :
     directionMixedFvPatchVectorField(p, iF)
 {
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    fvPatchVectorField::operator=
+    (
+        vectorField("value", iF.dimensions(), dict, p.size())
+    );
 
     const vectorField n(p.nf());
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index 264d34d5e1..4910788fee 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,13 +55,14 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
     mixedFvPatchField<Type>(p, iF, dict, false),
     phiName_(dict.lookupOrDefault<word>("phi", "phi"))
 {
-    this->refValue() = Field<Type>("outletValue", dict, p.size());
+    this->refValue() =
+        Field<Type>("outletValue", iF.dimensions(), dict, p.size());
 
     if (dict.found("value"))
     {
         fvPatchField<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index 4c66b211d9..29328b7933 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,16 @@ outletPhaseMeanVelocityFvPatchVectorField
 )
 :
     mixedFvPatchField<vector>(p, iF, dict, false),
-    UnMean_(Function1<scalar>::New("UnMean", dict)),
+    UnMean_
+    (
+        Function1<scalar>::New
+        (
+            "UnMean",
+            db().time().userUnits(),
+            dimVelocity,
+            dict
+        )
+    ),
     alphaName_(dict.lookup("alpha"))
 {
     refValue() = Zero;
@@ -51,7 +60,7 @@ outletPhaseMeanVelocityFvPatchVectorField
     {
         fvPatchVectorField::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -98,8 +107,6 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-
     scalarField alphap =
         patch().lookupPatchField<volScalarField, scalar>(alphaName_);
 
@@ -116,7 +123,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::updateCoeffs()
 
     // Set the refValue and valueFraction to adjust the boundary field
     // such that the phase mean is UnMean_
-    const scalar UnMean = UnMean_->value(t);
+    const scalar UnMean = UnMean_->value(db().time().value());
     if (UnzgMean >= UnMean)
     {
         refValue() = Zero;
@@ -139,7 +146,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::write
 {
     fvPatchField<vector>::write(os);
 
-    writeEntry(os, UnMean_());
+    writeEntry(os, db().time().userUnits(), dimVelocity, UnMean_());
     writeEntry(os, "alpha", alphaName_);
     writeEntry(os, "value", *this);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index 97cc800a7e..f2d8902e79 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
 )
 :
     transformFvPatchField<Type>(p, iF),
-    valueFraction_("valueFraction", dict, p.size())
+    valueFraction_("valueFraction", unitFraction, dict, p.size())
 {
     evaluate();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index f1819a1351..aea444f4ca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,9 +42,9 @@ phaseHydrostaticPressureFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF, dict, false),
     phaseFraction_(dict.lookupOrDefault<word>("phaseFraction", "alpha")),
-    rho_(dict.lookup<scalar>("rho")),
-    pRefValue_(dict.lookup<scalar>("pRefValue")),
-    pRefPoint_(dict.lookup("pRefPoint"))
+    rho_(dict.lookup<scalar>("rho", dimDensity)),
+    pRefValue_(dict.lookup<scalar>("pRefValue", dimPressure)),
+    pRefPoint_(dict.lookup<vector>("pRefPoint", dimLength))
 {
     this->refValue() = pRefValue_;
 
@@ -52,7 +52,7 @@ phaseHydrostaticPressureFvPatchScalarField
     {
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index d68981e9d4..2b55df4720 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,30 +39,36 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    gamma_(dict.lookup<scalar>("gamma")),
-    R_(dict.lookup<scalar>("R")),
-    supplyMassFlowRate_(dict.lookup<scalar>("supplyMassFlowRate")),
+    gamma_(dict.lookup<scalar>("gamma", dimless)),
+    R_(dict.lookup<scalar>("R", dimGasConstant)),
+    supplyMassFlowRate_
+    (
+        dict.lookup<scalar>("supplyMassFlowRate", dimMass/dimTime)
+    ),
     supplyTotalTemperature_
     (
-        dict.lookup<scalar>("supplyTotalTemperature")
+        dict.lookup<scalar>("supplyTotalTemperature", dimTemperature)
+    ),
+    plenumVolume_(dict.lookup<scalar>("plenumVolume", dimVolume)),
+    plenumDensity_(dict.lookup<scalar>("plenumDensity", dimDensity)),
+    plenumTemperature_
+    (
+        dict.lookup<scalar>("plenumTemperature", dimTemperature)
     ),
-    plenumVolume_(dict.lookup<scalar>("plenumVolume")),
-    plenumDensity_(dict.lookup<scalar>("plenumDensity")),
-    plenumTemperature_(dict.lookup<scalar>("plenumTemperature")),
     rho_(1.0),
     hasRho_(false),
-    inletAreaRatio_(dict.lookup<scalar>("inletAreaRatio")),
+    inletAreaRatio_(dict.lookup<scalar>("inletAreaRatio", unitFraction)),
     inletDischargeCoefficient_
     (
-        dict.lookup<scalar>("inletDischargeCoefficient")
+        dict.lookup<scalar>("inletDischargeCoefficient", unitFraction)
     ),
-    timeScale_(dict.lookupOrDefault<scalar>("timeScale", 0.0)),
+    timeScale_(dict.lookupOrDefault<scalar>("timeScale", dimTime, 0.0)),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     UName_(dict.lookupOrDefault<word>("U", "U"))
 {
     if (dict.found("rho"))
     {
-        rho_ = dict.lookup<scalar>("rho");
+        rho_ = dict.lookup<scalar>("rho", dimDensity);
         hasRho_ = true;
     }
 }
@@ -153,7 +159,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
 
     // Calculate the current mass flow rate
     scalar massFlowRate(1.0);
-    if (phi.internalField().dimensions() == dimFlux)
+    if (phi.internalField().dimensions() == dimVolumetricFlux)
     {
         if (hasRho_)
         {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C
index 2faff315dd..644cf418d4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,13 +39,13 @@ Foam::pressureFvPatchScalarField::pressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict, false),
-    p_("p", dict, p.size())
+    p_("p", dimPressure, dict, p.size())
 {
     if (dict.found("value"))
     {
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index f1586c299d..1afe7734b4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,9 +42,12 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
     mixedFvPatchVectorField(p, iF, dict, false),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    inletDir_("inletDirection", dict, p.size())
+    inletDir_("inletDirection", dimless, dict, p.size())
 {
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    fvPatchVectorField::operator=
+    (
+        vectorField("value", iF.dimensions(), dict, p.size())
+    );
     refValue() = *this;
     refGrad() = Zero;
     valueFraction() = 0.0;
@@ -130,7 +133,7 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     tmp<scalarField> ndmagS = (n & inletDir_)*patch().magSf();
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         refValue() = inletDir_*phip/ndmagS;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index 2ae5139053..2cf4ce7acf 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ pressureDirectedInletVelocityFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF, dict),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    inletDir_("inletDirection", dict, p.size())
+    inletDir_("inletDirection", dimless, dict, p.size())
 {}
 
 
@@ -124,7 +124,7 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     tmp<scalarField> ndmagS = (n & inletDir_)*patch().magSf();
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         operator==(inletDir_*phip/ndmagS);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index f6e8487bb5..d6c73ec836 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,10 @@ pressureInletOutletParSlipVelocityFvPatchVectorField
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    fvPatchVectorField::operator=
+    (
+        vectorField("value", iF.dimensions(), dict, p.size())
+    );
     refValue() = *this;
     refGrad() = Zero;
     valueFraction() = 0.0;
@@ -100,7 +103,7 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
     vectorField Ut(patchInternalField());
     Ut -= n()*(Ut & n());
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         refValue() = Ut + n*phip/magSf;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index 71f5a43dc3..5c9c792e74 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,12 +42,21 @@ pressureInletOutletVelocityFvPatchVectorField
     directionMixedFvPatchVectorField(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi"))
 {
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    fvPatchVectorField::operator=
+    (
+        vectorField("value", iF.dimensions(), dict, p.size())
+    );
 
     if (dict.found("tangentialVelocity"))
     {
         tangentialVelocity_ =
-            Function1<vector>::New("tangentialVelocity", dict);
+            Function1<vector>::New
+            (
+                "tangentialVelocity",
+                db().time().userUnits(),
+                dimVelocity,
+                dict
+            );
     }
 
     refValue() = Zero;
@@ -95,8 +104,8 @@ void Foam::pressureInletOutletVelocityFvPatchVectorField::updateCoeffs()
 
     if (tangentialVelocity_.valid())
     {
-        const scalar t = this->db().time().userTimeValue();
-        const vector tangentialVelocity = tangentialVelocity_->value(t);
+        const vector tangentialVelocity =
+            tangentialVelocity_->value(db().time().value());
         const vectorField n(patch().nf());
         refValue() = tangentialVelocity - n*(n & tangentialVelocity);
     }
@@ -121,7 +130,13 @@ const
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     if (tangentialVelocity_.valid())
     {
-        writeEntry(os, tangentialVelocity_());
+        writeEntry
+        (
+            os,
+            db().time().userUnits(),
+            dimVelocity,
+            tangentialVelocity_()
+        );
     }
     writeEntry(os, "value", *this);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index 62e48a162a..607e1f5cd2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         operator==(n*phip/magS);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 3d3d069f65..0c67eeb956 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,10 @@ pressureNormalInletOutletVelocityFvPatchVectorField
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    fvPatchVectorField::operator=
+    (
+        vectorField("value", iF.dimensions(), dict, p.size())
+    );
     refValue() = *this;
     refGrad() = Zero;
     valueFraction() = 0.0;
@@ -96,7 +99,7 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         refValue() = n*phip/magS;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghCyclicPressure/prghCyclicPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghCyclicPressure/prghCyclicPressureFvPatchScalarField.C
index a00078c5f5..5899bc5af0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghCyclicPressure/prghCyclicPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghCyclicPressure/prghCyclicPressureFvPatchScalarField.C
@@ -46,12 +46,17 @@ Foam::prghCyclicPressureFvPatchScalarField::prghCyclicPressureFvPatchScalarField
       ? dict.lookupOrDefault<word>("rho", "rho")
       : word::null
     ),
-    rhoInf_(cyclicPatch().owner() ? dict.lookup<scalar>("rhoInf") : NaN),
+    rhoInf_
+    (
+        cyclicPatch().owner()
+      ? dict.lookup<scalar>("rhoInf", dimDensity)
+      : NaN
+    ),
     jump_(p.size(), Zero)
 {
     if (dict.found("jump"))
     {
-        jump_ = scalarField("jump", dict, p.size());
+        jump_ = scalarField("jump", iF.dimensions(), dict, p.size());
     }
 
     evaluateNoUpdateCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index 3d84afe769..0f10ce7533 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,8 +33,7 @@ License
 void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField::
 calcTangentialVelocity()
 {
-    const scalar t = this->db().time().userTimeValue();
-    const scalar omega = omega_.value(t);
+    const scalar omega = omega_.value(db().time().value());
 
     const vectorField tangentialVelocity
     (
@@ -58,9 +57,9 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(p, iF, dict),
-    origin_(dict.lookup("origin")),
-    axis_(dict.lookup("axis")),
-    omega_(dict)
+    origin_(dict.lookup<vector>("origin", dimLength)),
+    axis_(dict.lookup<vector>("axis", dimless)),
+    omega_(db().time(), dict)
 {
     calcTangentialVelocity();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
index 8712616d80..a6d74fd0aa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,9 +40,9 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(p, iF, dict),
-    origin_(dict.lookup("origin")),
-    axis_(dict.lookup("axis")),
-    omega_(dict)
+    origin_(dict.lookup<vector>("origin")),
+    axis_(dict.lookup<vector>("axis")),
+    omega_(db().time(), dict)
 {}
 
 
@@ -85,8 +85,7 @@ void Foam::rotatingTotalPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    const scalar omega = omega_.value(t);
+    const scalar omega = omega_.value(db().time().value());
 
     const fvsPatchField<scalar>& phip =
         patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index c0fa320e7a..f391509155 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,15 +39,15 @@ rotatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict, false),
-    origin_(dict.lookup("origin")),
-    axis_(dict.lookup("axis")),
-    omega_(dict)
+    origin_(dict.lookup<vector>("origin")),
+    axis_(dict.lookup<vector>("axis")),
+    omega_(db().time(), dict)
 {
     if (dict.found("value"))
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -97,8 +97,7 @@ void Foam::rotatingWallVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    const scalar omega = omega_.value(t);
+    const scalar omega = omega_.value(db().time().value());
 
     // Calculate the rotating wall velocity from the specification of the motion
     const vectorField Up
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 3312d89fb5..58c5b2468d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,16 +42,16 @@ supersonicFreestreamFvPatchVectorField
     TName_(dict.lookupOrDefault<word>("T", "T")),
     pName_(dict.lookupOrDefault<word>("p", "p")),
     psiName_(dict.lookupOrDefault<word>("psi", "psi")),
-    UInf_(dict.lookup("UInf")),
-    pInf_(dict.lookup<scalar>("pInf")),
-    TInf_(dict.lookup<scalar>("TInf")),
+    UInf_(dict.lookup<vector>("UInf", dimVelocity)),
+    pInf_(dict.lookup<scalar>("pInf", dimPressure)),
+    TInf_(dict.lookup<scalar>("TInf", dimTemperature)),
     gamma_(dict.lookup<scalar>("gamma"))
 {
     if (dict.found("value"))
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index 73ce7beda6..ef2f2ac9a8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ surfaceNormalFixedValueFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF, dict, false),
-    refValue_("refValue", dict, p.size())
+    refValue_("refValue", iF.dimensions(), dict, p.size())
 {
     fvPatchVectorField::operator=(refValue_*patch().nf());
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C
index a60b00f721..d4efd14813 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,16 @@ surfaceNormalUniformFixedValueFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF, dict, false),
-    uniformValue_(Function1<scalar>::New("uniformValue", dict))
+    uniformValue_
+    (
+        Function1<scalar>::New
+        (
+            "uniformValue",
+            db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {
     this->evaluate();
 }
@@ -89,8 +98,10 @@ void Foam::surfaceNormalUniformFixedValueFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    fvPatchVectorField::operator=(uniformValue_->value(t)*patch().nf());
+    fvPatchVectorField::operator=
+    (
+        uniformValue_->value(db().time().value())*patch().nf()
+    );
 
     fvPatchVectorField::updateCoeffs();
 }
@@ -102,7 +113,13 @@ void Foam::surfaceNormalUniformFixedValueFvPatchVectorField::write
 ) const
 {
     fvPatchVectorField::write(os);
-    writeEntry(os, uniformValue_());
+    writeEntry
+    (
+        os,
+        db().time().userUnits(),
+        internalField().dimensions(),
+        uniformValue_()
+    );
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index c6b4562162..3f27fdd3cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -35,7 +35,7 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateValues
     const RhoType& rho
 )
 {
-    const scalar t = this->db().time().userTimeValue();
+    const scalar t = db().time().value();
     const scalarField ts(size(), t);
 
     // Compute geometry
@@ -84,6 +84,7 @@ swirlFlowRateInletVelocityFvPatchVectorField
         dict.lookupOrDefault
         (
             "origin",
+            dimLength,
             returnReduce(patch().size(), sumOp<label>())
           ? gSum(patch().Cf()*patch().magSf())/gSum(patch().magSf())
           : Zero
@@ -94,6 +95,7 @@ swirlFlowRateInletVelocityFvPatchVectorField
         dict.lookupOrDefault
         (
             "axis",
+            dimless,
             returnReduce(patch().size(), sumOp<label>())
           ? -gSum(patch().Sf())/gSum(patch().magSf())
           : Zero
@@ -102,19 +104,43 @@ swirlFlowRateInletVelocityFvPatchVectorField
     flowRate_(),
     volumetric_(),
     rhoName_("rho"),
-    rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", -vGreat)),
-    radialVelocity_(Function2<scalar>::New("radialVelocity", dict)),
+    rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", dimDensity, -vGreat)),
+    radialVelocity_
+    (
+        Function2<scalar>::New
+        (
+            "radialVelocity",
+            db().time().userUnits(),
+            dimLength,
+            dimVelocity,
+            dict
+        )
+    ),
     omega_(nullptr),
     tangentialVelocity_(nullptr)
 {
     if (dict.found("volumetricFlowRate"))
     {
-        flowRate_ = Function1<scalar>::New("volumetricFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New
+            (
+                "volumetricFlowRate",
+                db().time().userUnits(),
+                dimVolumetricFlux,
+                dict
+            );
         volumetric_ = true;
     }
     else if (dict.found("massFlowRate"))
     {
-        flowRate_ = Function1<scalar>::New("massFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New
+            (
+                "massFlowRate",
+                db().time().userUnits(),
+                dimMassFlux,
+                dict
+            );
         volumetric_ = false;
         rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
     }
@@ -127,12 +153,19 @@ swirlFlowRateInletVelocityFvPatchVectorField
 
     if (dict.found("omega") || dict.found("rpm"))
     {
-        omega_ = new Function1s::omega(dict);
+        omega_ = new Function1s::omega(db().time(), dict);
     }
     else if (dict.found("tangentialVelocity"))
     {
         tangentialVelocity_ =
-            Function2<scalar>::New("tangentialVelocity", dict);
+            Function2<scalar>::New
+            (
+                "tangentialVelocity",
+                db().time().userUnits(),
+                dimLength,
+                dimVelocity,
+                dict
+            );
     }
     else
     {
@@ -145,7 +178,7 @@ swirlFlowRateInletVelocityFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -247,20 +280,34 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::write
     fvPatchField<vector>::write(os);
     writeEntry(os, "origin", origin_);
     writeEntry(os, "axis", axis_);
-    writeEntry(os, flowRate_());
+    writeEntry(os, db().time().userUnits(), unitAny, flowRate_());
     if (!volumetric_)
     {
         writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
         writeEntryIfDifferent<scalar>(os, "rhoInlet", -vGreat, rhoInlet_);
     }
-    writeEntry(os, radialVelocity_());
+    writeEntry
+    (
+        os,
+        db().time().userUnits(),
+        dimLength,
+        dimVelocity,
+        radialVelocity_()
+    );
     if (omega_.valid())
     {
         writeEntry(os, omega_());
     }
     else
     {
-        writeEntry(os, tangentialVelocity_());
+        writeEntry
+        (
+            os,
+            db().time().userUnits(),
+            dimLength,
+            dimVelocity,
+            tangentialVelocity_()
+        );
     }
     writeEntry(os, "value", *this);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
index 1b41d3a2b2..0eeb3a0475 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
@@ -42,6 +42,7 @@ swirlInletVelocityFvPatchVectorField
         dict.lookupOrDefault
         (
             "origin",
+            dimLength,
             returnReduce(patch().size(), sumOp<label>())
           ? gSum(patch().Cf()*patch().magSf())/gSum(patch().magSf())
           : Zero
@@ -52,24 +53,52 @@ swirlInletVelocityFvPatchVectorField
         dict.lookupOrDefault
         (
             "axis",
+            dimless,
             returnReduce(patch().size(), sumOp<label>())
           ? -gSum(patch().Sf())/gSum(patch().magSf())
           : Zero
         )
     ),
-    axialVelocity_(Function2<scalar>::New("axialVelocity", dict)),
-    radialVelocity_(Function2<scalar>::New("radialVelocity", dict)),
+    axialVelocity_
+    (
+        Function2<scalar>::New
+        (
+            "axialVelocity",
+            db().time().userUnits(),
+            dimLength,
+            dimVelocity,
+            dict
+        )
+    ),
+    radialVelocity_
+    (
+        Function2<scalar>::New
+        (
+            "radialVelocity",
+            db().time().userUnits(),
+            dimLength,
+            dimVelocity,
+            dict
+        )
+    ),
     omega_(nullptr),
     tangentialVelocity_(nullptr)
 {
     if (dict.found("omega") || dict.found("rpm"))
     {
-        omega_ = new Function1s::omega(dict);
+        omega_ = new Function1s::omega(db().time(), dict);
     }
     else if (dict.found("tangentialVelocity"))
     {
         tangentialVelocity_ =
-            Function2<scalar>::New("tangentialVelocity", dict);
+            Function2<scalar>::New
+            (
+                "tangentialVelocity",
+                db().time().userUnits(),
+                dimLength,
+                dimVelocity,
+                dict
+            );
     }
     else
     {
@@ -82,7 +111,7 @@ swirlInletVelocityFvPatchVectorField
     {
         fvPatchField<vector>::operator=
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -137,7 +166,7 @@ void Foam::swirlInletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
+    const scalar t = this->db().time().value();
     const scalarField ts(size(), t);
 
     // Compute geometry
@@ -177,15 +206,36 @@ void Foam::swirlInletVelocityFvPatchVectorField::write(Ostream& os) const
     fvPatchField<vector>::write(os);
     writeEntry(os, "origin", origin_);
     writeEntry(os, "axis", axis_);
-    writeEntry(os, axialVelocity_());
-    writeEntry(os, radialVelocity_());
+    writeEntry
+    (
+        os,
+        db().time().userUnits(),
+        dimLength,
+        dimVelocity,
+        axialVelocity_()
+    );
+    writeEntry
+    (
+        os,
+        db().time().userUnits(),
+        dimLength,
+        dimVelocity,
+        radialVelocity_()
+    );
     if (omega_.valid())
     {
         writeEntry(os, omega_());
     }
     else
     {
-        writeEntry(os, tangentialVelocity_());
+        writeEntry
+        (
+            os,
+            db().time().userUnits(),
+            dimLength,
+            dimVelocity,
+            tangentialVelocity_()
+        );
     }
     writeEntry(os, "value", *this);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index 2c1e049666..30091ad86b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs()
     const fvsPatchField<scalar>& phip =
         patch().patchField<surfaceScalarField, scalar>(phi);
 
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         ams_ = ams0_ + deltaT*sum((*this*psi_)*phip);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 4f40ad59c5..95fe83fbca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -42,7 +42,10 @@ timeVaryingMappedFixedValueFvPatchField
 {
     if (dict.found("value"))
     {
-        fvPatchField<Type>::operator==(Field<Type>("value", dict, p.size()));
+        fvPatchField<Type>::operator==
+        (
+            Field<Type>("value", iF.dimensions(), dict, p.size())
+        );
     }
     else
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.C
index e40a40c519..812275c736 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.C
@@ -272,6 +272,7 @@ Foam::timeVaryingMappedFvPatchField<Type>::timeVaryingMappedFvPatchField
 )
 :
     patch_(p),
+    internalField_(iF),
     fieldTableName_(dict.lookupOrDefault("fieldTable", iF.name())),
     dataDir_
     (
@@ -309,7 +310,8 @@ Foam::timeVaryingMappedFvPatchField<Type>::timeVaryingMappedFvPatchField
 
     if (dict.found("offset"))
     {
-        offset_ = Function1<Type>::New("offset", dict);
+        offset_ =
+            Function1<Type>::New("offset", dimTime, iF.dimensions(), dict);
     }
 
     if
@@ -318,10 +320,8 @@ Foam::timeVaryingMappedFvPatchField<Type>::timeVaryingMappedFvPatchField
      && mapMethod_ != "nearest"
     )
     {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "mapMethod should be one of 'planarInterpolation'"
+        FatalIOErrorInFunction(dict)
+            << "mapMethod should be one of 'planarInterpolation'"
             << ", 'nearest'" << exit(FatalIOError);
     }
 }
@@ -335,6 +335,7 @@ timeVaryingMappedFvPatchField
 )
 :
     patch_(ptf.patch_),
+    internalField_(ptf.internalField_),
     fieldTableName_(ptf.fieldTableName_),
     dataDir_(ptf.dataDir_),
     pointsName_(ptf.pointsName_),
@@ -475,8 +476,7 @@ Foam::tmp<Foam::Field<Type>> Foam::timeVaryingMappedFvPatchField<Type>::map()
     // Apply offset to mapped values
     if (offset_.valid())
     {
-        const scalar t = time().userTimeValue();
-        fld += offset_->value(t);
+        fld += offset_->value(time().value());
     }
 
     if (debug)
@@ -521,7 +521,13 @@ void Foam::timeVaryingMappedFvPatchField<Type>::write
 
     if (offset_.valid())
     {
-        writeEntry(os, offset_());
+        writeEntry
+        (
+            os,
+            time().userUnits(),
+            internalField_.dimensions(),
+            offset_()
+        );
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.H
index 9774728586..3ba8d633e1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField.H
@@ -114,6 +114,9 @@ class timeVaryingMappedFvPatchField
         //- Reference to the patch the data is mapped to
         const fvPatch& patch_;
 
+        //- Reference to internal field
+        const DimensionedField<Type, volMesh>& internalField_;
+
         //- Name of the field data table, defaults to the name of the field
         word fieldTableName_;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index 7c79a7523f..8103838db4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs()
 
         if (Upiov.tangentialVelocity().valid())
         {
-            const scalar t = this->db().time().userTimeValue();
+            const scalar t = this->db().time().value();
 
             dynamicPressureFvPatchScalarField::updateCoeffs
             (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index 30c840245a..ab3eeb74e0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,14 +42,14 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
     UName_(dict.lookupOrDefault<word>("U", "U")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     psiName_(dict.lookupOrDefault<word>("psi", "psi")),
-    gamma_(dict.lookup<scalar>("gamma")),
-    T0_("T0", dict, p.size())
+    gamma_(dict.lookup<scalar>("gamma", dimless)),
+    T0_("T0", dimTemperature, dict, p.size())
 {
     if (dict.found("value"))
     {
         fvPatchField<scalar>::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index 3943473f11..e57f70e78d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,16 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict, false),
-    U_(Function1<vector>::New("U", dict))
+    U_
+    (
+        Function1<vector>::New
+        (
+            "U",
+            db().time().userUnits(),
+            dimVelocity,
+            dict
+        )
+    )
 {
     // Evaluate the wall velocity
     updateCoeffs();
@@ -80,8 +89,7 @@ void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    const vector U = U_->value(t);
+    const vector U = U_->value(db().time().value());
 
     // Remove the component of U normal to the wall in case the wall is not flat
     const vectorField n(patch().nf());
@@ -94,7 +102,7 @@ void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs()
 void Foam::translatingWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
-    writeEntry(os, U_());
+    writeEntry(os, db().time().userUnits(), dimVelocity, U_());
     writeEntry(os, "value", *this);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C
index ecb1297e89..70f967f2d5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,15 +41,15 @@ transonicEntrainmentPressureFvPatchScalarField
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    gamma_(dict.lookup<scalar>("gamma")),
-    Mb_(dict.lookupOrDefault<scalar>("Mb", 0.5)),
-    p0_("p0", dict, p.size())
+    gamma_(dict.lookup<scalar>("gamma", dimless)),
+    Mb_(dict.lookupOrDefault<scalar>("Mb", dimless, 0.5)),
+    p0_("p0", dimPressure, dict, p.size())
 {
     if (dict.found("value"))
     {
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index d845a02f0b..933e146ce3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,16 +37,16 @@ Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 :
     fixedValueFvPatchField<Type>(p, iF, dict, false),
     ranGen_(label(0)),
-    fluctuationScale_(pTraits<Type>(dict.lookup("fluctuationScale"))),
-    referenceField_("referenceField", dict, p.size()),
-    alpha_(dict.lookupOrDefault<scalar>("alpha", 0.1)),
+    fluctuationScale_(dict.lookup<Type>("fluctuationScale", unitFraction)),
+    referenceField_("referenceField", iF.dimensions(), dict, p.size()),
+    alpha_(dict.lookupOrDefault<scalar>("alpha", unitFraction, 0.1)),
     curTimeIndex_(-1)
 {
     if (dict.found("value"))
     {
         fixedValueFvPatchField<Type>::operator==
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index a74d714158..0228f716ec 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
 )
 :
     inletOutletFvPatchScalarField(p, iF),
-    intensity_(dict.lookup<scalar>("intensity")),
+    intensity_(dict.lookup<scalar>("intensity", unitFraction)),
     UName_(dict.lookupOrDefault<word>("U", "U"))
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
@@ -57,7 +57,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
             << exit(FatalError);
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    fvPatchScalarField::operator=
+    (
+        scalarField("value", iF.dimensions(), dict, p.size())
+    );
 
     this->refValue() = 0.0;
     this->refGrad() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index d2a3f48de2..56bd057c2c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,16 +41,16 @@ uniformDensityHydrostaticPressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict, false),
-    rho_(dict.lookup<scalar>("rhoRef")),
-    pRef_(dict.lookup<scalar>("pRef")),
+    rho_(dict.lookup<scalar>("rhoRef", dimDensity)),
+    pRef_(dict.lookup<scalar>("pRef", dimPressure)),
     pRefPointSpecified_(dict.found("pRefPoint")),
-    pRefPoint_(dict.lookupOrDefault<vector>("pRefPoint", Zero))
+    pRefPoint_(dict.lookupOrDefault<vector>("pRefPoint", dimLength, Zero))
 {
     if (dict.found("value"))
     {
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index a5a42d8482..a39beb8ecd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,16 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(p, iF),
-    uniformGradient_(Function1<Type>::New("uniformGradient", dict))
+    uniformGradient_
+    (
+        Function1<Type>::New
+        (
+            "uniformGradient",
+            this->db().time().userUnits(),
+            iF.dimensions()/dimLength,
+            dict
+        )
+    )
 {
     this->evaluate();
 }
@@ -97,8 +106,7 @@ void Foam::uniformFixedGradientFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    this->gradient() = uniformGradient_->value(t);
+    this->gradient() = uniformGradient_->value(this->db().time().value());
 
     fixedGradientFvPatchField<Type>::updateCoeffs();
 }
@@ -108,7 +116,13 @@ template<class Type>
 void Foam::uniformFixedGradientFvPatchField<Type>::write(Ostream& os) const
 {
     fixedGradientFvPatchField<Type>::write(os);
-    writeEntry(os, uniformGradient_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions()/dimLength,
+        uniformGradient_()
+    );
     writeEntry(os, "value", *this);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 1a89fb797e..e6e48c7ac2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,16 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict, false),
-    uniformValue_(Function1<Type>::New("uniformValue", dict))
+    uniformValue_
+    (
+        Function1<Type>::New
+        (
+            "uniformValue",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {
     this->evaluate();
 }
@@ -87,8 +96,10 @@ void Foam::uniformFixedValueFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    const scalar t = this->db().time().userTimeValue();
-    fvPatchField<Type>::operator==(uniformValue_->value(t));
+    fvPatchField<Type>::operator==
+    (
+        uniformValue_->value(this->db().time().value())
+    );
 
     fixedValueFvPatchField<Type>::updateCoeffs();
 }
@@ -98,7 +109,13 @@ template<class Type>
 void Foam::uniformFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    writeEntry(os, uniformValue_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        uniformValue_()
+    );
     writeEntry(os, "value", *this);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 6eaea73ed7..a4b1fad968 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,16 +38,24 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 :
     mixedFvPatchField<Type>(p, iF, dict, false),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    uniformInletValue_(Function1<Type>::New("uniformInletValue", dict))
+    uniformInletValue_
+    (
+        Function1<Type>::New
+        (
+            "uniformInletValue",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {
-    this->refValue() =
-        uniformInletValue_->value(this->db().time().userTimeValue());
+    this->refValue() = uniformInletValue_->value(this->db().time().value());
 
     if (dict.found("value"))
     {
         fvPatchField<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -74,8 +82,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
     uniformInletValue_(ptf.uniformInletValue_, false)
 {
     // Evaluate refValue since not mapped
-    this->refValue() =
-        uniformInletValue_->value(this->db().time().userTimeValue());
+    this->refValue() = uniformInletValue_->value(this->db().time().value());
 
     this->refGrad() = Zero;
     this->valueFraction() = 0.0;
@@ -110,8 +117,7 @@ void Foam::uniformInletOutletFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    this->refValue() =
-        uniformInletValue_->value(this->db().time().userTimeValue());
+    this->refValue() = uniformInletValue_->value(this->db().time().value());
 
     const Field<scalar>& phip =
         this->patch().template lookupPatchField<surfaceScalarField, scalar>
@@ -133,7 +139,13 @@ void Foam::uniformInletOutletFvPatchField<Type>::write(Ostream& os) const
     {
         writeEntry(os, "phi", phiName_);
     }
-    writeEntry(os, this->uniformInletValue_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        uniformInletValue_()
+    );
     writeEntry(os, "value", *this);
 }
 
@@ -150,8 +162,7 @@ void Foam::uniformInletOutletFvPatchField<Type>::map
     mixedFvPatchField<Type>::map(ptf, mapper);
 
     // Override
-    this->refValue() =
-        uniformInletValue_->value(this->db().time().userTimeValue());
+    this->refValue() = uniformInletValue_->value(this->db().time().value());
 }
 
 
@@ -164,8 +175,7 @@ void Foam::uniformInletOutletFvPatchField<Type>::reset
     mixedFvPatchField<Type>::reset(ptf);
 
     // Override
-    this->refValue() =
-        uniformInletValue_->value(this->db().time().userTimeValue());
+    this->refValue() = uniformInletValue_->value(this->db().time().value());
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
index d84535f281..bb85b881cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
@@ -25,15 +25,6 @@ License
 
 #include "uniformJumpFvPatchField.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::scalar Foam::uniformJumpFvPatchField<Type>::t() const
-{
-    return this->db().time().userTimeValue();
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -49,9 +40,17 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 {
     if (this->cyclicPatch().owner())
     {
-        jumpTable_ = Function1<Type>::New("jumpTable", dict);
+        jumpTable_ =
+            Function1<Type>::New
+            (
+                "jumpTable",
+                this->db().time().userUnits(),
+                iF.dimensions(),
+                dict
+            );
 
-        this->jumpRef() = Field<Type>(p.size(), jumpTable_->value(t()));
+        this->jumpRef() =
+            Field<Type>(p.size(), jumpTable_->value(this->db().time().value()));
     }
 
     this->evaluateNoUpdateCoeffs();
@@ -96,7 +95,7 @@ void Foam::uniformJumpFvPatchField<Type>::updateCoeffs()
 
     if (this->cyclicPatch().owner())
     {
-        this->jumpRef() = jumpTable_->value(t());
+        this->jumpRef() = jumpTable_->value(this->db().time().value());
     }
 
     fixedJumpFvPatchField<Type>::updateCoeffs();
@@ -110,7 +109,13 @@ void Foam::uniformJumpFvPatchField<Type>::write(Ostream& os) const
 
     if (this->cyclicPatch().owner())
     {
-        writeEntry(os, jumpTable_());
+        writeEntry
+        (
+            os,
+            this->db().time().userUnits(),
+            this->internalField().dimensions(),
+            jumpTable_()
+        );
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
index 5dc3495679..dd20936e40 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
@@ -104,12 +104,6 @@ protected:
         autoPtr<Function1<Type>> jumpTable_;
 
 
-    // Private Member Functions
-
-        //- Return the current time
-        scalar t() const;
-
-
 public:
 
     //- Runtime type information
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index d8b09da22e..3198137dca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,20 +44,28 @@ uniformTotalPressureFvPatchScalarField
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     psiName_(dict.lookupOrDefault<word>("psi", "none")),
-    gamma_(psiName_ != "none" ? dict.lookup<scalar>("gamma") : 1),
-    p0_(Function1<scalar>::New("p0", dict))
+    gamma_(psiName_ != "none" ? dict.lookup<scalar>("gamma", dimless) : 1),
+    p0_
+    (
+        Function1<scalar>::New
+        (
+            "p0",
+            db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    )
 {
     if (dict.found("value"))
     {
         fvPatchField<scalar>::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
     {
-        const scalar t = this->db().time().userTimeValue();
-        fvPatchScalarField::operator==(p0_->value(t));
+        fvPatchScalarField::operator==(p0_->value(db().time().value()));
     }
 }
 
@@ -81,8 +89,7 @@ uniformTotalPressureFvPatchScalarField
 {
     // Set the patch pressure to the current total pressure
     // This is not ideal but avoids problems with the creation of patch faces
-    const scalar t = this->db().time().userTimeValue();
-    fvPatchScalarField::operator==(p0_->value(t));
+    fvPatchScalarField::operator==(p0_->value(this->db().time().value()));
 }
 
 
@@ -115,7 +122,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
         return;
     }
 
-    scalar p0 = p0_->value(this->db().time().userTimeValue());
+    scalar p0 = p0_->value(this->db().time().value());
 
     const fvsPatchField<scalar>& phip =
         patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
@@ -197,7 +204,13 @@ void Foam::uniformTotalPressureFvPatchScalarField::write(Ostream& os) const
     writeEntry(os, "rho", rhoName_);
     writeEntry(os, "psi", psiName_);
     writeEntry(os, "gamma", gamma_);
-    writeEntry(os, p0_());
+    writeEntry
+    (
+        os,
+        db().time().userUnits(),
+        internalField().dimensions(),
+        p0_()
+    );
     writeEntry(os, "value", *this);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index 141c413e71..916f208a15 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,8 +41,8 @@ variableHeightFlowRateFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF, dict, false),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    lowerBound_(dict.lookup<scalar>("lowerBound")),
-    upperBound_(dict.lookup<scalar>("upperBound"))
+    lowerBound_(dict.lookup<scalar>("lowerBound", dimless)),
+    upperBound_(dict.lookup<scalar>("upperBound", dimless))
 {
     this->refValue() = 0.0;
 
@@ -50,7 +50,7 @@ variableHeightFlowRateFvPatchScalarField
     {
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 7d7233e8a9..93a99360e9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,16 @@ variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict),
-    flowRate_(Function1<scalar>::New("flowRate", dict)),
+    flowRate_
+    (
+        Function1<scalar>::New
+        (
+            "flowRate",
+            db().time().userUnits(),
+            dimVolumetricFlux,
+            dict
+        )
+    ),
     alphaName_(dict.lookup("alpha"))
 {}
 
@@ -87,8 +96,7 @@ updateCoeffs()
     alphap = max(alphap, scalar(0));
     alphap = min(alphap, scalar(1));
 
-    const scalar t = db().time().userTimeValue();
-    scalar flowRate = flowRate_->value(t);
+    scalar flowRate = flowRate_->value(db().time().value());
 
     // a simpler way of doing this would be nice
     scalar avgU = -flowRate/gSum(patch().magSf()*alphap);
@@ -107,7 +115,7 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField::write
 ) const
 {
     fvPatchField<vector>::write(os);
-    writeEntry(os, flowRate_());
+    writeEntry(os, db().time().userUnits(), dimVolumetricFlux, flowRate_());
     writeEntry(os, "alpha", alphaName_);
     writeEntry(os, "value", *this);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index 39feb65e91..923a0703a1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 :
     advectiveFvPatchField<Type>(p, iF, dict),
     psiName_(dict.lookupOrDefault<word>("psi", "psi")),
-    gamma_(dict.lookup<scalar>("gamma"))
+    gamma_(dict.lookup<scalar>("gamma", dimless))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C
index 4bdb0304b2..37b8005e47 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/zeroInletOutlet/zeroInletOutletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Foam::zeroInletOutletFvPatchField<Type>::zeroInletOutletFvPatchField
     {
         fvPatchField<Type>::operator=
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 197f68da02..c09ddba3ef 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,15 +84,13 @@ Foam::fvPatchField<Type>::fvPatchField
         {
             Field<Type>::operator=
             (
-                Field<Type>("value", dict, p.size())
+                Field<Type>("value", iF.dimensions(), dict, p.size())
             );
         }
         else
         {
-            FatalIOErrorInFunction
-            (
-                dict
-            )   << "Essential entry 'value' missing"
+            FatalIOErrorInFunction(dict)
+                << "Essential entry 'value' missing"
                 << exit(FatalIOError);
         }
     }
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index fadce3c706..c3b5e3e16d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,12 @@ Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
     const dictionary& dict
 )
 :
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    fvsPatchField<Type>
+    (
+        p,
+        iF,
+        Field<Type>("value", iF.dimensions(), dict, p.size())
+    )
 {}
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index ca262c2ba2..17dbc8e76b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,12 @@ Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
     const dictionary& dict
 )
 :
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    fvsPatchField<Type>
+    (
+        p,
+        iF,
+        Field<Type>("value", iF.dimensions(), dict, p.size())
+    )
 {}
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C
index d7763c41d7..2dd0de0636 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,12 @@ Foam::internalFvsPatchField<Type>::internalFvsPatchField
     const dictionary& dict
 )
 :
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    fvsPatchField<Type>
+    (
+        p,
+        iF,
+        Field<Type>("value", iF.dimensions(), dict, p.size())
+    )
 {
     if (!isType<internalFvPatch>(p))
     {
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C
index fd38357e61..56718bc0c8 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,12 @@ Foam::nonConformalErrorFvsPatchField<Type>::nonConformalErrorFvsPatchField
     const dictionary& dict
 )
 :
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    fvsPatchField<Type>
+    (
+        p,
+        iF,
+        Field<Type>("value", iF.dimensions(), dict, p.size())
+    )
 {
     if (!isType<nonConformalErrorFvPatch>(p))
     {
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index f3695e0400..b7bf5fd8f1 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "dictionary.H"
 #include "fvMesh.H"
 #include "fieldMapper.H"
+#include "surfaceMesh.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -76,7 +77,7 @@ Foam::fvsPatchField<Type>::fvsPatchField
         {
             Field<Type>::operator=
             (
-                Field<Type>("value", dict, p.size())
+                Field<Type>("value", iF.dimensions(), dict, p.size())
             );
         }
         else
diff --git a/src/finiteVolume/fields/surfaceFields/surfaceFields.H b/src/finiteVolume/fields/surfaceFields/surfaceFields.H
index 4b871ef424..a557f4c646 100644
--- a/src/finiteVolume/fields/surfaceFields/surfaceFields.H
+++ b/src/finiteVolume/fields/surfaceFields/surfaceFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ template<>
 inline bool isFlux<scalar>(const DimensionedField<scalar, surfaceMesh>& df)
 {
     return
-        df.dimensions() == dimFlux
+        df.dimensions() == dimVolumetricFlux
      || df.dimensions() == dimMassFlux;
 }
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
index ff74f97308..f8aa039c55 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -216,7 +216,7 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime/dimTime
+            vf.dimensions()*dimVolume/dimTime/dimTime
         )
     );
 
@@ -276,7 +276,7 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol
+            rho.dimensions()*vf.dimensions()*dimVolume
             /dimTime/dimTime
         )
     );
@@ -336,7 +336,7 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol
+            rho.dimensions()*vf.dimensions()*dimVolume
             /dimTime/dimTime
         )
     );
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
index 5b143331d1..22d79eeb0b 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ steadyStateD2dt2Scheme<Type>::fvmD2dt2
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime/dimTime
+            vf.dimensions()*dimVolume/dimTime/dimTime
         )
     );
 
@@ -115,7 +115,7 @@ steadyStateD2dt2Scheme<Type>::fvmD2dt2
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime/dimTime
         )
     );
 
@@ -136,7 +136,7 @@ steadyStateD2dt2Scheme<Type>::fvmD2dt2
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime/dimTime
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index c229a2a9d8..dc6ead31df 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -406,7 +406,7 @@ CoEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime
+            vf.dimensions()*dimVolume/dimTime
         )
     );
 
@@ -442,7 +442,7 @@ CoEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -479,7 +479,7 @@ CoEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -519,7 +519,11 @@ CoEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            alpha.dimensions()
+           *rho.dimensions()
+           *vf.dimensions()
+           *dimVolume
+           /dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -677,7 +681,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
     if
     (
         U.dimensions() == dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         VolField<Type> rhoU0
@@ -705,7 +709,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
     else if
     (
         U.dimensions() == rho.dimensions()*dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         fluxFieldType phiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 4ec0480f00..8e00a9aeac 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -308,27 +308,30 @@ CrankNicolsonDdtScheme<Type>::CrankNicolsonDdtScheme
     if (firstToken.isNumber())
     {
         const scalar ocCoeff = firstToken.number();
+
         if (ocCoeff < 0 || ocCoeff > 1)
         {
-            FatalIOErrorInFunction
-            (
-                is
-            )   << "Off-centreing coefficient = " << ocCoeff
+            FatalIOErrorInFunction(is)
+                << "Off-centreing coefficient = " << ocCoeff
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
         }
 
-        ocCoeff_ = new Function1s::Constant<scalar>
-        (
-            "ocCoeff",
-            ocCoeff
-        );
+        ocCoeff_ =
+            new Function1s::Constant<scalar>("ocCoeff", ocCoeff);
     }
     else
     {
         is.putBack(firstToken);
         dictionary dict(is);
-        ocCoeff_ = Function1<scalar>::New("ocCoeff", dict);
+        ocCoeff_ =
+            Function1<scalar>::New
+            (
+                "ocCoeff",
+                mesh.time().userUnits(),
+                unitFraction,
+                dict
+            );
     }
 
     // Ensure the old-old-time cell volumes are available
@@ -769,7 +772,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime
+            vf.dimensions()*dimVolume/dimTime
         )
     );
 
@@ -852,7 +855,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -934,7 +937,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -1025,7 +1028,11 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            alpha.dimensions()
+           *rho.dimensions()
+           *vf.dimensions()
+           *dimVolume
+           /dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -1373,7 +1380,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
     if
     (
         U.dimensions() == dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         DDt0Field<VolField<Type>>& ddt0 =
@@ -1430,7 +1437,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
     else if
     (
         U.dimensions() == rho.dimensions()*dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         DDt0Field<VolField<Type>>& ddt0 =
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index 42bddc7edd..87dc6bca53 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -225,7 +225,7 @@ public:
         //- Return the current off-centering coefficient
         scalar ocCoeff() const
         {
-            return ocCoeff_->value(mesh().time().userTimeValue());
+            return ocCoeff_->value(mesh().time().value());
         }
 
         virtual tmp<VolField<Type>> fvcDdt
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index a84393f121..27cca47cb4 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -296,7 +296,7 @@ EulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime
+            vf.dimensions()*dimVolume/dimTime
         )
     );
 
@@ -332,7 +332,7 @@ EulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -369,7 +369,7 @@ EulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -409,7 +409,11 @@ EulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            alpha.dimensions()
+           *rho.dimensions()
+           *vf.dimensions()
+           *dimVolume
+           /dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -563,7 +567,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
     if
     (
         U.dimensions() == dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         VolField<Type> rhoU0
@@ -591,7 +595,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
     else if
     (
         U.dimensions() == rho.dimensions()*dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         fluxFieldType phiCorr
@@ -677,7 +681,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
 
-    if (U.dimensions() == dimVelocity && phi.dimensions() == dimFlux)
+    if (U.dimensions() == dimVelocity && phi.dimensions() == dimVolumetricFlux)
     {
         const volScalarField alphaRho0(alpha.oldTime()*rho.oldTime());
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index b9863aa6fb..2073c2c783 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -395,7 +395,7 @@ SLTSDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime
+            vf.dimensions()*dimVolume/dimTime
         )
     );
 
@@ -431,7 +431,7 @@ SLTSDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -468,7 +468,7 @@ SLTSDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -508,7 +508,11 @@ SLTSDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            alpha.dimensions()
+           *rho.dimensions()
+           *vf.dimensions()
+           *dimVolume
+           /dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -667,7 +671,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
     if
     (
         U.dimensions() == dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         VolField<Type> rhoU0
@@ -695,7 +699,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
     else if
     (
         U.dimensions() == rho.dimensions()*dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         fluxFieldType phiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index e5b01428ff..986dcbe303 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -423,7 +423,7 @@ backwardDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime
+            vf.dimensions()*dimVolume/dimTime
         )
     );
 
@@ -475,7 +475,7 @@ backwardDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -526,7 +526,7 @@ backwardDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -581,7 +581,11 @@ backwardDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            alpha.dimensions()
+           *rho.dimensions()
+           *vf.dimensions()
+           *dimVolume
+           /dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -823,7 +827,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
     if
     (
         U.dimensions() == dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         const VolField<Type> rhoU0
@@ -854,7 +858,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
     else if
     (
         U.dimensions() == rho.dimensions()*dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         return fluxFieldType::New
@@ -964,7 +968,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
     const scalar coefft00 = deltaT*deltaT/(deltaT0*(deltaT + deltaT0));
     const scalar coefft0  = coefft + coefft00;
 
-    if (U.dimensions() == dimVelocity && phi.dimensions() == dimFlux)
+    if (U.dimensions() == dimVelocity && phi.dimensions() == dimVolumetricFlux)
     {
         const volScalarField alphaRho0(alpha.oldTime()*rho.oldTime());
         const volScalarField alphaRho00
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 2a4313fe9f..095f187c27 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ tmp<fvMatrix<Type>> ddtScheme<Type>::fvmDdt
         (
             vf,
             alpha.dimensions()*rho.dimensions()
-            *vf.dimensions()*dimVol/dimTime
+            *vf.dimensions()*dimVolume/dimTime
         )
     );
 }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index e24134ee5f..6692c6d65a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -207,7 +207,7 @@ localEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime
+            vf.dimensions()*dimVolume/dimTime
         )
     );
 
@@ -235,7 +235,7 @@ localEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -264,7 +264,7 @@ localEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -295,7 +295,11 @@ localEulerDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            alpha.dimensions()
+           *rho.dimensions()
+           *vf.dimensions()
+           *dimVolume
+           /dimTime
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -524,7 +528,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
     if
     (
         U.dimensions() == dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         VolField<Type> rhoU0
@@ -561,7 +565,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
     else if
     (
         U.dimensions() == rho.dimensions()*dimVelocity
-     && phi.dimensions() == rho.dimensions()*dimFlux
+     && phi.dimensions() == rho.dimensions()*dimVolumetricFlux
     )
     {
         fluxFieldType phiCorr
@@ -656,7 +660,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(localRDeltaT()));
 
-    if (U.dimensions() == dimVelocity && phi.dimensions() == dimFlux)
+    if (U.dimensions() == dimVelocity && phi.dimensions() == dimVolumetricFlux)
     {
         const volScalarField alphaRho0(alpha.oldTime()*rho.oldTime());
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index 953b00f335..2bed073ec8 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,7 +160,7 @@ steadyStateDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            vf.dimensions()*dimVol/dimTime
+            vf.dimensions()*dimVolume/dimTime
         )
     );
 }
@@ -179,7 +179,7 @@ steadyStateDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
 }
@@ -198,7 +198,7 @@ steadyStateDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            rho.dimensions()*vf.dimensions()*dimVolume/dimTime
         )
     );
 }
@@ -218,7 +218,11 @@ steadyStateDdtScheme<Type>::fvmDdt
         new fvMatrix<Type>
         (
             vf,
-            alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
+            alpha.dimensions()
+           *rho.dimensions()
+           *vf.dimensions()
+           *dimVolume
+           /dimTime
         )
     );
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index b4cdb2fcdd..d9a4ffc3fc 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ surfaceIntegrate
             dimensioned<Type>
             (
                 "0",
-                ssf.dimensions()/dimVol,
+                ssf.dimensions()/dimVolume,
                 Zero
             ),
             extrapolatedCalculatedFvPatchField<Type>::typeName
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
index 97f281c5fa..ba27b1e740 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
@@ -90,7 +90,7 @@ domainIntegrate
     return dimensioned<Type>
     (
         "domainIntegrate(" + vf.name() + ')',
-        dimVol*vf.dimensions(),
+        dimVolume*vf.dimensions(),
         gSum(fvc::volumeIntegrate(vf))
     );
 }
@@ -117,7 +117,7 @@ dimensioned<Type> domainIntegrate
     return dimensioned<Type>
     (
         "domainIntegrate(" + df.name() + ')',
-        dimVol*df.dimensions(),
+        dimVolume*df.dimensions(),
         gSum(fvc::volumeIntegrate(df))
     );
 }
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.C b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
index b62f96b8fb..4e030e14aa 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
@@ -44,7 +44,7 @@ Foam::fvm::Su
         new fvMatrix<Type>
         (
             vf,
-            dimVol*su.dimensions()
+            dimVolume*su.dimensions()
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -110,7 +110,7 @@ Foam::fvm::Sp
         new fvMatrix<Type>
         (
             vf,
-            dimVol*sp.dimensions()*vf.dimensions()
+            dimVolume*sp.dimensions()*vf.dimensions()
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -164,7 +164,7 @@ Foam::fvm::Sp
         new fvMatrix<Type>
         (
             vf,
-            dimVol*sp.dimensions()*vf.dimensions()
+            dimVolume*sp.dimensions()*vf.dimensions()
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
@@ -202,7 +202,7 @@ Foam::fvm::SuSp
         new fvMatrix<Type>
         (
             vf,
-            dimVol*susp.dimensions()*vf.dimensions()
+            dimVolume*susp.dimensions()*vf.dimensions()
         )
     );
     fvMatrix<Type>& fvm = tfvm.ref();
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 6754e892e9..5a47b1f45d 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -813,7 +813,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::A() const
         (
             "A(" + psi_.name() + ')',
             psi_.mesh(),
-            dimensions_/psi_.dimensions()/dimVol,
+            dimensions_/psi_.dimensions()/dimVolume,
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
@@ -834,7 +834,7 @@ Foam::tmp<Foam::VolInternalField<Type>> Foam::fvMatrix<Type>::Su() const
         (
             "Su(" +psi_.name() + ')',
             psi_.mesh(),
-            dimensions_/dimVol,
+            dimensions_/dimVolume,
             -source()/psi_.mesh().V()
         )
     );
@@ -852,7 +852,7 @@ Foam::tmp<Foam::volScalarField::Internal> Foam::fvMatrix<Type>::Sp() const
         (
             "Sp(" + psi_.name() + ')',
             psi_.mesh(),
-            dimensions_/psi_.dimensions()/dimVol,
+            dimensions_/psi_.dimensions()/dimVolume,
             hasDiag()
           ? diag()/psi_.mesh().V()
           : tmp<scalarField>(new scalarField(lduAddr().size(), scalar(0)))
@@ -873,7 +873,7 @@ Foam::fvMatrix<Type>::H() const
         (
             "H(" + psi_.name() + ')',
             psi_.mesh(),
-            dimensions_/dimVol,
+            dimensions_/dimVolume,
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
@@ -928,7 +928,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
         (
             "H(1)",
             psi_.mesh(),
-            dimensions_/(dimVol*psi_.dimensions()),
+            dimensions_/(dimVolume*psi_.dimensions()),
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
@@ -2478,7 +2478,7 @@ Foam::operator&
         (
             "M&" + psi.name(),
             psi.mesh(),
-            M.dimensions()/dimVol,
+            M.dimensions()/dimVolume,
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 7b7bdf5603..b64f1f300d 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,7 +217,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H() const
         (
             "H("+psi_.name()+')',
             psi_.mesh(),
-            dimensions_/dimVol,
+            dimensions_/dimVolume,
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
@@ -242,7 +242,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H1() const
         (
             "H(1)",
             psi_.mesh(),
-            dimensions_/(dimVol*psi_.dimensions()),
+            dimensions_/(dimVolume*psi_.dimensions()),
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
index d43e98ffe1..af527df265 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ Foam::PhiScheme<Type, PhiLimiter>::limiter
 
         tUflux = this->faceFlux_/fvc::interpolate(rho);
     }
-    else if (this->faceFlux_.dimensions() != dimFlux)
+    else if (this->faceFlux_.dimensions() != dimVolumetricFlux)
     {
         FatalErrorInFunction
             << "dimensions of faceFlux are not correct"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index 5bd4a20e5e..7b2bb64d84 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,7 +197,7 @@ public:
 
                 tUflux = faceFlux_/fvc::interpolate(rho);
             }
-            else if (faceFlux_.dimensions() != dimFlux)
+            else if (faceFlux_.dimensions() != dimVolumetricFlux)
             {
                 FatalErrorInFunction
                     << "dimensions of faceFlux are not correct"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 62ab864200..f4fcae93af 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -207,7 +207,7 @@ public:
 
                 tUflux = faceFlux_/fvc::interpolate(rho);
             }
-            else if (faceFlux_.dimensions() != dimFlux)
+            else if (faceFlux_.dimensions() != dimVolumetricFlux)
             {
                 FatalErrorInFunction
                     << "dimensions of faceFlux are not correct"
diff --git a/src/functionObjects/forces/forcesBase/forcesBase.C b/src/functionObjects/forces/forcesBase/forcesBase.C
index ed3ca0a659..0abce9a6ae 100644
--- a/src/functionObjects/forces/forcesBase/forcesBase.C
+++ b/src/functionObjects/forces/forcesBase/forcesBase.C
@@ -256,7 +256,7 @@ Foam::functionObjects::forcesBase::devTau() const
         const dimensionedScalar nu
         (
             "nu",
-            dimViscosity,
+            dimKinematicViscosity,
             physicalProperties.lookup("nu")
         );
 
@@ -326,7 +326,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::forcesBase::mu() const
         const dimensionedScalar nu
         (
             "nu",
-            dimViscosity,
+            dimKinematicViscosity,
             physicalProperties.lookup("nu")
         );
 
diff --git a/src/functionObjects/forces/movingForces/movingForces.C b/src/functionObjects/forces/movingForces/movingForces.C
index d8260f914d..dc2f37efc4 100644
--- a/src/functionObjects/forces/movingForces/movingForces.C
+++ b/src/functionObjects/forces/movingForces/movingForces.C
@@ -43,7 +43,7 @@ namespace functionObjects
 
 Foam::vector Foam::functionObjects::movingForces::CofR() const
 {
-    return CofR_->value(time_.userTimeValue());
+    return CofR_->value(time_.value());
 }
 
 
@@ -88,7 +88,7 @@ bool Foam::functionObjects::movingForces::read(const dictionary& dict)
     forcesBase::read(dict);
 
     // Centre of rotation for moment calculations
-    CofR_ = Function1<vector>::New("CofR", dict);
+    CofR_ = Function1<vector>::New("CofR", time_.userUnits(), dimLength, dict);
 
     return true;
 }
diff --git a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C
index 7d3eebc3e4..903016afd8 100644
--- a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C
+++ b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -240,7 +240,7 @@ Foam::functionObjects::phaseScalarTransport::D
         (
             "D" + s_.name(),
             mesh_,
-            dimensionedScalar(dimViscosity, D_)
+            dimensionedScalar(dimKinematicViscosity, D_)
         );
     }
 
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 3d4fb505b8..e576ba59b7 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::functionObjects::scalarTransport::D() const
         (
             Dname,
             mesh_,
-            dimensionedScalar(Dname, dimViscosity, D_)
+            dimensionedScalar(Dname, dimKinematicViscosity, D_)
         );
     }
     else
diff --git a/src/functionObjects/utilities/checkMesh/checkMesh.C b/src/functionObjects/utilities/checkMesh/checkMesh.C
index 58e2ba3099..aa9c0e36b1 100644
--- a/src/functionObjects/utilities/checkMesh/checkMesh.C
+++ b/src/functionObjects/utilities/checkMesh/checkMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,8 @@ bool Foam::functionObjects::checkMesh::read(const dictionary& dict)
         );
     }
 
-    nonOrthThreshold_ = dict.lookupOrDefault("nonOrthThreshold", 70.0);
+    nonOrthThreshold_ =
+        dict.lookupOrDefault("nonOrthThreshold", unitDegrees, degToRad(70.0));
     skewThreshold_ = dict.lookupOrDefault("skewThreshold", 4.0);
 
     stopAt_ = Time::stopAtControlNames
diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
index e1dcf81a04..a0b161093b 100644
--- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
+++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,14 @@ bool Foam::functionObjects::setTimeStepFunctionObject::read
     const dictionary& dict
 )
 {
-    timeStepPtr_ = Function1<scalar>::New("deltaT", dict);
+    timeStepPtr_ =
+        Function1<scalar>::New
+        (
+            "deltaT",
+            time_.userUnits(),
+            time_.userUnits(),
+            dict
+        );
 
     return true;
 }
@@ -80,15 +87,12 @@ bool Foam::functionObjects::setTimeStepFunctionObject::read
 
 bool Foam::functionObjects::setTimeStepFunctionObject::execute()
 {
-    bool adjustTimeStep =
+    const bool adjustTimeStep =
         time_.controlDict().lookupOrDefault("adjustTimeStep", false);
 
     if (!adjustTimeStep)
     {
-        const_cast<Time&>(time_).setDeltaT
-        (
-            time_.userTimeToTime(timeStepPtr_().value(time_.userTimeValue()))
-        );
+        const_cast<Time&>(time_).setDeltaT(timeStepPtr_().value(time_.value()));
     }
 
     return true;
diff --git a/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C b/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C
index 8846b13588..72e073bc4b 100644
--- a/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C
+++ b/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,14 @@ bool Foam::functionObjects::setWriteIntervalFunctionObject::read
     const dictionary& dict
 )
 {
-    writeIntervalPtr_ = Function1<scalar>::New("writeInterval", dict);
+    writeIntervalPtr_ =
+        Function1<scalar>::New
+        (
+            "writeInterval",
+            time_.userUnits(),
+            time_.writeIntervalUnits(),
+            dict
+        );
 
     return true;
 }
@@ -84,7 +91,7 @@ bool Foam::functionObjects::setWriteIntervalFunctionObject::execute()
 {
     const_cast<Time&>(time_).setWriteInterval
     (
-        time_.userTimeToTime(writeIntervalPtr_().value(time_.userTimeValue()))
+        writeIntervalPtr_().value(time_.value())
     );
 
     return true;
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index 91a4900674..bcf57ecc05 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void Foam::pairPatchAgglomeration::setBasedEdgeWeights()
                     facePairWeight_.insert(edgeCommon, edgeLength);
                 }
 
-                if (cosI < Foam::cos(degToRad(featureAngle_)))
+                if (cosI < Foam::cos(featureAngle_))
                 {
                     facePairWeight_[edgeCommon] = -1.0;
                 }
@@ -204,7 +204,7 @@ Foam::pairPatchAgglomeration::pairPatchAgglomeration
     ),
     featureAngle_
     (
-        controlDict.lookupOrDefault<scalar>("featureAngle", 0)
+        controlDict.lookupOrDefault<scalar>("featureAngle", unitDegrees, 0)
     ),
     nFaces_(maxLevels_),
     restrictAddressing_(maxLevels_),
diff --git a/src/fvConstraints/fixedTemperature/fixedTemperature.C b/src/fvConstraints/fixedTemperature/fixedTemperature.C
index 04cdcc6af1..b796696546 100644
--- a/src/fvConstraints/fixedTemperature/fixedTemperature.C
+++ b/src/fvConstraints/fixedTemperature/fixedTemperature.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,13 @@ void Foam::fv::fixedTemperature::readCoeffs()
         {
             TValue_.reset
             (
-                Function1<scalar>::New("temperature", coeffs()).ptr()
+                Function1<scalar>::New
+                (
+                    "temperature",
+                    mesh().time().userUnits(),
+                    dimTemperature,
+                    coeffs()
+                ).ptr()
             );
             break;
         }
@@ -92,7 +98,13 @@ void Foam::fv::fixedTemperature::readCoeffs()
 
     fraction_ =
         coeffs().found("fraction")
-      ? Function1<scalar>::New("fraction", coeffs())
+      ? Function1<scalar>::New
+        (
+            "fraction",
+            mesh().time().userUnits(),
+            unitFraction,
+            coeffs()
+        )
       : autoPtr<Function1<scalar>>();
 }
 
@@ -146,7 +158,7 @@ bool Foam::fv::fixedTemperature::constrain
             IOobject::groupName(physicalProperties::typeName, phaseName_)
         );
 
-    const scalar t = mesh().time().userTimeValue();
+    const scalar t = mesh().time().value();
 
     switch (mode_)
     {
diff --git a/src/fvConstraints/fixedValue/fixedValueConstraint.C b/src/fvConstraints/fixedValue/fixedValueConstraint.C
index b58400e4f1..5223d85bab 100644
--- a/src/fvConstraints/fixedValue/fixedValueConstraint.C
+++ b/src/fvConstraints/fixedValue/fixedValueConstraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,6 +68,7 @@ void Foam::fv::fixedValueConstraint::readCoeffs()
             new unknownTypeFunction1
             (
                 iter().keyword(),
+                mesh().time().userUnits(),
                 coeffs().subDict("fieldValues")
             )
         );
@@ -75,7 +76,13 @@ void Foam::fv::fixedValueConstraint::readCoeffs()
 
     fraction_ =
         coeffs().found("fraction")
-      ? Function1<scalar>::New("fraction", coeffs())
+      ? Function1<scalar>::New
+        (
+            "fraction",
+            mesh().time().userUnits(),
+            unitFraction,
+            coeffs()
+        )
       : autoPtr<Function1<scalar>>();
 }
 
@@ -87,7 +94,13 @@ bool Foam::fv::fixedValueConstraint::constrainType
     const word& fieldName
 ) const
 {
-    const scalar t = mesh().time().userTimeValue();
+    // Set the value units for the function
+    fieldValues_[fieldName]->template setValueUnits<Type>
+    (
+        eqn.psi().dimensions()
+    );
+
+    const scalar t = mesh().time().value();
 
     const List<Type> values
     (
diff --git a/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C b/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C
index 968b8f1a23..acb12e17f9 100644
--- a/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C
+++ b/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,16 @@ void Foam::fv::zeroDimensionalFixedPressureConstraint::readCoeffs()
 
     rhoName_ = coeffs().lookupOrDefault<word>("rho", "rho");
 
-    p_.reset(Function1<scalar>::New("pressure", coeffs()).ptr());
+    p_.reset
+    (
+        Function1<scalar>::New
+        (
+            "pressure",
+            mesh().time().userUnits(),
+            dimPressure,
+            coeffs()
+        ).ptr()
+    );
 }
 
 
@@ -273,7 +282,7 @@ bool Foam::fv::zeroDimensionalFixedPressureConstraint::constrain
             dimensionedScalar
             (
                 dimPressure,
-                p_->value(mesh().time().userTimeValue())
+                p_->value(mesh().time().value())
             )
         );
 
diff --git a/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.C b/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.C
index 9eb6f186d9..566ff833d4 100644
--- a/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.C
+++ b/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.C
@@ -41,12 +41,13 @@ namespace Function1s
 Foam::Function1s::crankConnectingRodMotion::crankConnectingRodMotion
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
     Function1<scalar>(name),
-    conRodLength_(dict.lookup<scalar>("conRodLength")),
-    stroke_(dict.lookup<scalar>("stroke"))
+    conRodLength_(dict.lookup<scalar>("conRodLength", dimLength)),
+    stroke_(dict.lookup<scalar>("stroke", dimLength))
 {}
 
 
@@ -58,7 +59,11 @@ Foam::Function1s::crankConnectingRodMotion::~crankConnectingRodMotion()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::Function1s::crankConnectingRodMotion::write(Ostream& os) const
+void Foam::Function1s::crankConnectingRodMotion::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "conRodLength", conRodLength_);
     writeEntry(os, "stroke", stroke_);
diff --git a/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.H b/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.H
index 1336f5d2d3..696170b7ab 100644
--- a/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.H
+++ b/src/fvMeshMovers/multiValveEngine/crankConnectingRodMotion/crankConnectingRodMotion.H
@@ -91,6 +91,7 @@ public:
         crankConnectingRodMotion
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -132,7 +133,7 @@ public:
 
 
         //- Write data to dictionary stream
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 
 
     // Member Operators
diff --git a/src/fvMeshMovers/multiValveEngine/movingObject.C b/src/fvMeshMovers/multiValveEngine/movingObject.C
index 72a72a548f..5b0714eacf 100644
--- a/src/fvMeshMovers/multiValveEngine/movingObject.C
+++ b/src/fvMeshMovers/multiValveEngine/movingObject.C
@@ -281,19 +281,19 @@ Foam::fvMeshMovers::multiValveEngine::movingObject::movingObject
     dict_(dict),
     meshMover_(engine),
     name(objectName),
-    axis(dict.lookup("axis")),
-    motion_(Function1<scalar>::New("motion", dict)),
+    axis(dict.lookup<vector>("axis", dimless)),
+    motion_(Function1<scalar>::New("motion", unitNone, dimLength, dict)),
     maxMotionDistance_
     (
-        dict.lookupOrDefault<scalar>("maxMotionDistance", great)
+        dict.lookupOrDefault<scalar>("maxMotionDistance", dimLength, great)
     ),
     movingFrozenLayerThickness_
     (
-        dict.lookupOrDefault<scalar>("movingFrozenLayerThickness", 0)
+        dict.lookupOrDefault<scalar>("movingFrozenLayerThickness", dimLength, 0)
     ),
     staticFrozenLayerThickness_
     (
-        dict.lookupOrDefault<scalar>("staticFrozenLayerThickness", 0)
+        dict.lookupOrDefault<scalar>("staticFrozenLayerThickness", dimLength, 0)
     ),
     movingPointZones_
     (
@@ -319,7 +319,7 @@ Foam::fvMeshMovers::multiValveEngine::movingObject::movingObject
     cosine_(dict.lookupOrDefault("cosineScaling", false)),
     travelInterval_
     (
-        dict.lookupOrDefault<scalar>("travelInterval", great)
+        dict.lookupOrDefault<scalar>("travelInterval", dimLength, great)
     ),
     executionCount_(0),
     position0_(-great),
diff --git a/src/fvMeshMovers/multiValveEngine/valve.C b/src/fvMeshMovers/multiValveEngine/valve.C
index df6ea6854a..ab60aa63d7 100644
--- a/src/fvMeshMovers/multiValveEngine/valve.C
+++ b/src/fvMeshMovers/multiValveEngine/valve.C
@@ -36,7 +36,7 @@ Foam::fvMeshMovers::multiValveEngine::valveObject::valveObject
 )
 :
     movingObject(name, engine, dict),
-    minLift_(dict.lookup<scalar>("minLift"))
+    minLift_(dict.lookup<scalar>("minLift", dimLength))
 {}
 
 
diff --git a/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C b/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C
index 35937cae68..15a9491246 100644
--- a/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C
+++ b/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,11 +119,19 @@ Foam::fvMeshTopoChangers::meshToMesh::meshToMesh
 :
     fvMeshTopoChanger(mesh),
     dict_(dict),
-    times_(dict.lookup("times")),
-    timeDelta_(dict.lookup<scalar>("timeDelta")),
-    begin_(dict.lookupOrDefault("begin", mesh().time().beginTime().value())),
-    repeat_(dict.lookupOrDefault("repeat", 0.0)),
-    cycle_(dict.lookupOrDefault("cycle", 0.0)),
+    times_(dict.lookup<scalarList>("times", unitNone)),
+    timeDelta_(dict.lookup<scalar>("timeDelta", unitNone)),
+    begin_
+    (
+        dict.lookupOrDefault<scalar>
+        (
+            "begin",
+            unitNone,
+            mesh().time().beginTime().value()
+        )
+    ),
+    repeat_(dict.lookupOrDefault<scalar>("repeat", unitNone, 0)),
+    cycle_(dict.lookupOrDefault<scalar>("cycle", unitNone, 0)),
     timeIndex_(-1)
 {
     if (repeat_ > 0 && cycle_ > 0)
diff --git a/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.H b/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.H
index 9866aee7b7..2f794f1d3d 100644
--- a/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.H
+++ b/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ class meshToMesh
 
         //- Return true if the set of meshes are being traversed in the forward
         //  sequence or false if cycling is currently traversing the meshes in
-        //  revers order
+        //  reverse order
         bool forward() const;
 
         //- Return the user time mapped to the mesh sequence
diff --git a/src/fvModels/derived/acceleration/acceleration.C b/src/fvModels/derived/acceleration/acceleration.C
index c4b1876ae2..5afb3dee6a 100644
--- a/src/fvModels/derived/acceleration/acceleration.C
+++ b/src/fvModels/derived/acceleration/acceleration.C
@@ -55,7 +55,14 @@ void Foam::fv::acceleration::readCoeffs()
 {
     UName_ = coeffs().lookupOrDefault<word>("U", "U");
 
-    velocity_ = Function1<vector>::New("velocity", coeffs());
+    velocity_ =
+        Function1<vector>::New
+        (
+            "velocity",
+            mesh().time().userUnits(),
+            dimVelocity,
+            coeffs()
+        );
 }
 
 
@@ -70,9 +77,7 @@ void Foam::fv::acceleration::add
 
     const scalar t = mesh().time().value();
     const scalar dt = mesh().time().deltaTValue();
-    const vector dU =
-        velocity_->value(mesh().time().timeToUserTime(t))
-      - velocity_->value(mesh().time().timeToUserTime(t - dt));
+    const vector dU = velocity_->value(t) - velocity_->value(t - dt);
     const vector a = dU/mesh().time().deltaTValue();
 
     const labelUList cells = set_.cells();
diff --git a/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C
index 8d20a69a9a..7e29ce15c3 100644
--- a/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C
+++ b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C
@@ -53,11 +53,24 @@ namespace fv
 
 void Foam::fv::effectivenessHeatExchanger::readCoeffs()
 {
-    secondaryMassFlowRate_ = coeffs().lookup<scalar>("secondaryMassFlowRate");
-    secondaryInletT_ = coeffs().lookup<scalar>("secondaryInletT");
-    primaryInletT_ = coeffs().lookup<scalar>("primaryInletT");
+    secondaryMassFlowRate_ =
+        coeffs().lookup<scalar>("secondaryMassFlowRate", dimMass/dimTime);
+    secondaryInletT_ =
+        coeffs().lookup<scalar>("secondaryInletT", dimTemperature);
+    primaryInletT_ =
+        coeffs().lookup<scalar>("primaryInletT", dimTemperature);
 
-    eTable_.reset(Function2<scalar>::New("effectiveness", coeffs()).ptr());
+    eTable_.reset
+    (
+        Function2<scalar>::New
+        (
+            "effectiveness",
+            dimMass/dimTime,
+            dimMass/dimTime,
+            dimless,
+            coeffs()
+        ).ptr()
+    );
 
     UName_ = coeffs().lookupOrDefault<word>("U", "U");
     TName_ = coeffs().lookupOrDefault<word>("T", "T");
diff --git a/src/fvModels/derived/heatSource/heatSource.C b/src/fvModels/derived/heatSource/heatSource.C
index 7ec2635639..95b5d13ebc 100644
--- a/src/fvModels/derived/heatSource/heatSource.C
+++ b/src/fvModels/derived/heatSource/heatSource.C
@@ -68,7 +68,16 @@ void Foam::fv::heatSource::readCoeffs()
 
     if (coeffs().found("q"))
     {
-        q_.reset(Function1<scalar>::New("q", coeffs()).ptr());
+        q_.reset
+        (
+            Function1<scalar>::New
+            (
+                "q",
+                mesh().time().userUnits(),
+                dimPower/dimVolume,
+                coeffs()
+            ).ptr()
+        );
     }
     else
     {
@@ -79,7 +88,13 @@ void Foam::fv::heatSource::readCoeffs()
                 "q",
                 Function1s::Constant<scalar>("1/V", 1/set_.V()),
                 Function1s::Constant<scalar>("1", 1),
-                Function1<scalar>::New("Q", coeffs())()
+                Function1<scalar>::New
+                (
+                    "Q",
+                    mesh().time().userUnits(),
+                    dimPower,
+                    coeffs()
+                )()
             )
         );
     }
@@ -129,8 +144,7 @@ void Foam::fv::heatSource::addSup
 {
     const labelUList cells = set_.cells();
 
-    const scalar t = mesh().time().userTimeValue();
-    const scalar q = q_->value(t);
+    const scalar q = q_->value(mesh().time().value());
 
     scalarField& eqnSource = eqn.source();
     forAll(cells, i)
diff --git a/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function1/function1.C b/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function1/function1.C
index 4ad79a13ba..b9cce59e32 100644
--- a/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function1/function1.C
+++ b/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function1/function1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,16 @@ void Foam::fv::heatTransferCoefficientModels::function1::readCoeffs
 {
     UName_ = dict.lookupOrDefault<word>("U", "U");
 
-    htcFunc_.reset(Function1<scalar>::New("htcFunc", dict).ptr());
+    htcFunc_.reset
+    (
+        Function1<scalar>::New
+        (
+            "htcFunc",
+            dimVelocity,
+            dimPower/dimArea/dimTemperature,
+            dict
+        ).ptr()
+    );
 }
 
 
diff --git a/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function2/function2.C b/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function2/function2.C
index 40825fb7b6..1c14ba3d30 100644
--- a/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function2/function2.C
+++ b/src/fvModels/derived/heatTransfer/heatTransferCoefficientModels/function2/function2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,17 @@ void Foam::fv::heatTransferCoefficientModels::function2::readCoeffs
     UName_ = dict.lookupOrDefault<word>("U", "U");
     UNbrName_ = dict.lookupOrDefault<word>("UNbr", "U");
 
-    htcFunc_.reset(Function2<scalar>::New("htcFunc", dict).ptr());
+    htcFunc_.reset
+    (
+        Function2<scalar>::New
+        (
+            "htcFunc",
+            dimVelocity,
+            dimVelocity,
+            dimPower/dimArea/dimTemperature,
+            dict
+        ).ptr()
+    );
 }
 
 
diff --git a/src/fvModels/derived/massSource/massSource.C b/src/fvModels/derived/massSource/massSource.C
index 4f2706e68c..f97a966539 100644
--- a/src/fvModels/derived/massSource/massSource.C
+++ b/src/fvModels/derived/massSource/massSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,13 @@ void Foam::fv::massSource::readCoeffs()
 
     massFlowRate_.reset
     (
-        Function1<scalar>::New("massFlowRate", coeffs()).ptr()
+        Function1<scalar>::New
+        (
+            "massFlowRate",
+            mesh().time().userUnits(),
+            dimMass/dimTime,
+            coeffs()
+        ).ptr()
     );
 }
 
@@ -96,7 +102,7 @@ Foam::dimensionedScalar Foam::fv::massSource::S() const
         dimensionedScalar
         (
             dimMass/dimTime,
-            massFlowRate_->value(mesh().time().userTimeValue())
+            massFlowRate_->value(mesh().time().value())
         );
 }
 
diff --git a/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H
index 5e421bc5cc..a3385a6ced 100644
--- a/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H
+++ b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
         data
         (
             (profile1 (radius1 twist1 chord1))
-            (profile1 (radius2 twist2 chord2))
+            (profile2 (radius2 twist2 chord2))
         );
 
     where:
diff --git a/src/fvModels/derived/rotorDisk/rotorDisk.C b/src/fvModels/derived/rotorDisk/rotorDisk.C
index 09a0908fbf..9fa7da3c39 100644
--- a/src/fvModels/derived/rotorDisk/rotorDisk.C
+++ b/src/fvModels/derived/rotorDisk/rotorDisk.C
@@ -86,12 +86,9 @@ void Foam::fv::rotorDisk::readCoeffs()
     coeffs().lookup("tipEffect") >> tipEffect_;
 
     const dictionary& flapCoeffs(coeffs().subDict("flapCoeffs"));
-    flapCoeffs.lookup("beta0") >> flap_.beta0;
-    flapCoeffs.lookup("beta1c") >> flap_.beta1c;
-    flapCoeffs.lookup("beta2s") >> flap_.beta2s;
-    flap_.beta0 = degToRad(flap_.beta0);
-    flap_.beta1c = degToRad(flap_.beta1c);
-    flap_.beta2s = degToRad(flap_.beta2s);
+    flap_.beta0 = flapCoeffs.lookup<scalar>("beta0", unitDegrees);
+    flap_.beta1c = flapCoeffs.lookup<scalar>("beta1c", unitDegrees);
+    flap_.beta2s = flapCoeffs.lookup<scalar>("beta2s", unitDegrees);
 
     // Create co-ordinate system
     createCoordinateSystem();
@@ -419,14 +416,8 @@ void Foam::fv::rotorDisk::createCoordinateSystem()
         }
     }
 
-    coordSys_ = coordinateSystems::cylindrical
-    (
-        "rotorCoordSys",
-        origin,
-        axis,
-        refDir,
-        false
-    );
+    coordSys_ =
+        coordinateSystems::cylindrical("rotorCoordSys", origin, axis, refDir);
 
     const scalar sumArea = gSum(area_);
     const scalar diameter = Foam::sqrt(4.0*sumArea/mathematical::pi);
diff --git a/src/fvModels/derived/rotorDisk/rotorDiskTemplates.C b/src/fvModels/derived/rotorDisk/rotorDiskTemplates.C
index 85f167828f..02322ccc61 100644
--- a/src/fvModels/derived/rotorDisk/rotorDiskTemplates.C
+++ b/src/fvModels/derived/rotorDisk/rotorDiskTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "rotorDisk.H"
 #include "volFields.H"
-#include "unitConversion.H"
 
 using namespace Foam::constant;
 
diff --git a/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C b/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C
index 6aac50a249..244bbe12b3 100644
--- a/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C
+++ b/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "fixedTrim.H"
 #include "rotorDisk.H"
 #include "addToRunTimeSelectionTable.H"
-#include "unitConversion.H"
 #include "mathematicalConstants.H"
 
 using namespace Foam::constant;
@@ -68,9 +67,9 @@ void Foam::fixedTrim::read(const dictionary& dict)
 {
     trimModel::read(dict);
 
-    scalar theta0 = degToRad(coeffs_.lookup<scalar>("theta0"));
-    scalar theta1c = degToRad(coeffs_.lookup<scalar>("theta1c"));
-    scalar theta1s = degToRad(coeffs_.lookup<scalar>("theta1s"));
+    scalar theta0 = coeffs_.lookup<scalar>("theta0", unitDegrees);
+    scalar theta1c = coeffs_.lookup<scalar>("theta1c", unitDegrees);
+    scalar theta1s = coeffs_.lookup<scalar>("theta1s", unitDegrees);
 
     const List<point>& x = rotor_.x();
     forAll(thetag_, i)
diff --git a/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C
index e2636d8446..2f68a2b095 100644
--- a/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,9 +237,9 @@ void Foam::targetCoeffTrim::read(const dictionary& dict)
     target_[2] = targetDict.lookup<scalar>("roll" + ext);
 
     const dictionary& pitchAngleDict(coeffs_.subDict("pitchAngles"));
-    theta_[0] = degToRad(pitchAngleDict.lookup<scalar>("theta0Ini"));
-    theta_[1] = degToRad(pitchAngleDict.lookup<scalar>("theta1cIni"));
-    theta_[2] = degToRad(pitchAngleDict.lookup<scalar>("theta1sIni"));
+    theta_[0] = pitchAngleDict.lookup<scalar>("theta0Ini", unitDegrees);
+    theta_[1] = pitchAngleDict.lookup<scalar>("theta1cIni", unitDegrees);
+    theta_[2] = pitchAngleDict.lookup<scalar>("theta1sIni", unitDegrees);
 
     coeffs_.lookup("calcFrequency") >> calcFrequency_;
 
@@ -247,10 +247,7 @@ void Foam::targetCoeffTrim::read(const dictionary& dict)
     coeffs_.readIfPresent("tol", tol_);
     coeffs_.readIfPresent("relax", relax_);
 
-    if (coeffs_.readIfPresent("dTheta", dTheta_))
-    {
-        dTheta_ = degToRad(dTheta_);
-    }
+    coeffs_.readIfPresent("dTheta", unitDegrees, dTheta_);
 
     alpha_ = coeffs_.lookup<scalar>("alpha");
 }
diff --git a/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C b/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C
index a16ed3a262..87c8180445 100644
--- a/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C
+++ b/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,6 +106,8 @@ void Foam::fv::sixDoFAcceleration::readCoeffs()
         Function1<accelerationVectors>::New
         (
             "accelerations",
+            mesh().time().userUnits(),
+            unitNone,
             coeffs()
         ).ptr()
     );
@@ -123,7 +125,7 @@ void Foam::fv::sixDoFAcceleration::addForce
 {
     const Vector<vector> accelerations
     (
-        accelerations_->value(mesh().time().userTimeValue())
+        accelerations_->value(mesh().time().value())
     );
 
     // If gravitational force is present combine with the linear acceleration
diff --git a/src/fvModels/derived/volumeSource/volumeSource.C b/src/fvModels/derived/volumeSource/volumeSource.C
index 10f9a57ecb..2f169184da 100644
--- a/src/fvModels/derived/volumeSource/volumeSource.C
+++ b/src/fvModels/derived/volumeSource/volumeSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,13 @@ void Foam::fv::volumeSource::readCoeffs()
 
     volumetricFlowRate_.reset
     (
-        Function1<scalar>::New("volumetricFlowRate", coeffs()).ptr()
+        Function1<scalar>::New
+        (
+            "volumetricFlowRate",
+            mesh().time().userUnits(),
+            dimVolume/dimTime,
+            coeffs()
+        ).ptr()
     );
 }
 
@@ -248,7 +254,7 @@ Foam::dimensionedScalar Foam::fv::volumeSource::S() const
         dimensionedScalar
         (
             dimVolume/dimTime,
-            volumetricFlowRate_->value(mesh().time().userTimeValue())
+            volumetricFlowRate_->value(mesh().time().value())
         );
 }
 
diff --git a/src/fvModels/derived/zeroDimensionalMassSource/zeroDimensionalMassSource.C b/src/fvModels/derived/zeroDimensionalMassSource/zeroDimensionalMassSource.C
index dcbecd81da..6364d195f9 100644
--- a/src/fvModels/derived/zeroDimensionalMassSource/zeroDimensionalMassSource.C
+++ b/src/fvModels/derived/zeroDimensionalMassSource/zeroDimensionalMassSource.C
@@ -46,14 +46,20 @@ void Foam::fv::zeroDimensionalMassSource::readCoeffs()
 {
     zeroDimensionalMassFlowRate_.reset
     (
-        Function1<scalar>::New("massFlowRate", coeffs()).ptr()
+        Function1<scalar>::New
+        (
+            "massFlowRate",
+            mesh().time().userUnits(),
+            dimMass/dimTime,
+            coeffs()
+        ).ptr()
     );
 }
 
 
 Foam::scalar Foam::fv::zeroDimensionalMassSource::massFlowRate() const
 {
-    return zeroDimensionalMassFlowRate_->value(mesh().time().userTimeValue());
+    return zeroDimensionalMassFlowRate_->value(mesh().time().value());
 }
 
 
diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
index e76e1c1c51..eb8b04244c 100644
--- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
+++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,12 +72,22 @@ void Foam::fv::semiImplicitSource::readCoeffs()
         fieldSu_.set
         (
             iter().keyword(),
-            new unknownTypeFunction1("explicit", iter().dict())
+            new unknownTypeFunction1
+            (
+                "explicit",
+                mesh().time().userUnits(),
+                iter().dict()
+            )
         );
         fieldSp_.set
         (
             iter().keyword(),
-            Function1<scalar>::New("implicit", iter().dict()).ptr()
+            new unknownTypeFunction1
+            (
+                "implicit",
+                mesh().time().userUnits(),
+                iter().dict()
+            )
         );
     }
 }
@@ -90,7 +100,17 @@ void Foam::fv::semiImplicitSource::addSupType
     fvMatrix<Type>& eqn
 ) const
 {
-    const scalar t = mesh().time().userTimeValue();
+    // Set the value units for the functions
+    fieldSu_[field.name()]->template setValueUnits<Type>
+    (
+        eqn.dimensions()
+    );
+    fieldSp_[field.name()]->template setValueUnits<scalar>
+    (
+        eqn.dimensions()/eqn.psi().dimensions()
+    );
+
+    const scalar t = mesh().time().value();
 
     const VolField<Type>& psi = eqn.psi();
 
@@ -152,7 +172,7 @@ void Foam::fv::semiImplicitSource::addSupType
 
     // Implicit source function for the field
     UIndirectList<scalar>(Sp, set_.cells()) =
-        fieldSp_[field.name()]->value(t)/VDash;
+        fieldSp_[field.name()]->template value<scalar>(t)/VDash;
 
     eqn += Su - fvm::SuSp(-Sp, psi);
 }
diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H b/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
index c014bbb0bf..22bc9dd480 100644
--- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
+++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ private:
         HashPtrTable<unknownTypeFunction1> fieldSu_;
 
         //- Implicit parts of the sources
-        HashPtrTable<Function1<scalar>> fieldSp_;
+        HashPtrTable<unknownTypeFunction1> fieldSp_;
 
 
     // Private Member Functions
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index 1fc6e6739f..bf08eb3db2 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,11 +45,11 @@ angularOscillatingDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
-    axis_(dict.lookup("axis")),
-    origin_(dict.lookup("origin")),
-    angle0_(dict.lookup<scalar>("angle0")),
-    amplitude_(dict.lookup<scalar>("amplitude")),
-    omega_(dict.lookup<scalar>("omega"))
+    axis_(dict.lookup<vector>("axis", dimless)),
+    origin_(dict.lookup<vector>("origin", dimLength)),
+    angle0_(dict.lookup<scalar>("angle0", unitRadians)),
+    amplitude_(dict.lookup<scalar>("amplitude", unitRadians)),
+    omega_(dict.lookup<scalar>("omega", unitRadians/dimTime))
 {
     if (!dict.found("value"))
     {
@@ -58,7 +58,7 @@ angularOscillatingDisplacementPointPatchVectorField
 
     if (dict.found("p0"))
     {
-        p0_ = vectorField("p0", dict , p.size());
+        p0_ = vectorField("p0", dimLength, dict, p.size());
     }
     else
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 206fa3d714..b8242ac803 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,11 +45,11 @@ angularOscillatingVelocityPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
-    axis_(dict.lookup("axis")),
-    origin_(dict.lookup("origin")),
-    angle0_(dict.lookup<scalar>("angle0")),
-    amplitude_(dict.lookup<scalar>("amplitude")),
-    omega_(dict.lookup<scalar>("omega"))
+    axis_(dict.lookup<vector>("axis", dimless)),
+    origin_(dict.lookup<vector>("origin", dimLength)),
+    angle0_(dict.lookup<scalar>("angle0", unitRadians)),
+    amplitude_(dict.lookup<scalar>("amplitude", unitRadians)),
+    omega_(dict.lookup<scalar>("omega", unitRadians/dimTime))
 {
     if (!dict.found("value"))
     {
@@ -58,7 +58,7 @@ angularOscillatingVelocityPointPatchVectorField
 
     if (dict.found("p0"))
     {
-        p0_ = vectorField("p0", dict , p.size());
+        p0_ = vectorField("p0", dimLength, dict, p.size());
     }
     else
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index 3777adf023..332a3e99a6 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,8 +45,8 @@ oscillatingDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
-    amplitude_(dict.lookup("amplitude")),
-    omega_(dict.lookup<scalar>("omega"))
+    amplitude_(dict.lookup<vector>("amplitude", dimLength)),
+    omega_(dict.lookup<scalar>("omega", unitRadians/dimTime))
 {
     if (!dict.found("value"))
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index d9c8c52002..216557a47e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,8 +45,8 @@ oscillatingVelocityPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
-    amplitude_(dict.lookup("amplitude")),
-    omega_(dict.lookup<scalar>("omega"))
+    amplitude_(dict.lookup<vector>("amplitude", dimLength)),
+    omega_(dict.lookup<scalar>("omega", unitRadians/dimTime))
 {
     if (!dict.found("value"))
     {
@@ -55,7 +55,7 @@ oscillatingVelocityPointPatchVectorField
 
     if (dict.found("p0"))
     {
-        p0_ = vectorField("p0", dict , p.size());
+        p0_ = vectorField("p0", dimLength, dict, p.size());
     }
     else
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 74828c1d24..ddcfa048aa 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -313,10 +313,10 @@ surfaceDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchVectorField(p, iF, dict),
-    velocity_(dict.lookup("velocity")),
+    velocity_(dict.lookup<vector>("velocity", dimVelocity)),
     surfacesDict_(dict.subDict("geometry")),
     projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
-    projectDir_(dict.lookup("projectDirection")),
+    projectDir_(dict.lookup<vector>("projectDirection", dimless)),
     wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
     frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
 {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 6c70c08e29..a47d618ff1 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -314,7 +314,7 @@ surfaceSlipDisplacementPointPatchVectorField
     pointPatchVectorField(p, iF, dict),
     surfacesDict_(dict.subDict("geometry")),
     projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
-    projectDir_(dict.lookup("projectDirection")),
+    projectDir_(dict.lookup<vector>("projectDirection", dimless)),
     wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
     frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
 {}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index a6b4773d28..13774cd76a 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,14 @@ timeVaryingMappedFixedValuePointPatchField
 {
     if (dict.found("offset"))
     {
-        offset_ = Function1<Type>::New("offset", dict);
+        offset_ =
+            Function1<Type>::New
+            (
+                "offset",
+                this->db().time().userUnits(),
+                iF.dimensions(),
+                dict
+            );
     }
 
     if
@@ -85,7 +92,7 @@ timeVaryingMappedFixedValuePointPatchField
     {
         fixedValuePointPatchField<Type>::operator==
         (
-            Field<Type>("value", dict, p.size())
+            Field<Type>("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -527,8 +534,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::updateCoeffs()
     // Apply offset to mapped values
     if (offset_.valid())
     {
-        const scalar t = this->db().time().userTimeValue();
-        this->operator==(*this + offset_->value(t));
+        this->operator==(*this + offset_->value(this->db().time().value()));
     }
 
     if (debug)
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index d46382aada..478ca3da4a 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,13 +41,16 @@ waveDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
-    amplitude_(dict.lookup("amplitude")),
-    omega_(dict.lookup<scalar>("omega")),
-    waveNumber_(dict.lookupOrDefault<vector>("waveNumber", Zero)),
+    amplitude_(dict.lookup<vector>("amplitude", dimLength)),
+    omega_(dict.lookup<scalar>("omega", unitRadians/dimTime)),
+    waveNumber_
+    (
+        dict.lookupOrDefault<vector>("waveNumber", dimless/dimLength, Zero)
+    ),
     startRamp_
     (
         dict.found("startRamp")
-      ? Function1<scalar>::New("startRamp", dict)
+      ? Function1<scalar>::New("startRamp", dimless, dimless, dict)
       : autoPtr<Function1<scalar>>
         (
             new Function1s::OneConstant<scalar>("startRamp")
@@ -56,7 +59,7 @@ waveDisplacementPointPatchVectorField
     endRamp_
     (
         dict.found("endRamp")
-      ? Function1<scalar>::New("endRamp", dict)
+      ? Function1<scalar>::New("endRamp", dimless, dimless, dict)
       : autoPtr<Function1<scalar>>
         (
             new Function1s::OneConstant<scalar>("endRamp")
@@ -65,7 +68,7 @@ waveDisplacementPointPatchVectorField
     timeRamp_
     (
         dict.found("timeRamp")
-      ? Function1<scalar>::New("timeRamp", dict)
+      ? Function1<scalar>::New("timeRamp", dimTime, dimless, dict)
       : autoPtr<Function1<scalar>>
         (
             new Function1s::OneConstant<scalar>("timeRamp")
diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 873450cdba..9cab5696d6 100644
--- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -26,7 +26,6 @@ License
 #include "ParticleCollector.H"
 #include "Pstream.H"
 #include "surfaceWriter.H"
-#include "unitConversion.H"
 #include "randomGenerator.H"
 #include "triangle.H"
 #include "cloud.H"
@@ -172,8 +171,8 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
         refDir = normalised(perpendicular(normal_[0]));
     }
 
-    scalar dTheta = 5.0;
-    scalar dThetaSector = 360.0/scalar(nS);
+    scalar dTheta = degToRad(5.0);
+    scalar dThetaSector = degToRad(360.0)/scalar(nS);
     label intervalPerSector = max(1, ceil(dThetaSector/dTheta));
     dTheta = dThetaSector/scalar(intervalPerSector);
 
@@ -190,14 +189,8 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
     faces_.setSize(nFace);
     area_.setSize(nFace);
 
-    coordSys_ = coordinateSystems::cylindrical
-    (
-        "coordSys",
-        origin,
-        normal_[0],
-        refDir,
-        false
-    );
+    coordSys_ =
+        coordinateSystems::cylindrical("coordSys", origin, normal_[0], refDir);
 
     List<label> ptIDs(identityMap(nPointPerRadius));
 
@@ -211,7 +204,7 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
         for (label i = 0; i < nPointPerRadius; i++)
         {
             label pI = i + pointOffset;
-            point pCyl(radius_[radI], degToRad(i*dTheta), 0.0);
+            point pCyl(radius_[radI], i*dTheta, 0.0);
             points_[pI] = coordSys_.globalPosition(pCyl);
         }
     }
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
index 410c0d62f2..0e40ce1f2d 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
@@ -26,7 +26,6 @@ License
 #include "ConeInjection.H"
 #include "Constant.H"
 #include "mathematicalConstants.H"
-#include "unitConversion.H"
 
 using namespace Foam::constant::mathematical;
 
@@ -53,9 +52,9 @@ void Foam::ConeInjection<CloudType>::setInjectionMethod()
         injectionMethod_ = imDisc;
 
         dInner_ =
-            dimensionedScalar("dInner", dimLength, this->coeffDict()).value();
+            this->coeffDict().template lookup<scalar>("dInner", dimLength);
         dOuter_ =
-            dimensionedScalar("dOuter", dimLength, this->coeffDict()).value();
+            this->coeffDict().template lookup<scalar>("dOuter", dimLength);
     }
     else
     {
@@ -82,13 +81,13 @@ void Foam::ConeInjection<CloudType>::setFlowType()
 
         Umag_.reset
         (
-            new Function1s::Dimensioned<scalar>
+            Function1<scalar>::New
             (
                 "Umag",
-                dimTime,
+                this->owner().db().time().userUnits(),
                 dimVelocity,
                 this->coeffDict()
-            )
+            ).ptr()
         );
     }
     else if (flowType == "pressureDrivenVelocity")
@@ -97,13 +96,13 @@ void Foam::ConeInjection<CloudType>::setFlowType()
 
         Pinj_.reset
         (
-            new Function1s::Dimensioned<scalar>
+            Function1<scalar>::New
             (
                 "Pinj",
-                dimTime,
+                this->owner().db().time().userUnits(),
                 dimPressure,
                 this->coeffDict()
-            )
+            ).ptr()
         );
     }
     else if (flowType == "flowRateAndDischarge")
@@ -111,19 +110,19 @@ void Foam::ConeInjection<CloudType>::setFlowType()
         flowType_ = ftFlowRateAndDischarge;
 
         dInner_ =
-            dimensionedScalar("dInner", dimLength, this->coeffDict()).value();
+            this->coeffDict().template lookup<scalar>("dInner", dimLength);
         dOuter_ =
-            dimensionedScalar("dOuter", dimLength, this->coeffDict()).value();
+            this->coeffDict().template lookup<scalar>("dOuter", dimLength);
 
         Cd_.reset
         (
-            new Function1s::Dimensioned<scalar>
+            Function1<scalar>::New
             (
                 "Cd",
-                dimTime,
+                this->owner().db().time().userUnits(),
                 dimless,
                 this->coeffDict()
-            )
+            ).ptr()
         );
     }
     else
@@ -151,20 +150,20 @@ Foam::ConeInjection<CloudType>::ConeInjection
     flowType_(ftConstantVelocity),
     position_
     (
-        new Function1s::Dimensioned<vector>
+        Function1<vector>::New
         (
             "position",
-            dimTime,
+            this->owner().db().time().userUnits(),
             dimLength,
             this->coeffDict()
         )
     ),
     direction_
     (
-        new Function1s::Dimensioned<vector>
+        Function1<vector>::New
         (
             "direction",
-            dimTime,
+            this->owner().db().time().userUnits(),
             dimless,
             this->coeffDict()
         )
@@ -178,21 +177,21 @@ Foam::ConeInjection<CloudType>::ConeInjection
     parcelsPerSecond_(this->readParcelsPerSecond(dict, owner)),
     thetaInner_
     (
-        new Function1s::Dimensioned<scalar>
+        Function1<scalar>::New
         (
             "thetaInner",
-            dimTime,
-            dimless,
+            this->owner().db().time().userUnits(),
+            unitDegrees,
             this->coeffDict()
         )
     ),
     thetaOuter_
     (
-        new Function1s::Dimensioned<scalar>
+        Function1<scalar>::New
         (
             "thetaOuter",
-            dimTime,
-            dimless,
+            this->owner().db().time().userUnits(),
+            unitDegrees,
             this->coeffDict()
         )
     ),
@@ -433,13 +432,10 @@ void Foam::ConeInjection<CloudType>::setProperties
             const vector t2 = normalised(n ^ t1);
             tanVec = t1*cos(beta) + t2*sin(beta);
             theta =
-                degToRad
+                sqrt
                 (
-                    sqrt
-                    (
-                        (1 - frac)*sqr(thetaInner_->value(t))
-                        + frac*sqr(thetaOuter_->value(t))
-                    )
+                    (1 - frac)*sqr(thetaInner_->value(t))
+                  + frac*sqr(thetaOuter_->value(t))
                 );
             break;
         }
@@ -449,11 +445,8 @@ void Foam::ConeInjection<CloudType>::setProperties
             const scalar frac = (2*r - dInner_)/(dOuter_ - dInner_);
             tanVec = normalised(parcel.position(mesh) - position_->value(t));
             theta =
-                degToRad
-                (
-                    (1 - frac)*thetaInner_->value(t)
-                    + frac*thetaOuter_->value(t)
-                );
+                (1 - frac)*thetaInner_->value(t)
+              + frac*thetaOuter_->value(t);
             break;
         }
         default:
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.C
index 1e554f03cd..b1e7c1bd48 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,13 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "InjectionModel.H"
-#include "mathematicalConstants.H"
 #include "meshTools.H"
 #include "volFields.H"
 #include "Scale.H"
 
-using namespace Foam::constant::mathematical;
-
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
 template<class CloudType>
@@ -62,7 +59,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::readMassTotal
         return NaN;
     }
 
-    return dimensionedScalar("massTotal", dimMass, dict).value();
+    return dict.lookup<scalar>("massTotal", dimMass);
 }
 
 
@@ -78,7 +75,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::readDuration
         return vGreat;
     }
 
-    return dimensionedScalar("duration", dimTime, dict).value();
+    return dict.lookup<scalar>("duration", owner.db().time().userUnits());
 }
 
 
@@ -127,20 +124,16 @@ Foam::InjectionModel<CloudType>::readMassFlowRate
     if (owner.solution().steadyState() || haveMassFlowRate)
     {
         return
-            autoPtr<Function1<scalar>>
+            Function1<scalar>::New
             (
-                new Function1s::Dimensioned<scalar>
-                (
-                    "massFlowRate",
-                    dimTime,
-                    dimMass/dimTime,
-                    dict
-                )
+                "massFlowRate",
+                this->owner().db().time().userUnits(),
+                dimMass/dimTime,
+                dict
             );
     }
 
-    const scalar massTotal =
-        dimensionedScalar("massTotal", dimMass, dict).value();
+    const scalar massTotal = dict.lookup<scalar>("massTotal", dimMass);
 
     if (!dict.found("flowRateProfile"))
     {
@@ -157,10 +150,10 @@ Foam::InjectionModel<CloudType>::readMassFlowRate
 
     autoPtr<Function1<scalar>> flowRateProfile
     (
-        new Function1s::Dimensioned<scalar>
+        Function1<scalar>::New
         (
             "flowRateProfile",
-            dimTime,
+            this->owner().db().time().userUnits(),
             dimless,
             dict
         )
@@ -191,15 +184,12 @@ Foam::InjectionModel<CloudType>::readParcelsPerSecond
 )
 {
     return
-        autoPtr<Function1<scalar>>
+        Function1<scalar>::New
         (
-            new Function1s::Dimensioned<scalar>
-            (
-                "parcelsPerSecond",
-                dimTime,
-                dimless/dimTime,
-                dict
-            )
+            "parcelsPerSecond",
+            this->owner().db().time().userUnits(),
+            dimless/dimTime,
+            dict
         );
 }
 
@@ -554,7 +544,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
 
     if (owner.solution().transient())
     {
-        SOI_ = dimensionedScalar("SOI", dimTime, dict).value();
+        SOI_ = dict.lookup<scalar>("SOI", owner.db().time().userUnits());
     }
 }
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.H
index f5102778c2..252aed54d7 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ SourceFiles
 #include "injectionModel.H"
 #include "CloudSubModelBase.H"
 #include "particle.H"
-#include "DimensionedFunction1.H"
+#include "Function1.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index ce89761943..8ba5e7b3c0 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -45,10 +45,10 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     duration_(this->readDuration(dict, owner)),
     concentration_
     (
-        new Function1s::Dimensioned<scalar>
+        Function1<scalar>::New
         (
             "concentration",
-            dimTime,
+            this->owner().db().time().userUnits(),
             dimless,
             this->coeffDict()
         )
@@ -120,7 +120,7 @@ Foam::scalar Foam::PatchFlowRateInjection<CloudType>::flowRate() const
     const scalarField& phip = phi.boundaryField()[patchId_];
 
     scalar flowRateIn = 0.0;
-    if (phi.dimensions() == dimFlux)
+    if (phi.dimensions() == dimVolumetricFlux)
     {
         flowRateIn = max(0.0, -sum(phip));
     }
diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
index 88bb8ebd7d..7e692c7162 100644
--- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
+++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ void Foam::blockEdges::arcEdge::calc(const scalar theta, const vector& axis)
     const vector chord = dp - l*axis;
     const scalar magChord = mag(chord);
 
-    centre_ = pM - l*axis/2 - rM*magChord/2/tan(degToRad(theta)/2);
+    centre_ = pM - l*axis/2 - rM*magChord/2/tan(theta/2);
     axis_ = axis;
-    theta_ = degToRad(theta);
+    theta_ = theta;
     length_ = l;
 }
 
@@ -128,7 +128,7 @@ Foam::blockEdges::arcEdge::arcEdge
     }
     else
     {
-        const scalar theta = readScalar(is);
+        const scalar theta = degToRad(readScalar(is));
         const vector axis(is);
         calc(theta, normalised(axis));
     }
@@ -158,7 +158,7 @@ Foam::scalar Foam::blockEdges::arcEdge::length() const
     const vector r1 = p0_ - centre_;
 
     // Length of a helical segment
-    return degToRad(theta_*sqrt(magSqr(r1) + sqr(length_)));
+    return theta_*sqrt(magSqr(r1) + sqr(length_));
 }
 
 
diff --git a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C
index be58bcb71b..3e7ebe2ae7 100644
--- a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C
+++ b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "searchableSurfacesQueries.H"
 #include "projectCurveEdge.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 #include "pointConstraint.H"
 #include "OBJstream.H"
diff --git a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C
index 8f8bd86ecf..749603b6bc 100644
--- a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C
+++ b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "searchableSurfacesQueries.H"
 #include "projectEdge.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 #include "pointConstraint.H"
 #include "OBJstream.H"
diff --git a/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.C b/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.C
index 66e0f2bb39..b290c86cd9 100644
--- a/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.C
+++ b/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "projectVertex.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 #include "searchableSurfacesQueries.H"
 #include "pointConstraint.H"
diff --git a/src/mesh/extrudeModel/cylindricalRadial/cylindricalRadial.C b/src/mesh/extrudeModel/cylindricalRadial/cylindricalRadial.C
index 3990bd6b21..162811ce82 100644
--- a/src/mesh/extrudeModel/cylindricalRadial/cylindricalRadial.C
+++ b/src/mesh/extrudeModel/cylindricalRadial/cylindricalRadial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,9 +45,9 @@ addToRunTimeSelectionTable(extrudeModel, cylindricalRadial, dictionary);
 cylindricalRadial::cylindricalRadial(const dictionary& dict)
 :
     extrudeModel(typeName, dict),
-    axisPt_(coeffDict_.lookup("axisPt")),
-    axis_(coeffDict_.lookup("axis")),
-    R_(Function1<scalar>::New("R", coeffDict_))
+    axisPt_(coeffDict_.lookup<vector>("axisPt", dimLength)),
+    axis_(coeffDict_.lookup<vector>("axis", dimless)),
+    R_(Function1<scalar>::New("R", dimless, dimLength, coeffDict_))
 {
     axis_ /= mag(axis_);
 }
diff --git a/src/mesh/extrudeModel/sector/sector.C b/src/mesh/extrudeModel/sector/sector.C
index c56cffd5a3..9f94a69d63 100644
--- a/src/mesh/extrudeModel/sector/sector.C
+++ b/src/mesh/extrudeModel/sector/sector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,10 +48,7 @@ sector::sector(const dictionary& dict)
     extrudeModel(typeName, dict),
     axisPt_(coeffDict_.lookup("axisPt")),
     axis_(coeffDict_.lookup("axis")),
-    angle_
-    (
-        degToRad(coeffDict_.lookup<scalar>("angle"))
-    )
+    angle_(coeffDict_.lookup<scalar>("angle", unitDegrees))
 {}
 
 
diff --git a/src/mesh/extrudeModel/sphericalRadial/sphericalRadial.C b/src/mesh/extrudeModel/sphericalRadial/sphericalRadial.C
index 0124c0a447..04d03fb8b2 100644
--- a/src/mesh/extrudeModel/sphericalRadial/sphericalRadial.C
+++ b/src/mesh/extrudeModel/sphericalRadial/sphericalRadial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ addToRunTimeSelectionTable(extrudeModel, sphericalRadial, dictionary);
 sphericalRadial::sphericalRadial(const dictionary& dict)
 :
     extrudeModel(typeName, dict),
-    R_(Function1<scalar>::New("R", coeffDict_))
+    R_(Function1<scalar>::New("R", dimless, dimLength, coeffDict_))
 {}
 
 
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index 4873ba973f..0ef13721e5 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,6 @@ License
 #include "valuePointPatchFields.H"
 #include "PointEdgeWave.H"
 #include "meshRefinement.H"
-#include "unitConversion.H"
 #include "PatchTools.H"
 #include "OBJstream.H"
 #include "pointData.H"
@@ -362,27 +361,28 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
         coeffDict.lookup<label>("nSmoothSurfaceNormals");
 
     //- When is medial axis
-    word angleKey = "minMedialAxisAngle";
-    if (!coeffDict.found(angleKey))
-    {
-        // Backwards compatibility
-        angleKey = "minMedianAxisAngle";
-    }
-    scalar minMedialAxisAngleCos = Foam::cos
-    (
-        degToRad(coeffDict.lookup<scalar>(angleKey))
-    );
+    const scalar minMedialAxisAngleCos =
+        Foam::cos
+        (
+            coeffDict.lookupBackwardsCompatible<scalar>
+            (
+                {"minMedialAxisAngle", "minMedianAxisAngle"},
+                unitDegrees
+            )
+        );
 
     //- Feature angle when to stop adding layers
-    const scalar featureAngle = coeffDict.lookup<scalar>("featureAngle");
+    const scalar featureAngle =
+        coeffDict.lookup<scalar>("featureAngle", unitDegrees);
 
     //- When to slip along wall
     const scalar slipFeatureAngle =
-    (
-        coeffDict.found("slipFeatureAngle")
-      ? coeffDict.lookup<scalar>("slipFeatureAngle")
-      : 0.5*featureAngle
-    );
+        coeffDict.lookupOrDefault
+        (
+            "slipFeatureAngle",
+            unitDegrees,
+            featureAngle/2
+        );
 
     //- Smooth internal normals
     const label nSmoothNormals =
@@ -686,12 +686,9 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                     Info<< typeName
                         << " : Inserting points on patch " << pp.name()
                         << " if angle to nearest layer patch > "
-                        << slipFeatureAngle << " degrees." << endl;
+                        << radToDeg(slipFeatureAngle) << " degrees." << endl;
 
-                    scalar slipFeatureAngleCos = Foam::cos
-                    (
-                        degToRad(slipFeatureAngle)
-                    );
+                    scalar slipFeatureAngleCos = Foam::cos(slipFeatureAngle);
                     pointField pointNormals
                     (
                         PatchTools::pointNormals(mesh(), pp)
@@ -1651,13 +1648,11 @@ void Foam::medialAxisMeshMover::calculateDisplacement
         coeffDict.lookup<scalar>("maxThicknessToMedialRatio");
 
     //- Feature angle when to stop adding layers
-    const scalar featureAngle = coeffDict.lookup<scalar>("featureAngle");
+    const scalar featureAngle =
+        coeffDict.lookup<scalar>("featureAngle", unitDegrees);
 
     //- Stop layer growth where mesh wraps around sharp edge
-    const scalar minCosLayerTermination = Foam::cos
-    (
-        degToRad(0.5*featureAngle)
-    );
+    const scalar minCosLayerTermination = Foam::cos(featureAngle/2);
 
     //- Smoothing wanted patch thickness
     const label nSmoothPatchThickness =
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 9965e63250..56a311b6b1 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -31,7 +31,6 @@ License
 #include "duplicatePoints.H"
 #include "regionSplit.H"
 #include "removeCells.H"
-#include "unitConversion.H"
 #include "OBJstream.H"
 #include "patchFaceOrientation.H"
 #include "PatchEdgeFaceWave.H"
@@ -733,7 +732,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::freeStandingBaffles
             normal2
         );
 
-        const scalar planarAngleCos = Foam::cos(degToRad(planarAngle));
+        const scalar planarAngleCos = Foam::cos(planarAngle);
 
         label filterI = 0;
         forAll(filteredCouples, i)
@@ -771,7 +770,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::freeStandingBaffles
 
         Info<< "freeStandingBaffles : detected "
             << returnReduce(filterI, sumOp<label>())
-            << " planar (within " << planarAngle
+            << " planar (within " << radToDeg(planarAngle)
             << " degrees) free-standing baffles out of "
             << nFiltered
             << nl << endl;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index 801cb15df9..7c73597839 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -35,7 +35,6 @@ License
 #include "searchableSurfaces.H"
 #include "meshCheck.H"
 #include "IOmanip.H"
-#include "unitConversion.H"
 #include "snappySnapDriver.H"
 
 #include "snapParameters.H"
@@ -250,7 +249,7 @@ Foam::Map<Foam::label> Foam::meshRefinement::findEdgeConnectedProblemCells
             nearestRegion[i]
         );
 
-        const scalar angle = degToRad(perpendicularAngle[region]);
+        const scalar angle = perpendicularAngle[region];
 
         if (angle >= 0)
         {
@@ -288,8 +287,7 @@ bool Foam::meshRefinement::isCollapsedFace
 ) const
 {
     // Severe nonorthogonality threshold
-    const scalar severeNonorthogonalityThreshold =
-        ::cos(degToRad(maxNonOrtho));
+    const scalar severeNonorthogonalityThreshold = ::cos(maxNonOrtho);
 
     const vector s = mesh_.faces()[facei].area(points);
     const scalar magS = mag(s);
@@ -623,15 +621,15 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
     if (checkCollapse)
     {
         minArea = motionDict.lookup<scalar>("minArea");
-        maxNonOrtho = motionDict.lookup<scalar>("maxNonOrtho");
+        maxNonOrtho = motionDict.lookup<scalar>("maxNonOrtho", unitDegrees);
 
         Info<< "markFacesOnProblemCells :"
             << " Deleting all-anchor surface cells only if"
             << " snapping them violates mesh quality constraints:" << nl
             << "    snapped/original cell volume < " << volFraction << nl
             << "    face area                    < " << minArea << nl
-            << "    non-orthogonality            > " << maxNonOrtho << nl
-            << endl;
+            << "    non-orthogonality            > " << radToDeg(maxNonOrtho)
+            << nl << endl;
 
         // Construct addressing engine.
         autoPtr<indirectPrimitivePatch> ppPtr
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index de568d2f50..4f02a7bbd9 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2182,7 +2182,7 @@ Foam::labelList Foam::meshRefinement::refineCandidates
         }
 
 
-        const scalar planarCos = Foam::cos(degToRad(planarAngle));
+        const scalar planarCos = Foam::cos(planarAngle);
 
         if
         (
@@ -2192,7 +2192,7 @@ Foam::labelList Foam::meshRefinement::refineCandidates
         )
         {
             Info<< "Specified gap level : " << max(surfaces_.gapLevel())
-                << ", planar angle " << planarAngle << endl;
+                << ", planar angle " << radToDeg(planarAngle) << endl;
 
             const label nGap = markProximityRefinement
             (
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
index bb7310da8b..8f483731ba 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,14 +25,14 @@ License
 
 #include "layerParameters.H"
 #include "polyBoundaryMesh.H"
-#include "unitConversion.H"
 #include "refinementSurfaces.H"
 #include "searchableSurfaces.H"
 #include "medialAxisMeshMover.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::scalar Foam::layerParameters::defaultConcaveAngle = 90;
+const Foam::scalar Foam::layerParameters::defaultConcaveAngle =
+    Foam::degToRad(90);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -125,10 +125,10 @@ Foam::layerParameters::layerParameters
         )
       : mergeFace::ifOnMeshedPatch
     ),
-    featureAngle_(dict.lookup<scalar>("featureAngle")),
+    featureAngle_(dict.lookup<scalar>("featureAngle", unitDegrees)),
     concaveAngle_
     (
-        dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)
+        dict.lookupOrDefault("concaveAngle", unitDegrees, defaultConcaveAngle)
     ),
     nGrow_(dict.lookup<label>("nGrow")),
     maxFaceThicknessRatio_
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
index 8870d545e5..a331bf5eef 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,8 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
         dict.lookupOrDefault
         (
             "planarAngle",
-            dict.lookup<scalar>("resolveFeatureAngle")
+            unitDegrees,
+            dict.lookup<scalar>("resolveFeatureAngle", unitDegrees)
         )
     ),
     nBufferLayers_(dict.lookup<label>("nCellsBetweenLevels")),
@@ -56,15 +57,15 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
         dict.lookupOrDefault<Switch>("handleSnapProblems", true)
     )
 {
-    scalar featAngle(dict.lookup<scalar>("resolveFeatureAngle"));
+    scalar featAngle(dict.lookup<scalar>("resolveFeatureAngle", unitDegrees));
 
-    if (featAngle < 0 || featAngle > 180)
+    if (featAngle < 0 || featAngle > degToRad(180))
     {
         curvature_ = -great;
     }
     else
     {
-        curvature_ = Foam::cos(degToRad(featAngle));
+        curvature_ = Foam::cos(featAngle);
     }
 }
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 91d073a0d6..6b08d44069 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -34,7 +34,6 @@ Description
 #include "removePoints.H"
 #include "pointFields.H"
 #include "meshCheck.H"
-#include "unitConversion.H"
 #include "pointSet.H"
 #include "faceSet.H"
 #include "cellSet.H"
@@ -2795,21 +2794,21 @@ void Foam::snappyLayerDriver::mergePatchFacesUndo
 {
     scalar planarAngle = layerParams.featureAngle();
 
-    scalar minCos = Foam::cos(degToRad(planarAngle));
+    scalar minCos = Foam::cos(planarAngle);
 
-    scalar concaveCos = Foam::cos(degToRad(layerParams.concaveAngle()));
+    scalar concaveCos = Foam::cos(layerParams.concaveAngle());
 
     Info<< nl
         << "Merging all faces of a cell" << nl
         << "---------------------------" << nl
         << "    - which are on the same patch" << nl
-        << "    - which make an angle < " << planarAngle
+        << "    - which make an angle < " << radToDeg(planarAngle)
         << " degrees"
         << nl
         << "      (cos:" << minCos << ')' << nl
         << "    - as long as the resulting face doesn't become concave"
         << " by more than "
-        << layerParams.concaveAngle() << " degrees" << nl
+        << radToDeg(layerParams.concaveAngle()) << " degrees" << nl
         << "      (0=straight, 180=fully concave)" << nl
         << endl;
 
@@ -2989,7 +2988,7 @@ void Foam::snappyLayerDriver::addLayers
         (
             pp,
             meshEdges,
-            Foam::cos(degToRad(layerParams.featureAngle())),
+            Foam::cos(layerParams.featureAngle()),
 
             patchDisp,
             patchNLayers,
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
index 15f3097d18..1ecd4287b5 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ Description
 #include "OBJstream.H"
 #include "meshTools.H"
 #include "PatchTools.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -1169,9 +1168,9 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
                     // on this patch.
                     Info<< "Inserting points on patch " << pp.name()
                         << " if angle to nearest layer patch > "
-                        << featureAngle << " degrees." << endl;
+                        << radToDeg(featureAngle) << " degrees." << endl;
 
-                    scalar featureAngleCos = Foam::cos(degToRad(featureAngle));
+                    scalar featureAngleCos = Foam::cos(featureAngle);
                     pointField pointNormals(PatchTools::pointNormals(mesh, pp));
 
                     forAll(meshPoints, i)
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index dd4c4f76a0..38f9dae070 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,6 @@ License
 #include "refinementFeatures.H"
 #include "refinementRegions.H"
 #include "polyDistributionMap.H"
-#include "unitConversion.H"
 #include "snapParameters.H"
 #include "localPointRegion.H"
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 79d5ec11fd..f9949e7b56 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -41,7 +41,6 @@ Description
 #include "mergePoints.H"
 #include "snapParameters.H"
 #include "refinementSurfaces.H"
-#include "unitConversion.H"
 #include "localPointRegion.H"
 #include "PatchTools.H"
 
@@ -2442,7 +2441,7 @@ void Foam::snappySnapDriver::doSnap
             //    {
             //        detectNearSurfaces
             //        (
-            //            Foam::cos(degToRad(planarAngle)),// planar gaps
+            //            Foam::cos(planarAngle), // planar gaps
             //            pp,
             //            nearestPoint,   // surfacepoint from nearest test
             //            nearestNormal,  // surfacenormal from nearest test
@@ -2666,7 +2665,7 @@ void Foam::snappySnapDriver::doSnap
             {
                 detectNearSurfaces
                 (
-                    Foam::cos(degToRad(planarAngle)),// planar cos for gaps
+                    Foam::cos(planarAngle), // planar cos for gaps
                     pp,
                     nearestPoint,   // surfacepoint from nearest test
                     nearestNormal,  // surfacenormal from nearest test
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 1a438ae8f5..6d270bd826 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 #include "motionSmoother.H"
 #include "refinementSurfaces.H"
 #include "refinementFeatures.H"
-#include "unitConversion.H"
 #include "plane.H"
 #include "featureEdgeMesh.H"
 #include "treeDataPoint.H"
diff --git a/src/meshCheck/checkGeometry.C b/src/meshCheck/checkGeometry.C
index 0ce9f38639..f619c609ae 100644
--- a/src/meshCheck/checkGeometry.C
+++ b/src/meshCheck/checkGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 #include "pointSet.H"
 #include "EdgeMap.H"
 #include "wedgePolyPatch.H"
-#include "unitConversion.H"
 #include "polyMeshTetDecomposition.H"
 
 #include "vtkSurfaceWriter.H"
@@ -937,7 +936,7 @@ Foam::label Foam::meshCheck::checkGeometry
     if (allGeometry)
     {
         faceSet faces(mesh, "concaveFaces", mesh.nFaces()/100 + 1);
-        if (meshCheck::checkFaceAngles(mesh, true, 10, &faces))
+        if (meshCheck::checkFaceAngles(mesh, true, degToRad(10), &faces))
         {
             // noFailedChecks++;
 
diff --git a/src/meshCheck/checkMesh.C b/src/meshCheck/checkMesh.C
index 26a85efe07..df0c6a84ef 100644
--- a/src/meshCheck/checkMesh.C
+++ b/src/meshCheck/checkMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "meshCheck.H"
 #include "IOmanip.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -40,7 +41,7 @@ bool Foam::meshCheck::checkMesh
 {
     const scalar maxNonOrtho
     (
-        dict.lookup<scalar>("maxNonOrtho", true)
+        dict.lookup<scalar>("maxNonOrtho", unitDegrees, true)
     );
     const scalar minVol
     (
@@ -52,7 +53,7 @@ bool Foam::meshCheck::checkMesh
     );
     const scalar maxConcave
     (
-        dict.lookup<scalar>("maxConcave", true)
+        dict.lookup<scalar>("maxConcave", unitDegrees, true)
     );
     const scalar maxIntSkew
     (
@@ -88,7 +89,7 @@ bool Foam::meshCheck::checkMesh
 
     Info<< "Checking faces in error :" << endl;
 
-    if (maxNonOrtho < 180.0-small)
+    if (maxNonOrtho < degToRad(180.0)-small)
     {
         meshCheck::checkFaceOrthogonality
         (
@@ -164,7 +165,7 @@ bool Foam::meshCheck::checkMesh
         nWrongFaces = nNewWrongFaces;
     }
 
-    if (maxConcave < 180.0-small)
+    if (maxConcave < degToRad(180.0)-small)
     {
         meshCheck::checkFaceAngles
         (
@@ -181,7 +182,7 @@ bool Foam::meshCheck::checkMesh
             returnReduce(wrongFaces.size(), sumOp<label>());
 
         Info<< "    faces with concavity > "
-            << setw(3) << maxConcave
+            << setw(3) << radToDeg(maxConcave)
             << " degrees                     : "
             << nNewWrongFaces - nWrongFaces << endl;
 
diff --git a/src/meshCheck/polyMeshCheck/polyMeshCheck.C b/src/meshCheck/polyMeshCheck/polyMeshCheck.C
index f5d4c0c192..92df87ffa0 100644
--- a/src/meshCheck/polyMeshCheck/polyMeshCheck.C
+++ b/src/meshCheck/polyMeshCheck/polyMeshCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -305,8 +305,7 @@ bool Foam::meshCheck::checkFaceOrthogonality
     const scalarField& ortho = tortho.ref();
 
     // Severe nonorthogonality threshold
-    const scalar severeNonorthogonalityThreshold =
-        ::cos(degToRad(nonOrthThreshold));
+    const scalar severeNonorthogonalityThreshold = ::cos(nonOrthThreshold);
 
 
     scalar minDDotS = great;
@@ -375,7 +374,7 @@ bool Foam::meshCheck::checkFaceOrthogonality
         if (severeNonOrth > 0)
         {
             Info<< "   *Number of severely non-orthogonal (> "
-                << nonOrthThreshold << " degrees) faces: "
+                << radToDeg(nonOrthThreshold) << " degrees) faces: "
                 << severeNonOrth << "." << endl;
         }
     }
diff --git a/src/meshCheck/polyMeshCheck/polyMeshCheck.H b/src/meshCheck/polyMeshCheck/polyMeshCheck.H
index 97217dc7b7..319155d8fb 100644
--- a/src/meshCheck/polyMeshCheck/polyMeshCheck.H
+++ b/src/meshCheck/polyMeshCheck/polyMeshCheck.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -221,7 +221,7 @@ namespace meshCheck
     bool checkFaceAngles
     (
         const bool report,
-        const scalar maxDeg,
+        const scalar maxConcave,
         const polyMesh& mesh,
         const vectorField& faceAreas,
         const pointField& p,
diff --git a/src/meshCheck/polyMeshCheck/polyMeshCheckQuality.C b/src/meshCheck/polyMeshCheck/polyMeshCheckQuality.C
index 8189533c08..207352865e 100644
--- a/src/meshCheck/polyMeshCheck/polyMeshCheckQuality.C
+++ b/src/meshCheck/polyMeshCheck/polyMeshCheckQuality.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,6 @@ License
 #include "pyramidPointFaceRef.H"
 #include "tetPointRef.H"
 #include "syncTools.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -215,7 +214,7 @@ bool Foam::meshCheck::checkFaceOrthogonality
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
     // Severe nonorthogonality threshold
-    const scalar severeNonorthogonalityThreshold = ::cos(degToRad(orthWarn));
+    const scalar severeNonorthogonalityThreshold = ::cos(orthWarn);
 
     // Calculate coupled cell centre
     pointField neiCc(mesh.nFaces() - mesh.nInternalFaces());
@@ -1299,7 +1298,7 @@ bool Foam::meshCheck::checkVolRatio
 bool Foam::meshCheck::checkFaceAngles
 (
     const bool report,
-    const scalar maxDeg,
+    const scalar maxConcave,
     const polyMesh& mesh,
     const vectorField& faceAreas,
     const pointField& p,
@@ -1307,14 +1306,14 @@ bool Foam::meshCheck::checkFaceAngles
     labelHashSet* setPtr
 )
 {
-    if (maxDeg < -small || maxDeg > 180+small)
+    if (maxConcave < -small || maxConcave > degToRad(180)+small)
     {
         FatalErrorInFunction
-            << "maxDeg should be [0..180] but is now " << maxDeg
-            << abort(FatalError);
+            << "maxConcave should be [0..180] degrees but is "
+            << radToDeg(maxConcave) << abort(FatalError);
     }
 
-    const scalar maxSin = Foam::sin(degToRad(maxDeg));
+    const scalar maxSin = Foam::sin(maxConcave);
 
     const faceList& fcs = mesh.faces();
 
@@ -1403,8 +1402,8 @@ bool Foam::meshCheck::checkFaceAngles
         }
         else
         {
-            Info<< "All angles in faces are convex or less than "  << maxDeg
-                << " degrees concave.\n" << endl;
+            Info<< "All angles in faces are convex or less than "
+                << radToDeg(maxConcave) << " degrees concave.\n" << endl;
         }
     }
 
@@ -1414,7 +1413,7 @@ bool Foam::meshCheck::checkFaceAngles
         {
             WarningInFunction
                 << nConcave  << " face points with severe concave angle (> "
-                << maxDeg << " deg) found.\n"
+                << radToDeg(maxConcave) << " deg) found.\n"
                 << endl;
         }
 
diff --git a/src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.C b/src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.C
index c9383e84ca..3b7bd80ded 100644
--- a/src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.C
@@ -950,7 +950,7 @@ bool Foam::meshCheck::checkFaceAngles
 (
     const primitiveMesh& mesh,
     const bool report,
-    const scalar maxDeg,
+    const scalar maxConcave,
     labelHashSet* setPtr
 )
 {
@@ -959,14 +959,14 @@ bool Foam::meshCheck::checkFaceAngles
         InfoInFunction << "Checking face angles" << endl;
     }
 
-    if (maxDeg < -small || maxDeg > 180+small)
+    if (maxConcave < -small || maxConcave > degToRad(180)+small)
     {
         FatalErrorInFunction
-            << "maxDeg should be [0..180] but is now " << maxDeg
-            << exit(FatalError);
+            << "maxConcave should be [0..180] degrees but is "
+            << radToDeg(maxConcave) << abort(FatalError);
     }
 
-    const scalar maxSin = Foam::sin(degToRad(maxDeg));
+    const scalar maxSin = Foam::sin(maxConcave);
 
     const pointField& points = mesh.points();
     const vectorField& faceAreas = mesh.faceAreas();
@@ -1002,14 +1002,12 @@ bool Foam::meshCheck::checkFaceAngles
 
     if (nConcave > 0)
     {
-        scalar maxConcaveDegr =
-            radToDeg(Foam::asin(Foam::min(1.0, maxEdgeSin)));
-
         if (report)
         {
             Info<< "   *There are " << nConcave
                 << " faces with concave angles between consecutive"
-                << " edges. Max concave angle = " << maxConcaveDegr
+                << " edges. Max concave angle = "
+                << radToDeg(Foam::asin(Foam::min(1.0, maxEdgeSin)))
                 << " degrees." << endl;
         }
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
index de5cce4e9f..58355d1102 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,8 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "EulerCoordinateRotation.H"
-
-#include "mathematicalConstants.H"
+#include "unitConversions.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -52,23 +51,11 @@ namespace Foam
 
 void Foam::EulerCoordinateRotation::calcTransform
 (
-    const scalar phiAngle,
-    const scalar thetaAngle,
-    const scalar psiAngle,
-    const bool inDegrees
+    const scalar phi,
+    const scalar theta,
+    const scalar psi
 )
 {
-    scalar phi   = phiAngle;
-    scalar theta = thetaAngle;
-    scalar psi   = psiAngle;
-
-    if (inDegrees)
-    {
-        phi   *= constant::mathematical::pi/180.0;
-        theta *= constant::mathematical::pi/180.0;
-        psi   *= constant::mathematical::pi/180.0;
-    }
-
     R_ =
     (
         tensor
@@ -101,14 +88,22 @@ Foam::EulerCoordinateRotation::EulerCoordinateRotation
     R_(sphericalTensor::I),
     Rtr_(R_)
 {
-    vector rotation(dict.lookup("rotation"));
+    const vector rotation(dict.lookup<vector>("rotation", unitDegrees));
+
+    if (dict.found("degrees"))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Angle units are no longer specified with a 'degrees' entry. "
+            << "Instead, the 'rotation' can have its units specified directly."
+            << " e.g., rotation (30 45 60) [deg]."
+            << exit(FatalIOError);
+    }
 
     calcTransform
     (
         rotation.component(vector::X),
         rotation.component(vector::Y),
-        rotation.component(vector::Z),
-        dict.lookupOrDefault("degrees", true)
+        rotation.component(vector::Z)
     );
 }
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
index f30dc338c2..4b87eb321b 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,8 +85,7 @@ class EulerCoordinateRotation
         (
             const scalar phiAngle,
             const scalar thetaAngle,
-            const scalar psiAngle,
-            const bool inDegrees=true
+            const scalar psiAngle
         );
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
index f475a14910..717a4caf10 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,8 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "STARCDCoordinateRotation.H"
-
-#include "mathematicalConstants.H"
+#include "unitConversions.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -52,23 +51,11 @@ namespace Foam
 
 void Foam::STARCDCoordinateRotation::calcTransform
 (
-    const scalar rotZ,
-    const scalar rotX,
-    const scalar rotY,
-    const bool inDegrees
+    const scalar z,
+    const scalar x,
+    const scalar y
 )
 {
-    scalar x = rotX;
-    scalar y = rotY;
-    scalar z = rotZ;
-
-    if (inDegrees)
-    {
-        x *= constant::mathematical::pi/180.0;
-        y *= constant::mathematical::pi/180.0;
-        z *= constant::mathematical::pi/180.0;
-    }
-
     R_ =
     (
         tensor
@@ -101,14 +88,22 @@ Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
     R_(sphericalTensor::I),
     Rtr_(R_)
 {
-    vector rotation(dict.lookup("rotation"));
+    const vector rotation(dict.lookup<vector>("rotation", unitDegrees));
+
+    if (dict.found("degrees"))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Angle units are no longer specified with a 'degrees' entry. "
+            << "Instead, the 'rotation' can have its units specified directly."
+            << " e.g., rotation (30 45 60) [deg]."
+            << exit(FatalIOError);
+    }
 
     calcTransform
     (
         rotation.component(vector::X),
         rotation.component(vector::Y),
-        rotation.component(vector::Z),
-        dict.lookupOrDefault("degrees", true)
+        rotation.component(vector::Z)
     );
 }
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
index 46bd53569a..d5719b64b4 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,10 +80,9 @@ class STARCDCoordinateRotation
         //- Calculate transformation tensor
         void calcTransform
         (
-            const scalar rotZ,
-            const scalar rotX,
-            const scalar rotY,
-            const bool inDegrees=true
+            const scalar z,
+            const scalar x,
+            const scalar y
         );
 
 
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.C b/src/meshTools/coordinateSystems/cylindricalCS.C
index a1d2de0159..00cae1999a 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.C
+++ b/src/meshTools/coordinateSystems/cylindricalCS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,10 +47,7 @@ Foam::vector Foam::coordinateSystems::cylindrical::localToGlobal
     bool translate
 ) const
 {
-    scalar theta
-    (
-        local.y()*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
-    );
+    const scalar theta = local.y();
 
     return coordinateSystem::localToGlobal
     (
@@ -66,11 +63,7 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystems::cylindrical::localToGlobal
     bool translate
 ) const
 {
-    scalarField theta
-    (
-        local.component(vector::Y)
-       *(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
-    );
+    const scalarField theta(local.component(vector::Y));
 
     vectorField lc(local.size());
     lc.replace(vector::X, local.component(vector::X)*cos(theta));
@@ -95,11 +88,7 @@ Foam::vector Foam::coordinateSystems::cylindrical::globalToLocal
     return vector
     (
         sqrt(sqr(lc.x()) + sqr(lc.y())),
-        atan2
-        (
-            lc.y(),
-            lc.x()
-        )*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0),
+        atan2(lc.y(), lc.x()),
         lc.z()
     );
 }
@@ -128,11 +117,7 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystems::cylindrical::globalToLocal
     result.replace
     (
         vector::Y,
-        atan2
-        (
-            lc.component(vector::Y),
-            lc.component(vector::X)
-        )*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0)
+        atan2(lc.component(vector::Y), lc.component(vector::X))
     );
 
     result.replace(vector::Z, lc.component(vector::Z));
@@ -147,12 +132,10 @@ Foam::coordinateSystems::cylindrical::cylindrical
 (
     const word& name,
     const point& origin,
-    const coordinateRotation& cr,
-    const bool inDegrees
+    const coordinateRotation& cr
 )
 :
-    coordinateSystem(name, origin, cr),
-    inDegrees_(inDegrees)
+    coordinateSystem(name, origin, cr)
 {}
 
 
@@ -161,12 +144,10 @@ Foam::coordinateSystems::cylindrical::cylindrical
     const word& name,
     const point& origin,
     const vector& axis,
-    const vector& dirn,
-    const bool inDegrees
+    const vector& dirn
 )
 :
-    coordinateSystem(name, origin, axis, dirn),
-    inDegrees_(inDegrees)
+    coordinateSystem(name, origin, axis, dirn)
 {}
 
 
@@ -176,8 +157,7 @@ Foam::coordinateSystems::cylindrical::cylindrical
     const dictionary& dict
 )
 :
-    coordinateSystem(name, dict),
-    inDegrees_(dict.lookupOrDefault("degrees", true))
+    coordinateSystem(name, dict)
 {}
 
 
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.H b/src/meshTools/coordinateSystems/cylindricalCS.H
index c2b2867911..908523eb39 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.H
+++ b/src/meshTools/coordinateSystems/cylindricalCS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,15 +52,8 @@ class cylindrical
 :
     public coordinateSystem
 {
-    // Private Data members
-
-        //- Are angles in degrees? (default = true)
-        bool inDegrees_;
-
-
     // Private Member Functions
 
-
         //- Convert from local coordinate system to the global Cartesian system
         //  with optional translation for the origin
         virtual vector localToGlobal(const vector&, bool translate) const;
@@ -99,8 +92,7 @@ public:
         (
             const word& name,
             const point& origin,
-            const coordinateRotation&,
-            const bool inDegrees=true
+            const coordinateRotation&
         );
 
         //- Construct from origin and 2 axes
@@ -109,8 +101,7 @@ public:
             const word& name,
             const point& origin,
             const vector& axis,
-            const vector& dirn,
-            const bool inDegrees=true
+            const vector& dirn
         );
 
         //- Construct from dictionary and name
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
index b5a2dcac2b..03acf21280 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "extendedEdgeMesh.H"
 #include "ListListOps.H"
-#include "unitConversion.H"
 #include "PackedBoolList.H"
 #include "PatchTools.H"
 #include "searchableBox.H"
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
index dd1a374afd..44c98abcee 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "extendedFeatureEdgeMesh.H"
 #include "ListListOps.H"
-#include "unitConversion.H"
 #include "PackedBoolList.H"
 #include "PatchTools.H"
 #include "searchableBox.H"
diff --git a/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C b/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C
index bf2c4b5aac..a3be0dc991 100644
--- a/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C
+++ b/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C
@@ -25,6 +25,7 @@ License
 
 #include "intersectionPatchToPatch.H"
 #include "triIntersect.H"
+#include "unitConversion.H"
 #include "vtkWritePolyData.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -737,7 +738,7 @@ Foam::label Foam::patchToPatches::intersection::finalise
         scalarField srcOpenness(srcPatch.size());
         scalarField srcError(srcPatch.size());
         scalarField srcDepth(srcPatch.size());
-        scalarField srcAngle(srcPatch.size());
+        scalarField srcAngleDeg(srcPatch.size());
         forAll(srcPatch, srcFacei)
         {
             const vector& a = srcPatch.faceAreas()[srcFacei];
@@ -787,7 +788,7 @@ Foam::label Foam::patchToPatches::intersection::finalise
 
             const vector aHat = normalised(a);
             const vector aOppHat = normalised(a - Cpl.area + Cpl.nbr.area);
-            srcAngle[srcFacei] =
+            srcAngleDeg[srcFacei] =
                 radToDeg(acos(min(max(aHat & aOppHat, -1), +1)));
             srcOpenness[srcFacei] = mag(projectionA - Cpl.area)/magA;
             srcError[srcFacei] = mag(srcErrorParts_[srcFacei].area)/magA;
@@ -805,10 +806,10 @@ Foam::label Foam::patchToPatches::intersection::finalise
             << gMax(tgtCoverage_) << endl
             << indent << "Source average openness/error/depth/angle = "
             << gAverage(srcOpenness) << '/' << gAverage(srcError) << '/'
-            << gAverage(srcDepth) << '/' << gAverage(srcAngle) << endl
+            << gAverage(srcDepth) << '/' << gAverage(srcAngleDeg) << endl
             << indent << "Source max openness/error/depth/angle = "
             << gMax(srcOpenness) << '/' << gMax(srcError) << '/'
-            << gMax(srcDepth) << '/' << gMax(srcAngle) << endl;
+            << gMax(srcDepth) << '/' << gMax(srcAngleDeg) << endl;
 
         if (debug)
         {
@@ -834,7 +835,7 @@ Foam::label Foam::patchToPatches::intersection::finalise
                 "openness", false, srcOpenness,
                 "error", false, srcError,
                 "depth", false, srcDepth,
-                "angle", false, srcAngle,
+                "angle", false, srcAngleDeg,
                 "normals", true, srcPointNormals
             );
 
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C
index 58a6e9308d..8a7a1d7807 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,6 @@ License
 #include "triSurfaceFields.H"
 #include "meshTools.H"
 #include "Time.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -209,12 +208,12 @@ Foam::triSurfaceMesh::extractCloseness
 {
     const scalar internalToleranceCosAngle
     (
-        cos(degToRad(180 - internalAngleTolerance))
+        cos(degToRad(180) - internalAngleTolerance)
     );
 
     const scalar externalToleranceCosAngle
     (
-        cos(degToRad(180 - externalAngleTolerance))
+        cos(degToRad(180) - externalAngleTolerance)
     );
 
     const Time& runTime = objectRegistry::time();
@@ -305,12 +304,12 @@ Foam::triSurfaceMesh::extractPointCloseness
 {
     const scalar internalToleranceCosAngle
     (
-        cos(degToRad(180 - internalAngleTolerance))
+        cos(degToRad(180) - internalAngleTolerance)
     );
 
     const scalar externalToleranceCosAngle
     (
-        cos(degToRad(180 - externalAngleTolerance))
+        cos(degToRad(180) - externalAngleTolerance)
     );
 
     const Time& runTime = objectRegistry::time();
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
index fa16a3c0c3..26f8221879 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
@@ -66,6 +66,7 @@ SourceFiles
 #include "triSurfaceRegionSearch.H"
 #include "triSurfaceFieldsFwd.H"
 #include "pointIndexHitList.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -330,16 +331,16 @@ public:
             //  internal and external closeness of regions of the surface
             Pair<tmp<triSurfaceScalarField>> extractCloseness
             (
-                const scalar internalAngleTolerance = 80,
-                const scalar externalAngleTolerance = 80
+                const scalar internalAngleTolerance = degToRad(80),
+                const scalar externalAngleTolerance = degToRad(80)
             ) const;
 
             //- Return a pair of triSurfaceScalarPointFields representing the
             //  internal and external closeness of regions of the surface
             Pair<tmp<triSurfacePointScalarField>> extractPointCloseness
             (
-                const scalar internalAngleTolerance = 80,
-                const scalar externalAngleTolerance = 80
+                const scalar internalAngleTolerance = degToRad(80),
+                const scalar externalAngleTolerance = degToRad(80)
             ) const;
 
 
diff --git a/src/meshTools/triIntersect/triIntersect.C b/src/meshTools/triIntersect/triIntersect.C
index 56fd66a523..00f5d1c82f 100644
--- a/src/meshTools/triIntersect/triIntersect.C
+++ b/src/meshTools/triIntersect/triIntersect.C
@@ -26,7 +26,7 @@ License
 #include "triIntersect.H"
 #include "boundBox.H"
 #include "cubicEqn.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "OFstream.H"
 #include "tensor2D.H"
 #include "vtkWritePolyData.H"
diff --git a/src/meshTools/triIntersect/triIntersect.H b/src/meshTools/triIntersect/triIntersect.H
index 40a7ab0657..47b4ef31cb 100644
--- a/src/meshTools/triIntersect/triIntersect.H
+++ b/src/meshTools/triIntersect/triIntersect.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,6 @@ SourceFiles
 #include "primitivePatch.H"
 #include "triFace.H"
 #include "triIntersectLocation.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 6dcf4043d4..8a2006720f 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,7 +173,7 @@ void Foam::surfaceFeatures::setFromStatus
         }
     }
 
-    const scalar minCos = Foam::cos(degToRad(180.0 - includedAngle));
+    const scalar minCos = Foam::cos(degToRad(180) - includedAngle);
 
     calcFeatPoints(edgeStat, minCos);
 }
@@ -676,7 +676,7 @@ void Foam::surfaceFeatures::findFeatures
     const bool geometricTestOnly
 )
 {
-    scalar minCos = Foam::cos(degToRad(180.0 - includedAngle));
+    scalar minCos = Foam::cos(degToRad(180) - includedAngle);
 
     // Per edge whether is feature edge.
     List<edgeStatus> edgeStat(surf_.nEdges(), NONE);
@@ -831,7 +831,6 @@ Foam::labelList Foam::surfaceFeatures::trimFeatures
 
 void Foam::surfaceFeatures::writeDict(Ostream& writeFile) const
 {
-
     dictionary featInfoDict;
     featInfoDict.add("externalStart", externalStart_);
     featInfoDict.add("internalStart", internalStart_);
@@ -1624,7 +1623,7 @@ Foam::surfaceFeatures::edgeStatus Foam::checkNonManifoldEdge
 
         if (includedAngle >= 0)
         {
-            scalar minCos = Foam::cos(degToRad(180.0 - includedAngle));
+            scalar minCos = Foam::cos(degToRad(180) - includedAngle);
 
             forAll(eFaces, i)
             {
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
index 5e84621d97..9a9ebbadaa 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,10 +32,10 @@ Description
         externalStart_ .. internalStart_-1  : external edges
         internalStart_ .. size-1            : internal edges
 
-    NOTE: angle is included angle, not feature angle and is in degrees.
-    The included angle is the smallest angle between two planes. For coplanar
-    faces it is 180, for straight angles it is 90. To pick up straight edges
-    only use included angle of 91 degrees
+    NOTE: angle is included angle, not feature angle. The included angle is the
+    smallest angle between two planes. For coplanar faces it is 180 degrees,
+    for straight angles it is 90 degrees. To pick up straight edges only use
+    included angle of 91 degrees.
 
 SourceFiles
     surfaceFeatures.C
diff --git a/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index 21264fce85..a5329bac98 100644
--- a/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -229,13 +229,17 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
 
     if (type == "fixedValue")
     {
-        fld = vectorField("value", dict, meshPoints.size());
+        fld = vectorField("value", dimLength, dict, meshPoints.size());
     }
     else if (type == "timeVaryingUniformFixedValue")
     {
-        Function1s::Table<vector> timeSeries(word::null, dict);
-
-        fld = timeSeries.value(mesh().time().userTimeValue());
+        fld =
+            Function1s::Table<vector>
+            (
+                word::null,
+                {mesh().time().userUnits(), dimLength},
+                dict
+            ).value(mesh().time().value());
     }
     else if (type == "slip")
     {
@@ -245,6 +249,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
                 << "FaceZone:" << fz.name()
                 << exit(FatalError);
         }
+
         // Use field set by previous bc
         fld = vectorField(patchDisp[patchi - 1], meshPoints);
     }
diff --git a/src/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C b/src/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C
index 020b4fb5a0..e3361fb009 100644
--- a/src/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C
+++ b/src/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,10 +52,19 @@ displacementLinearMotionMotionSolver
 )
 :
     points0MotionSolver(name, mesh, dict, typeName),
-    axis_(normalised(vector(coeffDict().lookup("axis")))),
-    xFixed_(coeffDict().lookup<scalar>("xFixed")),
-    xMoving_(coeffDict().lookup<scalar>("xMoving")),
-    displacement_(Function1<scalar>::New("displacement", coeffDict()))
+    axis_(normalised(coeffDict().lookup<vector>("axis", dimless))),
+    xFixed_(coeffDict().lookup<scalar>("xFixed", dimLength)),
+    xMoving_(coeffDict().lookup<scalar>("xMoving", dimLength)),
+    displacement_
+    (
+        Function1<scalar>::New
+        (
+            "displacement",
+            mesh.time().userUnits(),
+            dimLength,
+            coeffDict()
+        )
+    )
 {}
 
 
@@ -74,9 +83,7 @@ Foam::displacementLinearMotionMotionSolver::curPoints() const
     tmp<pointField> tcurPoints(new pointField(points0()));
     pointField& curPoints = tcurPoints.ref();
 
-    const scalar t = mesh().time().userTimeValue();
-
-    const scalar displacement = displacement_->value(t);
+    const scalar displacement = displacement_->value(mesh().time().value());
 
     forAll(curPoints, i)
     {
diff --git a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
index 9ba6dfb5ee..d2ac40ce0b 100644
--- a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
+++ b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "axisRotationMotion.H"
 #include "addToRunTimeSelectionTable.H"
-#include "unitConversion.H"
 
 using namespace Foam::constant::mathematical;
 
@@ -75,16 +74,9 @@ Foam::solidBodyMotionFunctions::axisRotationMotion::transformation() const
 
     if (t > small)
     {
-        // Rotational position (in radians)
-        const vector omega
-        (
-            t*degToRad(radialVelocity_.x()),
-            t*degToRad(radialVelocity_.y()),
-            t*degToRad(radialVelocity_.z())
-        );
-
-        const scalar magOmega = mag(omega);
-        const quaternion R(omega/magOmega, magOmega);
+        const vector theta(t*omega_);
+        const scalar magTheta = mag(theta);
+        const quaternion R(theta/magTheta, magTheta);
         const septernion TR(septernion(-origin_)*R*septernion(origin_));
 
         DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
@@ -105,8 +97,8 @@ bool Foam::solidBodyMotionFunctions::axisRotationMotion::read
 {
     solidBodyMotionFunction::read(SBMFCoeffs);
 
-    SBMFCoeffs_.lookup("origin") >> origin_;
-    SBMFCoeffs_.lookup("radialVelocity") >> radialVelocity_;
+    origin_ = SBMFCoeffs_.lookup<vector>("origin", dimLength);
+    omega_ = SBMFCoeffs_.lookup<vector>("omega", unitRadians/dimTime);
 
     return true;
 }
diff --git a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
index 201650e0f1..fb2a272e26 100644
--- a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
+++ b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ Class
 
 Description
     Constant velocity rotation around CoG. Similar to rotatingMotion but
-    motion specified as rotation vector.
+    motion specified as an angular velocity vector.
 
 SourceFiles
     axisRotationMotion.C
@@ -60,8 +60,8 @@ class axisRotationMotion
         //- Origin
         point origin_;
 
-        //- Rotational velocity (deg/s)
-        vector radialVelocity_;
+        //- Angular velocity
+        vector omega_;
 
 
 public:
diff --git a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
index 161fa64b2b..81ed2599c1 100644
--- a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
+++ b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
@@ -57,7 +57,7 @@ Foam::solidBodyMotionFunctions::rotatingMotion::rotatingMotion
     solidBodyMotionFunction(SBMFCoeffs, runTime),
     origin_(SBMFCoeffs_.lookup("origin")),
     axis_(SBMFCoeffs_.lookup("axis")),
-    omega_(new Function1s::omega(SBMFCoeffs_))
+    omega_(new Function1s::omega(runTime, SBMFCoeffs_))
 {}
 
 
@@ -72,15 +72,14 @@ Foam::solidBodyMotionFunctions::rotatingMotion::~rotatingMotion()
 Foam::septernion
 Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const
 {
-    const scalar t = time_.value();
-
     // Rotation around axis
-    const scalar angle = omega_->integral(0, t);
+    const scalar angle = omega_->integral(0, time_.value());
 
     const quaternion R(axis_, angle);
     const septernion TR(septernion(-origin_)*R*septernion(origin_));
 
-    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction
+        << "Time = " << time_.value() << " transformation: " << TR << endl;
 
     return TR;
 }
@@ -93,7 +92,7 @@ bool Foam::solidBodyMotionFunctions::rotatingMotion::read
 {
     solidBodyMotionFunction::read(SBMFCoeffs);
 
-    omega_.reset(new Function1s::omega(SBMFCoeffs));
+    omega_.reset(new Function1s::omega(time_, SBMFCoeffs));
 
     return true;
 }
diff --git a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C
index c08b52c862..3282ee44b6 100644
--- a/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C
+++ b/src/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,10 +144,15 @@ bool Foam::solidBodyMotionFunctions::sixDoFMotion::read
 {
     solidBodyMotionFunction::read(SBMFCoeffs);
 
-    translationRotation_ = Function1<translationRotationVectors>::New
+    translationRotation_.reset
     (
-        "translationRotation",
-        SBMFCoeffs_
+        Function1<translationRotationVectors>::New
+        (
+            "translationRotation",
+            time_.userUnits(),
+            unitNone,
+            SBMFCoeffs_
+        ).ptr()
     );
 
     SBMFCoeffs_.lookup("CofG") >> CofG_;
diff --git a/src/multiphaseModels/multiphaseProperties/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/multiphaseModels/multiphaseProperties/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 843c227d82..e513f293fb 100644
--- a/src/multiphaseModels/multiphaseProperties/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/multiphaseModels/multiphaseProperties/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,11 +115,11 @@ contactAngleProperties::contactAngleProperties
 Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField::
 contactAngleProperties::contactAngleProperties(const dictionary& dict)
 :
-    theta0_(dict.lookup<scalar>("theta0")),
+    theta0_(dict.lookup<scalar>("theta0", unitDegrees)),
     dynamic_(dict.found("uTheta")),
-    uTheta_(dynamic_ ? dict.lookup<scalar>("uTheta") : NaN),
-    thetaA_(dynamic_ ? dict.lookup<scalar>("thetaA") : NaN),
-    thetaR_(dynamic_ ? dict.lookup<scalar>("thetaR") : NaN)
+    uTheta_(dynamic_ ? dict.lookup<scalar>("uTheta", dimVelocity) : NaN),
+    thetaA_(dynamic_ ? dict.lookup<scalar>("thetaA", unitDegrees) : NaN),
+    thetaR_(dynamic_ ? dict.lookup<scalar>("thetaR", unitDegrees) : NaN)
 {}
 
 
@@ -155,14 +155,14 @@ const
         dynamic()
       ? contactAngleProperties
         (
-            180 - theta0_,
+            degToRad(180) - theta0_,
             uTheta_,
-            180 - thetaA_,
-            180 - thetaR_
+            degToRad(180) - thetaA_,
+            degToRad(180) - thetaR_
         )
       : contactAngleProperties
         (
-            180 - theta0_
+            degToRad(180) - theta0_
         );
 }
 
@@ -171,12 +171,12 @@ void
 Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField::
 contactAngleProperties::write(Ostream& os) const
 {
-    writeEntry(os, "theta0", theta0_);
+    writeEntry(os, "theta0", unitDegrees, theta0_);
     if (dynamic())
     {
-        writeEntry(os, "uTheta", uTheta_);
-        writeEntry(os, "thetaA", thetaA_);
-        writeEntry(os, "thetaR", thetaR_);
+        writeEntry(os, "uTheta", dimVelocity, uTheta_);
+        writeEntry(os, "thetaA", unitDegrees, thetaA_);
+        writeEntry(os, "thetaR", unitDegrees, thetaR_);
     }
 }
 
@@ -190,7 +190,7 @@ contactAngleProperties::operator==
 {
     if (dynamic() != thetaProps.dynamic()) return false;
 
-    static const scalar thetaTol = 180*rootSmall;
+    static const scalar thetaTol = degToRad(180)*rootSmall;
     static const scalar uThetaTol = rootSmall;
 
     return
diff --git a/src/multiphaseModels/multiphaseProperties/correctContactAngle/correctContactAngle.C b/src/multiphaseModels/multiphaseProperties/correctContactAngle/correctContactAngle.C
index 3bc404ed50..b34934fcc2 100644
--- a/src/multiphaseModels/multiphaseProperties/correctContactAngle/correctContactAngle.C
+++ b/src/multiphaseModels/multiphaseProperties/correctContactAngle/correctContactAngle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "correctContactAngle.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -110,15 +109,11 @@ void Foam::correctContactAngle
             vectorField& nHatp = nHatbf[patchi];
 
             // Calculate the contact angle
-            scalarField theta(np.size(), degToRad(tp.theta0()));
+            scalarField theta(np.size(), tp.theta0());
 
             // Calculate the dynamic contact angle if required
             if (tp.dynamic())
             {
-                const scalar uTheta = tp.uTheta();
-                const scalar thetaA = degToRad(tp.thetaA());
-                const scalar thetaR = degToRad(tp.thetaR());
-
                 // Calculated the component of the velocity parallel to the wall
                 vectorField Uwall
                 (
@@ -134,7 +129,7 @@ void Foam::correctContactAngle
                 // the interface
                 const scalarField uwall(nWall & Uwall);
 
-                theta += (thetaA - thetaR)*tanh(uwall/uTheta);
+                theta += (tp.thetaA() - tp.thetaR())*tanh(uwall/tp.uTheta());
             }
 
             // Reset nHatp to correspond to the contact angle
diff --git a/src/physicalProperties/viscosityModels/constant/constantViscosityModel.C b/src/physicalProperties/viscosityModels/constant/constantViscosityModel.C
index 81fb9c80a0..4933cf5153 100644
--- a/src/physicalProperties/viscosityModels/constant/constantViscosityModel.C
+++ b/src/physicalProperties/viscosityModels/constant/constantViscosityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ Foam::viscosityModels::constant::constant
 )
 :
     viscosityModel(mesh, group),
-    nu0_("nu", dimViscosity, *this),
+    nu0_("nu", dimKinematicViscosity, *this),
     nu_
     (
         IOobject
diff --git a/src/polyTopoChange/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/polyTopoChange/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index f3e29e91e1..77f2d8c135 100644
--- a/src/polyTopoChange/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/polyTopoChange/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,11 +181,7 @@ Foam::undoableMeshCutter::undoableMeshCutter
     meshCutter(mesh),
     undoable_(undoable),
     liveSplitCells_(mesh.nCells()/100 + 100),
-    faceRemover_
-    (
-        mesh,
-        Foam::cos(degToRad(30.0))
-    )
+    faceRemover_(mesh, Foam::cos(degToRad(30.0)))
 {}
 
 
diff --git a/src/polyTopoChange/polyMeshFilter/polyMeshFilter.C b/src/polyTopoChange/polyMeshFilter/polyMeshFilter.C
index facd481f97..7a0b49422d 100644
--- a/src/polyTopoChange/polyMeshFilter/polyMeshFilter.C
+++ b/src/polyTopoChange/polyMeshFilter/polyMeshFilter.C
@@ -26,7 +26,6 @@ License
 #include "polyMeshFilter.H"
 #include "polyMesh.H"
 #include "fvMesh.H"
-#include "unitConversion.H"
 #include "edgeCollapser.H"
 #include "syncTools.H"
 #include "polyTopoChange.H"
diff --git a/src/polyTopoChange/polyMeshFilter/polyMeshFilterSettings.C b/src/polyTopoChange/polyMeshFilter/polyMeshFilterSettings.C
index f9406852ff..84e3389ce7 100644
--- a/src/polyTopoChange/polyMeshFilter/polyMeshFilterSettings.C
+++ b/src/polyTopoChange/polyMeshFilter/polyMeshFilterSettings.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,9 +43,10 @@ Foam::polyMeshFilterSettings::polyMeshFilterSettings(const dictionary& dict)
     (
         ::cos
         (
-            degToRad
+            collapseEdgesCoeffDict_.lookup<scalar>
             (
-                collapseEdgesCoeffDict_.lookup<scalar>("maximumMergeAngle")
+                "maximumMergeAngle",
+                unitDegrees
             )
         )
     ),
diff --git a/src/radiationModels/absorptionEmissionModels/greyMean/greyMean.C b/src/radiationModels/absorptionEmissionModels/greyMean/greyMean.C
index afbe3b3342..dae57397ee 100644
--- a/src/radiationModels/absorptionEmissionModels/greyMean/greyMean.C
+++ b/src/radiationModels/absorptionEmissionModels/greyMean/greyMean.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "greyMean.H"
 #include "addToRunTimeSelectionTable.H"
-#include "unitConversion.H"
 #include "extrapolatedCalculatedFvPatchFields.H"
 #include "fluidMulticomponentThermo.H"
 
@@ -200,6 +199,8 @@ Foam::radiationModels::absorptionEmissionModels::greyMean::aCont
 
     scalarField& a = ta.ref().primitiveFieldRef();
 
+    const unitConversion& unitAtm = units()["atm"];
+
     forAll(a, celli)
     {
         forAllConstIter(HashTable<label>, speciesNames_, iter)
@@ -213,8 +214,9 @@ Foam::radiationModels::absorptionEmissionModels::greyMean::aCont
                     mesh_.lookupObject<volScalarField>("ft");
 
                 const List<scalar>& Ynft = lookUpTablePtr_().lookUp(ft[celli]);
+
                 // moles x pressure [atm]
-                Xipi = Ynft[specieIndex_[n]]*paToAtm(p[celli]);
+                Xipi = unitAtm.toUser(Ynft[specieIndex_[n]]*p[celli]);
             }
             else
             {
@@ -229,7 +231,7 @@ Foam::radiationModels::absorptionEmissionModels::greyMean::aCont
                 const scalar Xk =
                     mcThermo.Y(index)[celli]/(mcThermo.WiValue(index)*invWt);
 
-                Xipi = Xk*paToAtm(p[celli]);
+                Xipi = unitAtm.toUser(Xk*p[celli]);
             }
 
             const absorptionCoeffs::coeffArray& b = coeffs_[n].coeffs(T[celli]);
diff --git a/src/radiationModels/absorptionEmissionModels/wideBand/wideBand.C b/src/radiationModels/absorptionEmissionModels/wideBand/wideBand.C
index cf9c105cbf..f36f551153 100644
--- a/src/radiationModels/absorptionEmissionModels/wideBand/wideBand.C
+++ b/src/radiationModels/absorptionEmissionModels/wideBand/wideBand.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "wideBand.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fluidMulticomponentThermo.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -220,6 +219,8 @@ Foam::radiationModels::absorptionEmissionModels::wideBand::aCont
 
     scalarField& a = ta.ref().primitiveFieldRef();
 
+    const unitConversion& unitAtm = units()["atm"];
+
     forAll(a, celli)
     {
         forAllConstIter(HashTable<label>, speciesNames_, iter)
@@ -234,7 +235,7 @@ Foam::radiationModels::absorptionEmissionModels::wideBand::aCont
                 const List<scalar>& Ynft = lookUpTablePtr_().lookUp(ft[celli]);
 
                 // moles*pressure [atm]
-                Xipi = Ynft[specieIndex_[n]]*paToAtm(p[celli]);
+                Xipi = unitAtm.toUser(Ynft[specieIndex_[n]]*p[celli]);
             }
             else
             {
@@ -249,7 +250,7 @@ Foam::radiationModels::absorptionEmissionModels::wideBand::aCont
                 const scalar Xk =
                     mcThermo.Y(index)[celli]/(mcThermo.WiValue(index)*invWt);
 
-                Xipi = Xk*paToAtm(p[celli]);
+                Xipi = unitAtm.toUser(Xk*p[celli]);
             }
 
             scalar Ti = T[celli];
diff --git a/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
index b75195f762..5d082b4074 100644
--- a/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
+++ b/src/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
 {
     if (dict.found("value"))
     {
-        refValue() = scalarField("value", dict, p.size());
+        refValue() = scalarField("value", iF.dimensions(), dict, p.size());
     }
     else
     {
diff --git a/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
index 29f953d39f..e2d1928da2 100644
--- a/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
+++ b/src/radiationModels/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF, dict, false),
     radiationCoupledBase(p, dict),
-    Trad_("Trad", dict, p.size())
+    Trad_("Trad", dimTemperature, dict, p.size())
 {
     // refValue updated on each call to updateCoeffs()
     refValue() = 4.0*constant::physicoChemical::sigma.value()*pow4(Trad_);
diff --git a/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index bcf39913af..689d9b98cb 100644
--- a/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,13 +50,22 @@ greyDiffusiveRadiationMixedFvPatchScalarField
 {
     if (dict.found("refValue"))
     {
+        refValue() = scalarField("refValue", iF.dimensions(), dict, p.size());
+        refGrad() =
+            scalarField
+            (
+                "refGradient",
+                iF.dimensions()/dimLength,
+                dict,
+                p.size()
+            );
+        valueFraction() =
+            scalarField("valueFraction", unitFraction, dict, p.size());
+
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index aa0d8b7fb9..f4b46e58f6 100644
--- a/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,6 @@ License
 #include "fieldMapper.H"
 #include "volFields.H"
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::greyDiffusiveViewFactorFixedValueFvPatchScalarField::
@@ -41,15 +40,14 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
 :
     fixedValueFvPatchScalarField(p, iF, dict, false),
     radiationCoupledBase(p, dict),
-    qro_("qro", dict, p.size())
+    qro_("qro", dimPower/dimArea, dict, p.size())
 {
     if (dict.found("value"))
     {
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
-
     }
     else
     {
diff --git a/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C b/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
index fe4f2bc7e6..bd2c5c8c1e 100644
--- a/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
+++ b/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,8 @@ Foam::radiationCoupledBase::radiationCoupledBase
 
         case LOOKUP:
         {
-            emissivity_ = scalarField("emissivity", dict, patch_.size());
+            emissivity_ =
+                scalarField("emissivity", unitFraction, dict, patch_.size());
             break;
         }
     }
diff --git a/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index d66349eb23..505521da32 100644
--- a/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,13 +51,22 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField
 {
     if (dict.found("value"))
     {
+        refValue() = scalarField("refValue", iF.dimensions(), dict, p.size());
+        refGrad() =
+            scalarField
+            (
+                "refGradient",
+                iF.dimensions()/dimLength,
+                dict,
+                p.size()
+            );
+        valueFraction() =
+            scalarField("valueFraction", unitFraction, dict, p.size());
+
         fvPatchScalarField::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/radiationModels/radiationModels/P1/P1.C b/src/radiationModels/radiationModels/P1/P1.C
index 18422e0185..9bc94450ea 100644
--- a/src/radiationModels/radiationModels/P1/P1.C
+++ b/src/radiationModels/radiationModels/P1/P1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,7 +237,7 @@ void Foam::radiationModels::P1::calculate()
         fvm::laplacian(gamma, G_)
       - fvm::Sp(a_, G_)
      ==
-      - 4.0*(e_*physicoChemical::sigma*pow4(T_) ) - E_
+      - 4*e_*physicoChemical::sigma*pow4(T_) - E_
     );
 
     volScalarField::Boundary& qrBf = qr_.boundaryFieldRef();
diff --git a/src/rigidBodyMotion/rigidBodyDynamics/joints/function/function.C b/src/rigidBodyMotion/rigidBodyDynamics/joints/function/function.C
index 47f99403a3..0476cd25c5 100644
--- a/src/rigidBodyMotion/rigidBodyDynamics/joints/function/function.C
+++ b/src/rigidBodyMotion/rigidBodyDynamics/joints/function/function.C
@@ -57,7 +57,7 @@ Foam::RBD::joints::function::function
 )
 :
     joint(model, 0),
-    f_(Function1<scalar>::New("function", dict)),
+    f_(Function1<scalar>::New("function", unitNone, unitNone, dict)),
     delta_(dict.lookupOrDefault<scalar>("delta", rootSmall))
 {}
 
diff --git a/src/rigidBodyMotion/rigidBodyDynamics/joints/functionDot/functionDot.C b/src/rigidBodyMotion/rigidBodyDynamics/joints/functionDot/functionDot.C
index 77672f8d9d..5653e17f3e 100644
--- a/src/rigidBodyMotion/rigidBodyDynamics/joints/functionDot/functionDot.C
+++ b/src/rigidBodyMotion/rigidBodyDynamics/joints/functionDot/functionDot.C
@@ -57,7 +57,7 @@ Foam::RBD::joints::functionDot::functionDot
 )
 :
     joint(model, 0),
-    f_(Function1<scalar>::New("function", dict)),
+    f_(Function1<scalar>::New("function", unitNone, unitNone, dict)),
     delta_(dict.lookupOrDefault<scalar>("delta", rootSmall))
 {}
 
diff --git a/src/rigidBodyMotion/rigidBodyDynamics/joints/rotating/rotating.C b/src/rigidBodyMotion/rigidBodyDynamics/joints/rotating/rotating.C
index db8f5d74b2..a1ab3ba126 100644
--- a/src/rigidBodyMotion/rigidBodyDynamics/joints/rotating/rotating.C
+++ b/src/rigidBodyMotion/rigidBodyDynamics/joints/rotating/rotating.C
@@ -57,7 +57,7 @@ Foam::RBD::joints::rotating::rotating
 )
 :
     joint(model, 0),
-    omega_(Function1<vector>::New("omega", dict))
+    omega_(Function1<vector>::New("omega", dimTime, unitRadians/dimTime, dict))
 {}
 
 
diff --git a/src/rigidBodyMotion/rigidBodyDynamics/restraints/externalForce/externalForce.C b/src/rigidBodyMotion/rigidBodyDynamics/restraints/externalForce/externalForce.C
index 8ff6b9d7d9..e458094e28 100644
--- a/src/rigidBodyMotion/rigidBodyDynamics/restraints/externalForce/externalForce.C
+++ b/src/rigidBodyMotion/rigidBodyDynamics/restraints/externalForce/externalForce.C
@@ -106,7 +106,8 @@ bool Foam::RBD::restraints::externalForce::read
 
     coeffs_.lookup("location") >> location_;
 
-    externalForce_ = Function1<vector>::New("force", coeffs_);
+    externalForce_ =
+        Function1<vector>::New("force", dimTime, dimForce, coeffs_);
 
     return true;
 }
diff --git a/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 661cb3c6f9..9f8cf19059 100644
--- a/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -179,7 +179,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
 
     if (coeffDict().found("ramp"))
     {
-        ramp_ = Function1<scalar>::New("ramp", coeffDict());
+        ramp_ = Function1<scalar>::New("ramp", dimTime, dimless, coeffDict());
     }
     else
     {
diff --git a/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index 3b0aadc60b..a7341b692a 100644
--- a/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMotion/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -131,7 +131,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
 
     if (coeffDict().found("ramp"))
     {
-        ramp_ = Function1<scalar>::New("ramp", coeffDict());
+        ramp_ = Function1<scalar>::New("ramp", dimTime, dimless, coeffDict());
     }
     else
     {
diff --git a/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.C b/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.C
index 3e50661422..aede1d1b74 100644
--- a/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.C
+++ b/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.C
@@ -26,7 +26,6 @@ License
 #include "rigidBodyPoints.H"
 #include "fvMeshMoversMotionSolver.H"
 #include "motionSolver.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -69,7 +68,9 @@ Foam::functionObjects::rigidBodyPoints::rigidBodyPoints
 )
 :
     fvMeshFunctionObject(name, runTime, dict),
-    logFiles(obr_, name)
+    logFiles(obr_, name),
+    angularVelocityUnits_("[rad/s]"),
+    angularAccelerationUnits_("[rad/s^2]")
 {
     read(dict);
 }
@@ -87,7 +88,8 @@ bool Foam::functionObjects::rigidBodyPoints::read(const dictionary& dict)
 {
     fvMeshFunctionObject::read(dict);
 
-    angleUnits_ = dict.lookupOrDefault<word>("angleUnits", "radians");
+    angularVelocityUnits_.readIfPresent("angularVelocityUnits", dict);
+    angularAccelerationUnits_.readIfPresent("angularAccelerationUnits", dict);
 
     dict.lookup("body") >> body_;
 
@@ -110,13 +112,21 @@ bool Foam::functionObjects::rigidBodyPoints::read(const dictionary& dict)
 
 void Foam::functionObjects::rigidBodyPoints::writeFileHeader(const label i)
 {
-    writeHeader(this->files()[i], "Body point motion");
-    writeHeaderValue(this->files()[i], "Body", body_);
-    writeHeaderValue(this->files()[i], "Point", points_[i]);
-    writeHeaderValue(this->files()[i], "Angle Units", angleUnits_);
-    writeCommented(this->files()[i], "Time");
+    OFstream& file = this->files()[i];
 
-    this->files()[i]<< tab
+    writeHeader(file, "Body point motion");
+    writeHeaderValue(file, "Body", body_);
+    writeHeaderValue(file, "Point", points_[i]);
+    writeHeaderValue(file, "Angular Velocity Units", angularVelocityUnits_);
+    writeHeaderValue
+    (
+        file,
+        "Angular Acceleration Units",
+        angularAccelerationUnits_
+    );
+    writeCommented(file, "Time");
+
+    file<< tab
         << "Position" << tab
         << "Linear velocity" << tab
         << "Angular velocity" << tab
@@ -147,28 +157,14 @@ bool Foam::functionObjects::rigidBodyPoints::write()
             const spatialVector v(motion.v(bodyID, points_[i]));
             const spatialVector a(motion.a(bodyID, points_[i]));
 
-            vector angularVelocity(v.w());
-            vector angularAcceleration(a.w());
-
-            if (angleUnits_ == "degrees")
-            {
-                angularVelocity.x() = radToDeg(angularVelocity.x());
-                angularVelocity.y() = radToDeg(angularVelocity.y());
-                angularVelocity.z() = radToDeg(angularVelocity.z());
-
-                angularAcceleration.x() = radToDeg(angularAcceleration.x());
-                angularAcceleration.y() = radToDeg(angularAcceleration.y());
-                angularAcceleration.z() = radToDeg(angularAcceleration.z());
-            }
-
             writeTime(files()[i]);
             files()[i]
                 << tab
                 << p  << tab
                 << v.l() << tab
-                << angularVelocity << tab
+                << angularVelocityUnits_.toUser(v.w()) << tab
                 << a.l() << tab
-                << angularAcceleration << endl;
+                << angularAccelerationUnits_.toUser(a.w()) << endl;
         }
     }
 
diff --git a/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.H b/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.H
index 642f1de716..f22cacbebc 100644
--- a/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.H
+++ b/src/rigidBodyMotion/rigidBodyState/rigidBodyPoints/rigidBodyPoints.H
@@ -32,7 +32,10 @@ Usage
     \table
         Property     | Description                  | Required | Default value
         type         | type name: rigidBodyPoints   | yes      |
-        angleUnits   | degrees or radians           | no       | radians
+        angularVelocityUnits     | units in which angular velocities are \\
+                                   written          | no       | [rad/s]
+        angularAccelerationUnits | units in which angular accelerations are \\
+                                   written          | no       | [rad/s^2]
         body         | name of the body             | yes      |
         points       | list of points on the body   | yes      |
     \endtable
@@ -44,7 +47,8 @@ Usage
         type           rigidBodyPoints;
         libs           ("librigidBodyState.so");
 
-        angleUnits     degrees;
+        angularVelocityUnits [rpm];
+        angularAccelerationUnits [rad/s^2];
 
         body           floatingObject;
 
@@ -70,6 +74,7 @@ SourceFiles
 
 #include "fvMeshFunctionObject.H"
 #include "logFiles.H"
+#include "namedUnitConversion.H"
 #include "rigidBodyMotion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -90,8 +95,11 @@ class rigidBodyPoints
 {
     // Private Data
 
-        //- Angle units, radians (default) or degrees
-        word angleUnits_;
+        //- Units in which to write the angular velocities
+        namedUnitConversion angularVelocityUnits_;
+
+        //- Units in which to write the angular accelerations
+        namedUnitConversion angularAccelerationUnits_;
 
         //- Name of the body
         word body_;
diff --git a/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.C b/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.C
index a4fdb2c0cb..125d84621a 100644
--- a/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.C
+++ b/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.C
@@ -26,7 +26,6 @@ License
 #include "rigidBodyState.H"
 #include "fvMeshMoversMotionSolver.H"
 #include "motionSolver.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -70,6 +69,8 @@ Foam::functionObjects::rigidBodyState::rigidBodyState
 :
     fvMeshFunctionObject(name, runTime, dict),
     logFiles(obr_, name),
+    angleUnits_("[rad]"),
+    angularVelocityUnits_("[rad/s]"),
     names_(motion().movingBodyNames())
 {
     read(dict);
@@ -88,11 +89,10 @@ bool Foam::functionObjects::rigidBodyState::read(const dictionary& dict)
 {
     fvMeshFunctionObject::read(dict);
 
-    angleUnits_ = dict.lookupOrDefaultBackwardsCompatible<word>
-    (
-        {"angleUnits", "angleFormat"},
-        "radians"
-    );
+    units();
+
+    angleUnits_.readIfPresent("angleUnits", dict);
+    angularVelocityUnits_.readIfPresent("angularVelocityUnits", dict);
 
     resetNames(names_);
 
@@ -102,16 +102,18 @@ bool Foam::functionObjects::rigidBodyState::read(const dictionary& dict)
 
 void Foam::functionObjects::rigidBodyState::writeFileHeader(const label i)
 {
-    writeHeader(this->files()[i], "Motion State");
-    writeHeaderValue(this->files()[i], "Angle Units", angleUnits_);
-    writeCommented(this->files()[i], "Time");
+    OFstream& file = this->files()[i];
 
-    this->files()[i]<< tab
+    writeHeader(file, "Motion State");
+    writeHeaderValue(file, "Angle Units", angleUnits_);
+    writeHeaderValue(file, "Angular Velocity Units", angularVelocityUnits_);
+    writeCommented(file, "Time");
+
+    file<< tab
         << "Centre of rotation" << tab
         << "Orientation" << tab
         << "Linear velocity" << tab
         << "Angular velocity" << endl;
-
 }
 
 
@@ -136,31 +138,17 @@ bool Foam::functionObjects::rigidBodyState::write()
             const spatialTransform CofR(motion.X0(bodyID));
             const spatialVector vCofR(motion.v(bodyID, Zero));
 
-            vector rotationAngle
-            (
-                quaternion(CofR.E()).eulerAngles(quaternion::XYZ)
-            );
-
-            vector angularVelocity(vCofR.w());
-
-            if (angleUnits_ == "degrees")
-            {
-                rotationAngle.x() = radToDeg(rotationAngle.x());
-                rotationAngle.y() = radToDeg(rotationAngle.y());
-                rotationAngle.z() = radToDeg(rotationAngle.z());
-
-                angularVelocity.x() = radToDeg(angularVelocity.x());
-                angularVelocity.y() = radToDeg(angularVelocity.y());
-                angularVelocity.z() = radToDeg(angularVelocity.z());
-            }
+            const vector theta =
+                quaternion(CofR.E()).eulerAngles(quaternion::XYZ);
+            const vector omega(vCofR.w());
 
             writeTime(files()[i]);
             files()[i]
                 << tab
-                << CofR.r()  << tab
-                << rotationAngle  << tab
+                << CofR.r() << tab
+                << angleUnits_.toUser(theta) << tab
                 << vCofR.l() << tab
-                << angularVelocity << endl;
+                << angularVelocityUnits_.toUser(omega) << endl;
         }
     }
 
diff --git a/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.H b/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.H
index 5ee7e5c4de..4934c55d3f 100644
--- a/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.H
+++ b/src/rigidBodyMotion/rigidBodyState/rigidBodyState/rigidBodyState.H
@@ -29,9 +29,12 @@ Description
 
 Usage
     \table
-        Property     | Description                  | Required | Default value
-        type         | type name: rigidBodyState    | yes      |
-        angleUnits   | degrees or radians           | no       | radians
+        Property     | Description                   | Required | Default value
+        type         | type name: rigidBodyState     | yes      |
+        angleUnits           | units in which angles are written \\
+                                                     | no       | [rad]
+        angularVelocityUnits | units in which angular velocities are written \\
+                                                     | no       | [rad/s]
     \endtable
 
     Example of function object specification:
@@ -40,7 +43,8 @@ Usage
     {
         type           rigidBodyState;
         libs           ("librigidBodyState.so");
-        angleUnits     degrees;
+        angleUnits     [deg];
+        angularVelocityUnits [rpm];
     }
     \endverbatim
 
@@ -58,6 +62,7 @@ SourceFiles
 
 #include "fvMeshFunctionObject.H"
 #include "logFiles.H"
+#include "namedUnitConversion.H"
 #include "rigidBodyMotion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -78,7 +83,11 @@ class rigidBodyState
 {
     // Private Data
 
-        word angleUnits_;
+        //- Units in which to write the angles
+        namedUnitConversion angleUnits_;
+
+        //- Units in which to write the angular velocities
+        namedUnitConversion angularVelocityUnits_;
 
         //- List of the names of the rigid bodies
         wordList names_;
diff --git a/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.C b/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.C
index 15ec6ba2ba..565e8e871d 100644
--- a/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.C
+++ b/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.C
@@ -27,7 +27,6 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "sixDoFRigidBodyMotion.H"
 #include "transform.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -49,8 +48,7 @@ namespace sixDoFRigidBodyMotionRestraints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::
-axialAngularSpring
+Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::axialAngularSpring
 (
     const word& name,
     const dictionary& sDoFRBMRDict
@@ -60,7 +58,6 @@ axialAngularSpring
     refQ_(),
     axis_(),
     moment_(),
-    convertToDegrees_(),
     damping_()
 {
     read(sDoFRBMRDict);
@@ -69,15 +66,13 @@ axialAngularSpring
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::
-~axialAngularSpring()
+Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::~axialAngularSpring()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void
-Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::restrain
+void Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::restrain
 (
     const sixDoFRigidBodyMotion& motion,
     vector& restraintPosition,
@@ -113,16 +108,7 @@ Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::restrain
     // the direction vectors with the axis
     theta *= sign((oldDir ^ newDir) & axis_);
 
-    scalar moment;
-
-    if (convertToDegrees_)
-    {
-        moment = moment_->value(radToDeg(theta));
-    }
-    else
-    {
-        moment = moment_->value(theta);
-    }
+    const scalar moment = moment_->value(theta);
 
     // Damping of along axis angular velocity only
     restraintMoment = moment*axis_ - damping_*(motion.omega() & axis_)*axis_;
@@ -175,29 +161,26 @@ bool Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::read
             << abort(FatalError);
     }
 
-    moment_ = Function1<scalar>::New("moment", sDoFRBMRCoeffs_);
-
-    const word angleUnits
-    (
-        sDoFRBMRCoeffs_.lookupBackwardsCompatible
+    moment_ =
+        Function1<scalar>::New
         (
-            {"angleUnits", "angleFormat"}
-        )
-    );
+            "moment",
+            unitRadians,
+            dimForce/dimLength,
+            sDoFRBMRCoeffs_
+        );
 
-    if (angleUnits == "degrees" || angleUnits == "degree")
+    if
+    (
+        sDoFRBMRCoeffs_.found("angleUnits")
+     || sDoFRBMRCoeffs_.found("angleFormat")
+    )
     {
-        convertToDegrees_ = true;
-    }
-    else if (angleUnits == "radians" || angleUnits == "radian")
-    {
-        convertToDegrees_ = false;
-    }
-    else
-    {
-        FatalErrorInFunction
-            << "angleUnits must be degree, degrees, radian or radians"
-            << abort(FatalError);
+        FatalIOErrorInFunction(sDoFRBMRCoeffs_)
+            << "Angle units are no longer specified with 'angleUnits' or "
+            << "'angleFormat' entries. Instead, parameters of the 'moment' "
+            << "function can have their units specified directly."
+            << exit(FatalIOError);
     }
 
     sDoFRBMRCoeffs_.lookup("damping") >> damping_;
@@ -215,18 +198,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::axialAngularSpring::write
 
     writeEntry(os, "axis", axis_);
 
-    moment_->write(os);
-
-    writeKeyword(os, "angleUnits");
-
-    if (convertToDegrees_)
-    {
-        os  << "degrees" << token::END_STATEMENT << nl;
-    }
-    else
-    {
-        os  << "radians" << token::END_STATEMENT << nl;
-    }
+    writeEntry(os, moment_());
 
     writeEntry(os, "damping", damping_);
 }
diff --git a/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.H b/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.H
index 809dc475a6..6bcb0101db 100644
--- a/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.H
+++ b/src/rigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/axialAngularSpring/axialAngularSpring.H
@@ -68,10 +68,6 @@ class axialAngularSpring
         //- Spring moment as a function of angle
         autoPtr<Function1<scalar>> moment_;
 
-        //- Boolean stating whether the angle around the axis needs to
-        //  be converted to degrees before evaluating the moment function
-        bool convertToDegrees_;
-
         //- Damping coefficient (Nms/rad)
         scalar damping_;
 
diff --git a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.C b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.C
index 2e7e1e784c..553096abfb 100644
--- a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.C
+++ b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.C
@@ -75,9 +75,12 @@ bool Foam::functionObjects::sixDoFRigidBodyControl::read(const dictionary& dict)
 {
     sixDoFRigidBodyState::read(dict);
 
-    dict.lookup("window") >> w_;
-    dict.lookup("convergedVelocity") >> convergedVelocity_;
-    dict.lookup("convergedAngularVelocity") >> convergedAngularVelocity_;
+    w_ = dict.lookup<scalar>("window", dimTime);
+
+    convergedVelocity_ =
+        dict.lookup<vector>("convergedVelocity", dimVelocity);
+    convergedAngularVelocity_ =
+        dict.lookup<vector>("convergedAngularVelocity", angularVelocityUnits());
 
     resetName(typeName);
 
diff --git a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.H b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.H
index 7e97b1803a..5e19f9e1e6 100644
--- a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.H
+++ b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyControl/sixDoFRigidBodyControl.H
@@ -31,6 +31,21 @@ Description
     window and compared to specified velocity convergence criteria and the run
     stopped after writing the current time results, if the criteria are met.
 
+Usage
+    \table
+        Property | Description                       | Required | Default value
+        type     | Type name: sixDoFRigidBodyControl | yes      |
+        angleUnits           | units in which angles are written \\
+                                                     | no       | [rad]
+        angularVelocityUnits | units in which angular velocities are written \\
+                                                     | no       | [rad/s]
+        window   | Averaging window                  | yes      |
+        convergedVelocity        | Linear velocity convergence criterion \\
+                                                     | yes      |
+        convergedAngularVelocity | Angular velocity convergence criterion \\
+                                                     | yes      |
+    \endtable
+
     Example of function object specification:
     \verbatim
     sixDoFRigidBodyControl
@@ -38,27 +53,15 @@ Description
         type           sixDoFRigidBodyControl;
         libs           ("libsixDoFRigidBodyState.so");
 
-        angleUnits     degrees;
+        angleUnits     [deg];
+        angularVelocityUnits [deg/s];
 
-        window                      1;
-        convergedVelocity           (1e-2 1e-2 1e-2);
-        convergedAngularVelocity    (5 5 5);
+        window         1;
+        convergedVelocity (1e-2 1e-2 1e-2);
+        convergedAngularVelocity (5 5 5);
     }
     \endverbatim
 
-    Note the units of the \c convergedAngularVelocity are specified by the \c
-    angleUnits entry.
-
-Usage
-    \table
-    Property     | Description                       | Required | Default value
-    type         | Type name: sixDoFRigidBodyControl | yes      |
-    angleUnits  | Degrees or radians                | no       | radian
-    window       | Averaging window                  | yes      |
-    convergedVelocity | Linear velocity convergence criterion         | yes |
-    convergedAngularVelocity | Angular velocity convergence criterion | yes |
-    \endtable
-
 See also
     Foam::functionObjects::sixDoFRigidBodyState
 
@@ -103,7 +106,6 @@ class sixDoFRigidBodyControl
         vector meanAngularVelocity_;
 
 
-
 public:
 
     //- Runtime type information
diff --git a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.C b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.C
index 96ceedff09..509b1cdc0f 100644
--- a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.C
+++ b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.C
@@ -28,7 +28,6 @@ License
 #include "motionSolver.H"
 #include "sixDoFRigidBodyMotion.H"
 #include "quaternion.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -59,7 +58,9 @@ Foam::functionObjects::sixDoFRigidBodyState::sixDoFRigidBodyState
 )
 :
     fvMeshFunctionObject(name, runTime, dict),
-    logFiles(obr_, name)
+    logFiles(obr_, name),
+    angleUnits_("[rad]"),
+    angularVelocityUnits_("[rad/s]")
 {
     read(dict);
 }
@@ -77,11 +78,8 @@ bool Foam::functionObjects::sixDoFRigidBodyState::read(const dictionary& dict)
 {
     fvMeshFunctionObject::read(dict);
 
-    angleUnits_ = dict.lookupOrDefaultBackwardsCompatible<word>
-    (
-        {"angleUnits", "angleFormat"},
-        "radians"
-    );
+    angleUnits_.readIfPresent("angleUnits", dict);
+    angularVelocityUnits_.readIfPresent("angularVelocityUnits", dict);
 
     resetName(typeName);
 
@@ -95,6 +93,7 @@ void Foam::functionObjects::sixDoFRigidBodyState::writeFileHeader(const label)
 
     writeHeader(file, "Motion State");
     writeHeaderValue(file, "Angle Units", angleUnits_);
+    writeHeaderValue(file, "Angular Velocity Units", angularVelocityUnits_);
     writeCommented(file, "Time");
 
     file<< tab
@@ -122,8 +121,7 @@ Foam::functionObjects::sixDoFRigidBodyState::motion() const
 }
 
 
-Foam::vector
-Foam::functionObjects::sixDoFRigidBodyState::velocity() const
+Foam::vector Foam::functionObjects::sixDoFRigidBodyState::velocity() const
 {
     return motion().v();
 }
@@ -132,16 +130,14 @@ Foam::functionObjects::sixDoFRigidBodyState::velocity() const
 Foam::vector
 Foam::functionObjects::sixDoFRigidBodyState::angularVelocity() const
 {
-    vector angularVelocity(motion().omega());
+    return motion().omega();
+}
 
-    if (angleUnits_ == "degrees")
-    {
-        angularVelocity.x() = radToDeg(angularVelocity.x());
-        angularVelocity.y() = radToDeg(angularVelocity.y());
-        angularVelocity.z() = radToDeg(angularVelocity.z());
-    }
 
-    return angularVelocity;
+const Foam::unitConversion&
+Foam::functionObjects::sixDoFRigidBodyState::angularVelocityUnits() const
+{
+    return angularVelocityUnits_;
 }
 
 
@@ -153,32 +149,18 @@ bool Foam::functionObjects::sixDoFRigidBodyState::write()
     {
         const sixDoFRigidBodyMotion& motion = this->motion();
 
-        vector rotationAngle
-        (
-            quaternion(motion.orientation()).eulerAngles(quaternion::XYZ)
-        );
-
-        vector angularVelocity(motion.omega());
-
-        if (angleUnits_ == "degrees")
-        {
-            rotationAngle.x() = radToDeg(rotationAngle.x());
-            rotationAngle.y() = radToDeg(rotationAngle.y());
-            rotationAngle.z() = radToDeg(rotationAngle.z());
-
-            angularVelocity.x() = radToDeg(angularVelocity.x());
-            angularVelocity.y() = radToDeg(angularVelocity.y());
-            angularVelocity.z() = radToDeg(angularVelocity.z());
-        }
+        const vector theta =
+            quaternion(motion.orientation()).eulerAngles(quaternion::XYZ);
+        const vector omega(motion.omega());
 
         writeTime(file());
         file()
             << tab
             << motion.centreOfRotation()  << tab
             << motion.centreOfMass()  << tab
-            << rotationAngle  << tab
+            << angleUnits_.toUser(theta)  << tab
             << motion.v()  << tab
-            << angularVelocity << endl;
+            << angularVelocityUnits_.toUser(omega) << endl;
     }
 
     return true;
diff --git a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H
index 48bc228eff..6765c68f6c 100644
--- a/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H
+++ b/src/rigidBodyMotion/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H
@@ -27,23 +27,27 @@ Class
 Description
     Writes the 6-DoF motion state.
 
+Usage
+    \table
+        Property     | Description                  | Required | Default value
+        type         | type name: sixDoFRigidBodyState    | yes |
+        angleUnits           | units in which angles are written \\
+                                                     | no       | [rad]
+        angularVelocityUnits | units in which angular velocities are written \\
+                                                     | no       | [rad/s]
+    \endtable
+
     Example of function object specification:
     \verbatim
     sixDoFRigidBodyState
     {
         type           sixDoFRigidBodyState;
         libs           ("libsixDoFRigidBodyState.so");
-        angleUnits     degrees;
+        angleUnits     [deg];
+        angularVelocityUnits [rpm];
     }
     \endverbatim
 
-Usage
-    \table
-        Property     | Description                  | Required | Default value
-        type         | type name: sixDoFRigidBodyState    | yes |
-        angleUnits  | degrees or radians           | no       | radian
-    \endtable
-
 See also
     Foam::functionObjects::fvMeshFunctionObject
     Foam::functionObjects::logFiles
@@ -57,15 +61,14 @@ SourceFiles
 #define sixDoFRigidBodyState_H
 
 #include "fvMeshFunctionObject.H"
-#include "vector.H"
 #include "logFiles.H"
+#include "namedUnitConversion.H"
+#include "sixDoFRigidBodyMotion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    class sixDoFRigidBodyMotion;
-
 namespace functionObjects
 {
 
@@ -80,7 +83,11 @@ class sixDoFRigidBodyState
 {
     // Private Data
 
-        word angleUnits_;
+        //- Units in which to write the angles
+        namedUnitConversion angleUnits_;
+
+        //- Units in which to write the angular velocities
+        namedUnitConversion angularVelocityUnits_;
 
 
     // Private Member Functions
@@ -128,6 +135,9 @@ public:
         //- Return the current body angular velocity
         vector angularVelocity() const;
 
+        //- Return the units in which to write the angular velocities
+        const unitConversion& angularVelocityUnits() const;
+
         //- Read the sixDoFRigidBodyState data
         virtual bool read(const dictionary&);
 
diff --git a/src/sampling/sampledSet/arcUniform/arcUniform.C b/src/sampling/sampledSet/arcUniform/arcUniform.C
index 7a0460007e..625633d54d 100644
--- a/src/sampling/sampledSet/arcUniform/arcUniform.C
+++ b/src/sampling/sampledSet/arcUniform/arcUniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "word.H"
 #include "points.H"
-#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C
index 71b9e1d1a7..2615b212b3 100644
--- a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C
+++ b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ specieTransferMassFractionFvPatchScalarField
     UName_(dict.lookupOrDefault<word>("U", "U")),
     phiYp_(p.size(), 0),
     timeIndex_(-1),
-    c_(dict.lookupOrDefault<scalar>("c", scalar(0))),
+    c_(dict.lookupOrDefault<scalar>("c", unitAny, scalar(0))),
     property_
     (
         c_ == scalar(0)
@@ -94,7 +94,10 @@ specieTransferMassFractionFvPatchScalarField
       : propertyNames_.read(dict.lookup("property"))
     )
 {
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    fvPatchScalarField::operator=
+    (
+        scalarField("value", iF.dimensions(), dict, p.size())
+    );
 
     refValue() = Zero;
     refGrad() = Zero;
diff --git a/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C
index 0eaa592916..4256bc5a43 100644
--- a/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C
+++ b/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,10 @@ specieTransferTemperatureFvPatchScalarField
 {
     if (readValue)
     {
-        fvPatchScalarField::operator==(scalarField("value", dict, p.size()));
+        fvPatchScalarField::operator==
+        (
+            scalarField("value", iF.dimensions(), dict, p.size())
+        );
     }
 }
 
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index 8656df166c..2a7dd2334d 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -273,7 +273,7 @@ Foam::basicThermo::implementation::implementation
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionedScalar(dimEnergy/dimTime/dimLength/dimTemperature, Zero)
+        dimensionedScalar(dimThermalConductivity, Zero)
     ),
 
     dpdt_(dict.lookupOrDefault<Switch>("dpdt", true))
diff --git a/src/thermophysicalModels/basic/derivedFvFieldSources/uniformFixedEnergyTemperature/uniformFixedEnergyTemperatureFvScalarFieldSource.C b/src/thermophysicalModels/basic/derivedFvFieldSources/uniformFixedEnergyTemperature/uniformFixedEnergyTemperatureFvScalarFieldSource.C
index ee2e87e93b..f094959750 100644
--- a/src/thermophysicalModels/basic/derivedFvFieldSources/uniformFixedEnergyTemperature/uniformFixedEnergyTemperatureFvScalarFieldSource.C
+++ b/src/thermophysicalModels/basic/derivedFvFieldSources/uniformFixedEnergyTemperature/uniformFixedEnergyTemperatureFvScalarFieldSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,16 @@ uniformFixedEnergyTemperatureFvScalarFieldSource
 )
 :
     energyCalculatedTemperatureFvScalarFieldSource(iF, dict),
-    uniformHe_(Function1<scalar>::New("uniformHe", dict))
+    uniformHe_
+    (
+        Function1<scalar>::New
+        (
+            "uniformHe",
+            db().time().userUnits(),
+            dimEnergy/dimMass,
+            dict
+        )
+    )
 {}
 
 
@@ -70,8 +79,7 @@ Foam::uniformFixedEnergyTemperatureFvScalarFieldSource::sourceHeValue
     const fvSource& source
 ) const
 {
-    const scalar t = this->db().time().userTimeValue();
-    const scalar v = uniformHe_->value(t);
+    const scalar v = uniformHe_->value(db().time().value());
     return tmp<scalarField>(new scalarField(source.nCells(), v));
 }
 
@@ -92,7 +100,13 @@ void Foam::uniformFixedEnergyTemperatureFvScalarFieldSource::write
 ) const
 {
     fvScalarFieldSource::write(os);
-    writeEntry(os, uniformHe_());
+    writeEntry
+    (
+        os,
+        db().time().userUnits(),
+        dimEnergy/dimMass,
+        uniformHe_()
+    );
 }
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvFieldSources/uniformInletOutletEnergyTemperature/uniformInletOutletEnergyTemperatureFvScalarFieldSource.C b/src/thermophysicalModels/basic/derivedFvFieldSources/uniformInletOutletEnergyTemperature/uniformInletOutletEnergyTemperatureFvScalarFieldSource.C
index 6783692949..571419e84d 100644
--- a/src/thermophysicalModels/basic/derivedFvFieldSources/uniformInletOutletEnergyTemperature/uniformInletOutletEnergyTemperatureFvScalarFieldSource.C
+++ b/src/thermophysicalModels/basic/derivedFvFieldSources/uniformInletOutletEnergyTemperature/uniformInletOutletEnergyTemperatureFvScalarFieldSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,16 @@ uniformInletOutletEnergyTemperatureFvScalarFieldSource
 )
 :
     energyCalculatedTemperatureFvScalarFieldSource(iF, dict),
-    uniformInletHe_(Function1<scalar>::New("uniformInletHe", dict))
+    uniformInletHe_
+    (
+        Function1<scalar>::New
+        (
+            "uniformInletHe",
+            db().time().userUnits(),
+            dimEnergy/dimMass,
+            dict
+        )
+    )
 {}
 
 
@@ -70,8 +79,7 @@ Foam::uniformInletOutletEnergyTemperatureFvScalarFieldSource::sourceHeValue
     const fvSource& source
 ) const
 {
-    const scalar t = this->db().time().userTimeValue();
-    const scalar v = uniformInletHe_->value(t);
+    const scalar v = uniformInletHe_->value(db().time().value());
     return tmp<scalarField>(new scalarField(source.nCells(), v));
 }
 
@@ -94,7 +102,13 @@ void Foam::uniformInletOutletEnergyTemperatureFvScalarFieldSource::write
 ) const
 {
     fvScalarFieldSource::write(os);
-    writeEntry(os, uniformInletHe_());
+    writeEntry
+    (
+        os,
+        db().time().userUnits(),
+        dimEnergy/dimMass,
+        uniformInletHe_()
+    );
 }
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
index df19c7a5e7..f62ea7a3c1 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
@@ -50,7 +50,7 @@ Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField
 )
 :
     jumpCyclicFvPatchScalarField(p, iF, dict),
-    jump_("jump", dict, p.size())
+    jump_("jump", iF.dimensions(), dict, p.size())
 {
     evaluateNoUpdateCoeffs();
 }
diff --git a/src/thermophysicalModels/ignition/ignitionSiteIO.C b/src/thermophysicalModels/ignition/ignitionSiteIO.C
index c0d5e685fe..b8a18e8ad4 100644
--- a/src/thermophysicalModels/ignition/ignitionSiteIO.C
+++ b/src/thermophysicalModels/ignition/ignitionSiteIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,21 +38,15 @@ Foam::ignitionSite::ignitionSite
     db_(db),
     mesh_(mesh),
     ignitionSiteDict_(is),
-    location_(ignitionSiteDict_.lookup("location")),
-    diameter_(ignitionSiteDict_.lookup<scalar>("diameter")),
+    location_(ignitionSiteDict_.lookup<vector>("location", dimLength)),
+    diameter_(ignitionSiteDict_.lookup<scalar>("diameter", dimLength)),
     time_
     (
-        db_.userTimeToTime
-        (
-            ignitionSiteDict_.lookup<scalar>("start")
-        )
+        ignitionSiteDict_.lookup<scalar>("start", db.time().userUnits())
     ),
     duration_
     (
-        db_.userTimeToTime
-        (
-            ignitionSiteDict_.lookup<scalar>("duration")
-        )
+        ignitionSiteDict_.lookup<scalar>("duration", db.time().userUnits())
     ),
     strength_(ignitionSiteDict_.lookup<scalar>("strength")),
     timeIndex_(db_.timeIndex())
diff --git a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.C b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.C
index 624a172b85..25cfa5ec91 100644
--- a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.C
+++ b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -422,7 +422,7 @@ Foam::MulticomponentThermo<BaseThermo>::kappai
     return volScalarFieldPropertyi
     (
         "kappa",
-        dimPower/dimLength/dimTemperature,
+        dimThermalConductivity,
         &BaseThermo::mixtureType::thermoType::kappa,
         speciei,
         p,
diff --git a/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C b/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C
index 4ab1299403..6472a24eae 100644
--- a/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C
+++ b/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.C
@@ -51,7 +51,10 @@ Foam::saturationModels::function1Temperature::function1Temperature
 )
 :
     saturationTemperatureModel(),
-    function_(Function1<scalar>::New("function", dict))
+    function_
+    (
+        Function1<scalar>::New("function", {dimPressure, dimTemperature}, dict)
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.H b/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.H
index b19dbaa5d8..05237e9a8d 100644
--- a/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.H
+++ b/src/thermophysicalModels/saturationModels/function1Temperature/function1Temperature.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,8 +55,7 @@ Description
             file                "filename.csv";
             format              csv;
             nHeaderLine         1;
-            refColumn           0;
-            componentColumns    (1);
+            columns             (0 1);
             separator           ",";
             mergeSeparators     no;
             outOfBounds         clamp;
diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.C
index 9656460b45..c182c80e27 100644
--- a/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.C
+++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,12 @@ Foam::tabulatedSolidTransport<Thermo>::tabulatedSolidTransport
 )
 :
     Thermo(name, dict),
-    kappa_("kappa", dict.subDict("transport").subDict("kappa"))
+    kappa_
+    (
+        "kappa",
+        {dimTemperature, dimThermalConductivity},
+        dict.subDict("transport").subDict("kappa")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.C
index b7a6fb8317..e90815c537 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,7 +202,7 @@ Foam::SolidThermo<BaseThermo>::SolidThermo
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionedVector(dimEnergy/dimTime/dimLength/dimTemperature, Zero)
+        dimensionedVector(dimThermalConductivity, Zero)
     )
 {
     calculate();
diff --git a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C
index 213d9e31ac..268cdbce48 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C
+++ b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,12 @@ Foam::icoTabulated<Specie>::icoTabulated
 )
 :
     Specie(name, dict),
-    rho_("rho", dict.subDict("equationOfState").subDict("rho"))
+    rho_
+    (
+        "rho",
+        {dimTemperature, dimDensity},
+        dict.subDict("equationOfState").subDict("rho")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
index f1c6f3496a..87f6cb8c3a 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
+++ b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,12 @@ Foam::rhoTabulated<Specie>::rhoTabulated
 )
 :
     Specie(name, dict),
-    rho_("rho", dict.subDict("equationOfState").subDict("rho"))
+    rho_
+    (
+        "rho",
+        {dimPressure, dimTemperature, dimDensity},
+        dict.subDict("equationOfState").subDict("rho")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
index b63de7989d..be7cd6bb60 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ SourceFiles
     rhoTabulated.C
 
 See also
-    Foam::Function1s::NonUniformTable
+    Foam::Function2s::UniformTable
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
index 33f0d8ccbf..92769a77c2 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::IrreversibleReaction<ThermoType, ReactionRate>::IrreversibleReaction
 )
 :
     Reaction<ThermoType>(species, speciesThermo, dict),
-    k_(species, dict)
+    k_(species, this->kfDims(), dict)
 {}
 
 
@@ -62,7 +62,7 @@ Foam::IrreversibleReaction<ThermoType, ReactionRate>::IrreversibleReaction
 )
 :
     Reaction<ThermoType>(species, speciesThermo, dict),
-    k_(species, ob, dict)
+    k_(species, ob, this->kfDims(), dict)
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
index 511ada54bc..800856de18 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,8 +37,8 @@ NonEquilibriumReversibleReaction
 )
 :
     Reaction<ThermoType>(reaction),
-    fk_(forwardReactionRate),
-    rk_(reverseReactionRate)
+    kf_(forwardReactionRate),
+    kr_(reverseReactionRate)
 {}
 
 
@@ -52,8 +52,8 @@ NonEquilibriumReversibleReaction
 )
 :
     Reaction<ThermoType>(species, speciesThermo, dict),
-    fk_(species, dict.subDict("forward")),
-    rk_(species, dict.subDict("reverse"))
+    kf_(species, this->kfDims(), dict.subDict("forward")),
+    kr_(species, this->krDims(), dict.subDict("reverse"))
 {}
 
 
@@ -68,8 +68,8 @@ NonEquilibriumReversibleReaction
 )
 :
     Reaction<ThermoType>(species, speciesThermo, dict),
-    fk_(species, ob, dict.subDict("forward")),
-    rk_(species, ob, dict.subDict("reverse"))
+    kf_(species, ob, this->kfDims(), dict.subDict("forward")),
+    kr_(species, ob, this->krDims(), dict.subDict("reverse"))
 {}
 
 
@@ -83,8 +83,8 @@ NonEquilibriumReversibleReaction
 )
 :
     Reaction<ThermoType>(nerr, species),
-    fk_(nerr.fk_),
-    rk_(nerr.rk_)
+    kf_(nerr.kf_),
+    kr_(nerr.kr_)
 {}
 
 
@@ -94,8 +94,8 @@ template<class ThermoType, class ReactionRate>
 void Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::
 preEvaluate() const
 {
-    fk_.preEvaluate();
-    rk_.preEvaluate();
+    kf_.preEvaluate();
+    kr_.preEvaluate();
 }
 
 
@@ -103,8 +103,8 @@ template<class ThermoType, class ReactionRate>
 void Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::
 postEvaluate() const
 {
-    fk_.postEvaluate();
-    rk_.postEvaluate();
+    kf_.postEvaluate();
+    kr_.postEvaluate();
 }
 
 
@@ -118,7 +118,7 @@ Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::kf
     const label li
 ) const
 {
-    return fk_(p, T, c, li);
+    return kf_(p, T, c, li);
 }
 
 
@@ -133,7 +133,7 @@ Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::kr
     const label li
 ) const
 {
-    return rk_(p, T, c, li);
+    return kr_(p, T, c, li);
 }
 
 
@@ -147,7 +147,7 @@ Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::kr
     const label li
 ) const
 {
-    return rk_(p, T, c, li);
+    return kr_(p, T, c, li);
 }
 
 
@@ -161,7 +161,7 @@ Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::dkfdT
     const label li
 ) const
 {
-    return fk_.ddT(p, T, c, li);
+    return kf_.ddT(p, T, c, li);
 }
 
 
@@ -177,7 +177,7 @@ Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::dkrdT
     const scalar kr
 ) const
 {
-    return rk_.ddT(p, T, c, li);
+    return kr_.ddT(p, T, c, li);
 }
 
 
@@ -185,7 +185,7 @@ template<class ThermoType, class ReactionRate>
 bool Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::
 hasDkdc() const
 {
-    return fk_.hasDdc() || rk_.hasDdc();
+    return kf_.hasDdc() || kr_.hasDdc();
 }
 
 
@@ -199,7 +199,7 @@ void Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::dkfdc
     scalarField& dkfdc
 ) const
 {
-    fk_.ddc(p, T, c, li, dkfdc);
+    kf_.ddc(p, T, c, li, dkfdc);
 }
 
 
@@ -215,7 +215,7 @@ void Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::dkrdc
     scalarField& dkrdc
 ) const
 {
-    rk_.ddc(p, T, c, li, dkrdc);
+    kr_.ddc(p, T, c, li, dkrdc);
 }
 
 
@@ -230,14 +230,14 @@ void Foam::NonEquilibriumReversibleReaction<ThermoType, ReactionRate>::write
     os  << indent << "forward" << nl;
     os  << indent << token::BEGIN_BLOCK << nl;
     os  << incrIndent;
-    fk_.write(os);
+    kf_.write(os);
     os  << decrIndent;
     os  << indent << token::END_BLOCK << nl;
 
     os  << indent << "reverse" << nl;
     os  << indent << token::BEGIN_BLOCK << nl;
     os  << incrIndent;
-    rk_.write(os);
+    kr_.write(os);
     os  << decrIndent;
     os  << indent << token::END_BLOCK << nl;
 }
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index 764331d970..21000e4ede 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,8 +53,8 @@ class NonEquilibriumReversibleReaction
 {
     // Private Data
 
-        ReactionRate fk_;
-        ReactionRate rk_;
+        ReactionRate kf_;
+        ReactionRate kr_;
 
 
 public:
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 3cb56e83cf..a3499a99fd 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,9 +256,26 @@ Foam::Reaction<ThermoType>::New
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ThermoType>
-void Foam::Reaction<ThermoType>::write(Ostream& os) const
+Foam::dimensionSet Foam::Reaction<ThermoType>::kfDims() const
 {
-    reaction::write(os);
+    scalar order = 0;
+    forAll(lhs(), i)
+    {
+        order += lhs()[i].exponent;
+    }
+    return pow(dimMoles/dimVolume, 1 - order)/dimTime;
+}
+
+
+template<class ThermoType>
+Foam::dimensionSet Foam::Reaction<ThermoType>::krDims() const
+{
+    scalar order = 0;
+    forAll(rhs(), i)
+    {
+        order += rhs()[i].exponent;
+    }
+    return pow(dimMoles/dimVolume, 1 - order)/dimTime;
 }
 
 
@@ -529,4 +546,11 @@ void Foam::Reaction<ThermoType>::ddNdtByVdcTp
 }
 
 
+template<class ThermoType>
+void Foam::Reaction<ThermoType>::write(Ostream& os) const
+{
+    reaction::write(os);
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index de01b21649..4610a2da8c 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -215,6 +215,15 @@ public:
             virtual void postEvaluate() const = 0;
 
 
+        // Dimensions
+
+            //- Dimensions of the forward rate
+            dimensionSet kfDims() const;
+
+            //- Dimensions of the reverse rate
+            dimensionSet krDims() const;
+
+
         // Reaction rate coefficients
 
             //- Concentration powers
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
index 9380fada29..5a3ec4cd42 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::ReversibleReaction<ThermoType, ReactionRate>::ReversibleReaction
 )
 :
     Reaction<ThermoType>(species, speciesThermo, dict),
-    k_(species, dict)
+    k_(species, this->kfDims(), dict)
 {}
 
 
@@ -62,7 +62,7 @@ Foam::ReversibleReaction<ThermoType, ReactionRate>::ReversibleReaction
 )
 :
     Reaction<ThermoType>(species, speciesThermo, dict),
-    k_(species, ob, dict)
+    k_(species, ob, this->kfDims(), dict)
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
index a4c6876984..ecd967fe44 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,7 @@ SourceFiles
 #ifndef ArrheniusReactionRate_H
 #define ArrheniusReactionRate_H
 
+#include "speciesTable.H"
 #include "scalarField.H"
 #include "typeInfo.H"
 
@@ -60,8 +61,8 @@ class ArrheniusReactionRate
 {
     // Private Data
 
-        scalar A_;
         scalar beta_;
+        scalar A_;
         scalar Ta_;
 
 
@@ -81,6 +82,7 @@ public:
         inline ArrheniusReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
index 0133774e3b..ff7ca9dafc 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "ArrheniusReactionRate.H"
+#include "physicoChemicalConstants.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
@@ -32,8 +35,8 @@ inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
     const scalar Ta
 )
 :
-    A_(A),
     beta_(beta),
+    A_(A),
     Ta_(Ta)
 {}
 
@@ -41,12 +44,19 @@ inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
 inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
 (
     const speciesTable&,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    A_(dict.lookup<scalar>("A")),
-    beta_(dict.lookup<scalar>("beta")),
-    Ta_(dict.lookup<scalar>("Ta"))
+    beta_(dict.lookup<scalar>("beta", dimless)),
+    A_(dict.lookup<scalar>("A", dims/pow(dimTemperature, beta_))),
+    Ta_
+    (
+        dict.found("Ta") || !dict.found("Ea")
+      ? dict.lookup<scalar>("Ta", dimTemperature)
+      : dict.lookup<scalar>("Ea", dimEnergy/dimMoles)
+       /constant::physicoChemical::RR.value()
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
index fbbb467cb4..0c82902f35 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,6 +88,7 @@ public:
         inline ChemicallyActivatedReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
index 44a9e89308..8ad91d383e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,10 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#define CHEMICALLY_ACTIVATION_FUNCTION_JACOBIAN false
+#include "ChemicallyActivatedReactionRate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define CHEMICALLY_ACTIVATION_FUNCTION_JACOBIAN false
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
 template<class ReactionRate, class ChemicallyActivationFunction>
 inline Foam::ChemicallyActivatedReactionRate
 <
@@ -55,11 +59,12 @@ inline Foam::ChemicallyActivatedReactionRate
 >::ChemicallyActivatedReactionRate
 (
     const speciesTable& species,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    k0_(species, dict.subDict("k0")),
-    kInf_(species, dict.subDict("kInf")),
+    k0_(species, dims, dict.subDict("k0")),
+    kInf_(species, dims, dict.subDict("kInf")),
     F_(dict.subDict("F")),
     thirdBodyEfficiencies_(species, dict.subDict("thirdBodyEfficiencies"))
 {}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
index 7d7aafaf0b..bd75ac7690 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,6 +90,7 @@ public:
         inline FallOffReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
index 8863ba2c2c..0f87774773 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "FallOffReactionRate.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #define FALL_OFF_FUNCTION_JACOBIAN false
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -49,11 +53,12 @@ inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
 FallOffReactionRate
 (
     const speciesTable& species,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    k0_(species, dict.subDict("k0")),
-    kInf_(species, dict.subDict("kInf")),
+    k0_(species, dims, dict.subDict("k0")),
+    kInf_(species, dims, dict.subDict("kInf")),
     F_(dict.subDict("F")),
     thirdBodyEfficiencies_(species, dict.subDict("thirdBodyEfficiencies"))
 {}
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
index 76d3cfaa01..7993b0fc3a 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,7 @@ SourceFiles
 #ifndef JanevReactionRate_H
 #define JanevReactionRate_H
 
+#include "speciesTable.H"
 #include "scalarField.H"
 #include "typeInfo.H"
 #include "FixedList.H"
@@ -59,8 +60,8 @@ class JanevReactionRate
 {
     // Private Data
 
-        scalar A_;
         scalar beta_;
+        scalar A_;
         scalar Ta_;
 
         static const label nb_ = 9;
@@ -84,6 +85,7 @@ public:
         inline JanevReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
index 739cd8650f..604248c04c 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "JanevReactionRate.H"
+#include "physicoChemicalConstants.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::JanevReactionRate::JanevReactionRate
@@ -33,8 +36,8 @@ inline Foam::JanevReactionRate::JanevReactionRate
     const FixedList<scalar, nb_> b
 )
 :
-    A_(A),
     beta_(beta),
+    A_(A),
     Ta_(Ta),
     b_(b)
 {}
@@ -43,12 +46,19 @@ inline Foam::JanevReactionRate::JanevReactionRate
 inline Foam::JanevReactionRate::JanevReactionRate
 (
     const speciesTable&,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    A_(dict.lookup<scalar>("A")),
-    beta_(dict.lookup<scalar>("beta")),
-    Ta_(dict.lookup<scalar>("Ta")),
+    beta_(dict.lookup<scalar>("beta", dimless)),
+    A_(dict.lookup<scalar>("A", dims/pow(dimTemperature, beta_))),
+    Ta_
+    (
+        dict.found("Ta") || !dict.found("Ea")
+      ? dict.lookup<scalar>("Ta", dimTemperature)
+      : dict.lookup<scalar>("Ea", dimEnergy/dimMoles)
+       /constant::physicoChemical::RR.value()
+    ),
     b_(dict.lookup("b"))
 {}
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
index 6036443385..06dabc12f8 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,7 @@ SourceFiles
 #ifndef LandauTellerReactionRate_H
 #define LandauTellerReactionRate_H
 
+#include "speciesTable.H"
 #include "scalarField.H"
 #include "typeInfo.H"
 
@@ -58,8 +59,8 @@ class LandauTellerReactionRate
 {
     // Private Data
 
-        scalar A_;
         scalar beta_;
+        scalar A_;
         scalar Ta_;
         scalar B_;
         scalar C_;
@@ -83,6 +84,7 @@ public:
         inline LandauTellerReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
index eaa6e82335..4a24aa2d16 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "LandauTellerReactionRate.H"
+#include "physicoChemicalConstants.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
@@ -34,8 +37,8 @@ inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
     const scalar C
 )
 :
-    A_(A),
     beta_(beta),
+    A_(A),
     Ta_(Ta),
     B_(B),
     C_(C)
@@ -45,14 +48,21 @@ inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
 inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
 (
     const speciesTable&,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    A_(dict.lookup<scalar>("A")),
-    beta_(dict.lookup<scalar>("beta")),
-    Ta_(dict.lookup<scalar>("Ta")),
-    B_(dict.lookup<scalar>("B")),
-    C_(dict.lookup<scalar>("C"))
+    beta_(dict.lookup<scalar>("beta", dimless)),
+    A_(dict.lookup<scalar>("A", dims/pow(dimTemperature, beta_))),
+    Ta_
+    (
+        dict.found("Ta") || !dict.found("Ea")
+      ? dict.lookup<scalar>("Ta", dimTemperature)
+      : dict.lookup<scalar>("Ea", dimEnergy/dimMoles)
+       /constant::physicoChemical::RR.value()
+    ),
+    B_(dict.lookup<scalar>("B", cbrt(dimTemperature))),
+    C_(dict.lookup<scalar>("C", sqr(cbrt(dimTemperature))))
 {}
 
 
@@ -95,7 +105,7 @@ inline Foam::scalar Foam::LandauTellerReactionRate::operator()
 
     if (mag(C_) > vSmall)
     {
-        expArg += C_/pow(T, 2.0/3.0);
+        expArg += C_/sqr(cbrt(T));
     }
 
     if (mag(expArg) > vSmall)
@@ -141,7 +151,7 @@ inline Foam::scalar Foam::LandauTellerReactionRate::ddT
 
     if (mag(C_) > vSmall)
     {
-        scalar CT = C_/pow(T, 2.0/3.0);
+        scalar CT = C_/sqr(cbrt(T));
         expArg += CT;
         deriv -= 2*CT/3;
     }
@@ -151,7 +161,7 @@ inline Foam::scalar Foam::LandauTellerReactionRate::ddT
         lta *= exp(expArg);
     }
 
-    return lta*(beta_+deriv)/T;
+    return lta*(beta_ + deriv)/T;
 }
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
index 414c39824d..c03d9a19c7 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,7 @@ SourceFiles
 #ifndef LangmuirHinshelwoodReactionRate_H
 #define LangmuirHinshelwoodReactionRate_H
 
+#include "speciesTable.H"
 #include "scalarField.H"
 #include "typeInfo.H"
 
@@ -86,6 +87,7 @@ public:
         inline LangmuirHinshelwoodReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
index 711f287919..60d33f9442 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "FixedList.H"
-#include "Tuple2.H"
+#include "LangmuirHinshelwoodReactionRate.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 (
     const speciesTable& st,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRate.H
index 52f1c79f07..f6609fd06b 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,6 +86,7 @@ public:
         inline MichaelisMentenReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRateI.H
index e28e713914..74c68ee541 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/MichaelisMenten/MichaelisMentenReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,17 +23,20 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "MichaelisMentenReactionRate.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::MichaelisMentenReactionRate::MichaelisMentenReactionRate
 (
     const speciesTable& st,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
     species_(st),
-    Vmax_(dict.lookup<scalar>("Vmax")),
-    Km_(dict.lookup<scalar>("Km")),
+    Vmax_(dict.lookup<scalar>("Vmax", dims*dimMoles/dimVolume)),
+    Km_(dict.lookup<scalar>("Km", dimMoles/dimVolume)),
     s_(st[dict.lookup("S")])
 {}
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
index caab63bb3b..9073bac17e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef LindemannFallOffFunction_H
 #define LindemannFallOffFunction_H
 
-#include "scalar.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
index 7702096f73..a60d163c9d 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "LindemannFallOffFunction.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::LindemannFallOffFunction::LindemannFallOffFunction()
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
index 58daa57db4..b0af25f21e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef SRIFallOffFunction_H
 #define SRIFallOffFunction_H
 
-#include "scalar.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
index ff4ab77851..03ee7278d9 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "SRIFallOffFunction.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::SRIFallOffFunction::SRIFallOffFunction
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
index 11ec779101..d06dc47c94 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef TroeFallOffFunction_H
 #define TroeFallOffFunction_H
 
-#include "scalar.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
index 229ae5c189..4c364816f2 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "TroeFallOffFunction.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::TroeFallOffFunction::TroeFallOffFunction
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRate.H
index c599d6113c..ec3b5144bf 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,10 @@ SourceFiles
 #define fluxLimitedLangmuirHinshelwoodReactionRate_H
 
 #include "speciesTable.H"
+#include "specieCoeffs.H"
+#include "scalarField.H"
+#include "dictionary.H"
+#include "objectRegistry.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -144,6 +148,7 @@ public:
         (
             const speciesTable& species,
             const objectRegistry& ob,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRateI.H
index 1d5625f2d9..fdb53c702c 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fluxLimitedLangmuirHinshelwoodReactionRate/fluxLimitedLangmuirHinshelwoodReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "volFields.H"
+#include "fluxLimitedLangmuirHinshelwoodReactionRate.H"
 #include "mathematicalConstants.H"
 #include "thermodynamicConstants.H"
 
@@ -55,6 +55,7 @@ fluxLimitedLangmuirHinshelwoodReactionRate
 (
     const speciesTable& st,
     const objectRegistry& ob,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
index b8f8abd81f..7cdbe2372d 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,7 @@ SourceFiles
 #ifndef powerSeriesReactionRate_H
 #define powerSeriesReactionRate_H
 
+#include "speciesTable.H"
 #include "scalarField.H"
 #include "typeInfo.H"
 #include "FixedList.H"
@@ -59,9 +60,8 @@ class powerSeriesReactionRate
 {
     // Private Data
 
-        scalar A_;
         scalar beta_;
-        scalar Ta_;
+        scalar A_;
 
         static const label nCoeff_ = 4;
         FixedList<scalar, nCoeff_> coeffs_;
@@ -76,7 +76,6 @@ public:
         (
             const scalar A,
             const scalar beta,
-            const scalar Ta,
             const FixedList<scalar, nCoeff_> coeffs
         );
 
@@ -84,6 +83,7 @@ public:
         inline powerSeriesReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
index 6f174cc05b..3fe7619bb0 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,19 +23,19 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "powerSeriesReactionRate.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
 (
     const scalar A,
     const scalar beta,
-    const scalar Ta,
     const FixedList<scalar, nCoeff_> coeffs
 )
 :
-    A_(A),
     beta_(beta),
-    Ta_(Ta),
+    A_(A),
     coeffs_(coeffs)
 {}
 
@@ -43,12 +43,12 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
 inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
 (
     const speciesTable&,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    A_(dict.lookup<scalar>("A")),
-    beta_(dict.lookup<scalar>("beta")),
-    Ta_(dict.lookup<scalar>("Ta")),
+    beta_(dict.lookup<scalar>("beta", dimless)),
+    A_(dict.lookup<scalar>("A", dims/pow(dimTemperature, beta_))),
     coeffs_(dict.lookup("coeffs"))
 {}
 
@@ -145,7 +145,6 @@ inline void Foam::powerSeriesReactionRate::write(Ostream& os) const
 {
     writeEntry(os, "A", A_);
     writeEntry(os, "beta", beta_);
-    writeEntry(os, "Ta", Ta_);
     writeEntry(os, "coeffs", coeffs_);
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRate.H
index dec5de762c..9174b7c1bf 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,7 @@ SourceFiles
 
 #include "ArrheniusReactionRate.H"
 #include "speciesTable.H"
+#include "objectRegistry.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -84,6 +85,7 @@ public:
         (
             const speciesTable& species,
             const objectRegistry& ob,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRateI.H
index 7a34658259..eba019e8be 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/surfaceArrheniusReactionRate/surfaceArrheniusReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,16 +23,19 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "surfaceArrheniusReactionRate.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::surfaceArrheniusReactionRate::surfaceArrheniusReactionRate
 (
     const speciesTable& species,
     const objectRegistry& ob,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    ArrheniusReactionRate(species, dict),
+    ArrheniusReactionRate(species, dims, dict),
     AvName_(dict.lookupBackwardsCompatible({"Av", "a"})),
     ob_(ob),
     tAv_(nullptr)
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
index 2b067f9a23..80f0892753 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,6 +80,7 @@ public:
         inline thirdBodyArrheniusReactionRate
         (
             const speciesTable& species,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
index 23a1d3fd76..a47a817b12 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "thirdBodyArrheniusReactionRate.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
@@ -41,14 +43,11 @@ inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 (
     const speciesTable& species,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 :
-    ArrheniusReactionRate
-    (
-        species,
-        dict
-    ),
+    ArrheniusReactionRate(species, dims, dict),
     thirdBodyEfficiencies_(species, dict)
 {}
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index a5c6f7d678..52d8e25ebb 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "thirdBodyEfficiencies.H"
 #include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C
index 5433816f7a..7505ed8118 100644
--- a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,12 @@ Foam::eIcoTabulatedThermo<EquationOfState>::eIcoTabulatedThermo
        .subDict("thermodynamics")
        .lookupBackwardsCompatible<scalar>({"sf", "Sf"})
     ),
-    Cv_("Cv", dict.subDict("thermodynamics").subDict("Cv"))
+    Cv_
+    (
+        "Cv",
+        {dimTemperature, dimSpecificHeatCapacity},
+        dict.subDict("thermodynamics").subDict("Cv")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
index 0ab2cbccf2..ea32b42046 100644
--- a/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,12 +51,23 @@ Foam::eTabulatedThermo<EquationOfState>::eTabulatedThermo
     es_
     (
         "es",
+        {dimPressure, dimTemperature, dimEnergy/dimMass},
         dict
        .subDict("thermodynamics")
        .subDictBackwardsCompatible({"es", "Es"})
     ),
-    Cp_("Cp", dict.subDict("thermodynamics").subDict("Cp")),
-    Cv_("Cv", dict.subDict("thermodynamics").subDict("Cv"))
+    Cp_
+    (
+        "Cp",
+        {dimPressure, dimTemperature, dimSpecificHeatCapacity},
+        dict.subDict("thermodynamics").subDict("Cp")
+    ),
+    Cv_
+    (
+        "Cv",
+        {dimPressure, dimTemperature, dimSpecificHeatCapacity},
+        dict.subDict("thermodynamics").subDict("Cv")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C
index 6563c518b4..6ab6d13a8a 100644
--- a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,12 @@ Foam::hIcoTabulatedThermo<EquationOfState>::hIcoTabulatedThermo
        .subDict("thermodynamics")
        .lookupBackwardsCompatible<scalar>({"sf", "Sf"})
     ),
-    Cp_("Cp", dict.subDict("thermodynamics").subDict("Cp"))
+    Cp_
+    (
+        "Cp",
+        {dimTemperature, dimSpecificHeatCapacity},
+        dict.subDict("thermodynamics").subDict("Cp")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
index de60fec7b0..582cbabeda 100644
--- a/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,12 +51,23 @@ Foam::hTabulatedThermo<EquationOfState>::hTabulatedThermo
     hs_
     (
         "hs",
+        {dimPressure, dimTemperature, dimEnergy/dimMass},
         dict
        .subDict("thermodynamics")
        .subDictBackwardsCompatible({"hs", "Hs"})
     ),
-    Cp_("Cp", dict.subDict("thermodynamics").subDict("Cp")),
-    Cv_("Cv", dict.subDict("thermodynamics").subDict("Cv"))
+    Cp_
+    (
+        "Cp",
+        {dimPressure, dimTemperature, dimSpecificHeatCapacity},
+        dict.subDict("thermodynamics").subDict("Cp")
+    ),
+    Cv_
+    (
+        "Cv",
+        {dimPressure, dimTemperature, dimSpecificHeatCapacity},
+        dict.subDict("thermodynamics").subDict("Cv")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C
index f5118d3001..8a464a598e 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,7 @@ Foam::Function2s::APIdiffCoef::APIdiffCoef
 Foam::Function2s::APIdiffCoef::APIdiffCoef
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -71,12 +72,18 @@ Foam::Function2s::APIdiffCoef::APIdiffCoef
     wa_(dict.lookup<scalar>("wa")),
     alpha_(sqrt(1/wf_ + 1/wa_)),
     beta_(sqr((cbrt(a_) + cbrt(b_))))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::Function2s::APIdiffCoef::write(Ostream& os) const
+void Foam::Function2s::APIdiffCoef::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.H b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.H
index b48d483dbb..0e3c61b237 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.H
@@ -58,10 +58,10 @@ class APIdiffCoef
     // Private Data
 
         // API vapour mass diffusivity function coefficients
-        const scalar a_, b_, wf_, wa_;
+        scalar a_, b_, wf_, wa_;
 
         // Helper variables
-        const scalar alpha_, beta_;
+        scalar alpha_, beta_;
 
 
 public:
@@ -86,6 +86,7 @@ public:
         APIdiffCoef
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -117,7 +118,7 @@ public:
         }
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C
index ae042cd168..c29ccf38df 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,6 +63,7 @@ Foam::Function1s::NSRDS0::NSRDS0
 Foam::Function1s::NSRDS0::NSRDS0
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -73,7 +74,9 @@ Foam::Function1s::NSRDS0::NSRDS0
     d_(dict.lookup<scalar>("d")),
     e_(dict.lookup<scalar>("e")),
     f_(dict.lookup<scalar>("f"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -107,7 +110,11 @@ Foam::Function1s::NSRDS0 Foam::Function1s::NSRDS0::integral
 }
 
 
-void Foam::Function1s::NSRDS0::write(Ostream& os) const
+void Foam::Function1s::NSRDS0::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.H
index 10d793a7ce..08ddcf33a6 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,6 +101,7 @@ public:
         NSRDS0
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -129,7 +130,7 @@ public:
         NSRDS0 integral(const word& name, const scalar a) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C
index c8634858d6..87a0de0bcc 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,7 @@ Foam::Function1s::NSRDS1::NSRDS1
 Foam::Function1s::NSRDS1::NSRDS1
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -70,7 +71,9 @@ Foam::Function1s::NSRDS1::NSRDS1
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d")),
     e_(dict.lookup<scalar>("e"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -86,7 +89,11 @@ Foam::scalar Foam::Function1s::NSRDS1::integral
 }
 
 
-void Foam::Function1s::NSRDS1::write(Ostream& os) const
+void Foam::Function1s::NSRDS1::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.H
index fa55baf293..5267fe3a78 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,6 +100,7 @@ public:
         NSRDS1
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -122,7 +123,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C
index e839f8f3f3..2f044f7d3a 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,7 @@ Foam::Function1s::NSRDS14::NSRDS14
 Foam::Function1s::NSRDS14::NSRDS14
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -70,7 +71,9 @@ Foam::Function1s::NSRDS14::NSRDS14
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -86,7 +89,11 @@ Foam::scalar Foam::Function1s::NSRDS14::integral
 }
 
 
-void Foam::Function1s::NSRDS14::write(Ostream& os) const
+void Foam::Function1s::NSRDS14::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "Tc", Tc_);
     writeEntry(os, "a", a_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.H
index 87fac7df7d..97de89d774 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,6 +100,7 @@ public:
         NSRDS14
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -130,7 +131,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C
index 1fc27c27f9..77f91ff984 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,6 +59,7 @@ Foam::Function1s::NSRDS2::NSRDS2
 Foam::Function1s::NSRDS2::NSRDS2
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -67,7 +68,9 @@ Foam::Function1s::NSRDS2::NSRDS2
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -83,7 +86,11 @@ Foam::scalar Foam::Function1s::NSRDS2::integral
 }
 
 
-void Foam::Function1s::NSRDS2::write(Ostream& os) const
+void Foam::Function1s::NSRDS2::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.H
index f637d072d0..dca1b3ca61 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,6 +99,7 @@ public:
         NSRDS2
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -121,7 +122,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C
index 44d2ed737a..fe2a9fd399 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,6 +59,7 @@ Foam::Function1s::NSRDS3::NSRDS3
 Foam::Function1s::NSRDS3::NSRDS3
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -67,7 +68,9 @@ Foam::Function1s::NSRDS3::NSRDS3
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -83,7 +86,11 @@ Foam::scalar Foam::Function1s::NSRDS3::integral
 }
 
 
-void Foam::Function1s::NSRDS3::write(Ostream& os) const
+void Foam::Function1s::NSRDS3::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.H
index 99282a2a09..2c69ad58b9 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,6 +99,7 @@ public:
         NSRDS3
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -121,7 +122,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C
index 1095d6d080..80f3556439 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,7 @@ Foam::Function1s::NSRDS4::NSRDS4
 Foam::Function1s::NSRDS4::NSRDS4
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -70,7 +71,9 @@ Foam::Function1s::NSRDS4::NSRDS4
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d")),
     e_(dict.lookup<scalar>("e"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -86,7 +89,11 @@ Foam::scalar Foam::Function1s::NSRDS4::integral
 }
 
 
-void Foam::Function1s::NSRDS4::write(Ostream& os) const
+void Foam::Function1s::NSRDS4::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.H
index d785dcd648..c7c62a748b 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,6 +100,7 @@ public:
         NSRDS4
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -122,7 +123,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C
index 5a276ff358..ca34cd4997 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,6 +59,7 @@ Foam::Function1s::NSRDS5::NSRDS5
 Foam::Function1s::NSRDS5::NSRDS5
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -67,7 +68,9 @@ Foam::Function1s::NSRDS5::NSRDS5
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -83,7 +86,11 @@ Foam::scalar Foam::Function1s::NSRDS5::integral
 }
 
 
-void Foam::Function1s::NSRDS5::write(Ostream& os) const
+void Foam::Function1s::NSRDS5::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.H
index b80f5bed00..3e1eba3d96 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,6 +99,7 @@ public:
         NSRDS5
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -121,7 +122,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C
index 0c6c842468..5e50d206ff 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,6 +63,7 @@ Foam::Function1s::NSRDS6::NSRDS6
 Foam::Function1s::NSRDS6::NSRDS6
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -73,7 +74,9 @@ Foam::Function1s::NSRDS6::NSRDS6
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d")),
     e_(dict.lookup<scalar>("e"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -89,7 +92,11 @@ Foam::scalar Foam::Function1s::NSRDS6::integral
 }
 
 
-void Foam::Function1s::NSRDS6::write(Ostream& os) const
+void Foam::Function1s::NSRDS6::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "Tc", Tc_);
     writeEntry(os, "a", a_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.H
index 05a6525c04..de1a1069ea 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,6 +101,7 @@ public:
         NSRDS6
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -124,7 +125,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C
index dbf73c8762..0606ce4851 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,7 @@ Foam::Function1s::NSRDS7::NSRDS7
 Foam::Function1s::NSRDS7::NSRDS7
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
@@ -70,7 +71,9 @@ Foam::Function1s::NSRDS7::NSRDS7
     c_(dict.lookup<scalar>("c")),
     d_(dict.lookup<scalar>("d")),
     e_(dict.lookup<scalar>("e"))
-{}
+{
+    assertNoConvertUnits(typeName, units, dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -86,7 +89,11 @@ Foam::scalar Foam::Function1s::NSRDS7::integral
 }
 
 
-void Foam::Function1s::NSRDS7::write(Ostream& os) const
+void Foam::Function1s::NSRDS7::write
+(
+    Ostream& os,
+    const unitConversions& units
+) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.H
index f73cf321b0..4fa23d70a9 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,6 +100,7 @@ public:
         NSRDS7
         (
             const word& name,
+            const unitConversions& units,
             const dictionary& dict
         );
 
@@ -122,7 +123,7 @@ public:
         virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C
index 0afddd97cb..fb5fe4fb2f 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,13 +43,16 @@ namespace Function1s
 Foam::Function1s::integratedNonUniformTable::integratedNonUniformTable
 (
     const word& name,
+    const unitConversions& units,
     const dictionary& dict
 )
 :
-    NonUniformTable<scalar>(name, dict),
+    NonUniformTable<scalar>(name, units, dict),
     intf_(values().size()),
     intfByT_(values().size())
 {
+    assertNoConvertUnits(typeName, units, dict);
+
     intf_[0] = 0;
     intfByT_[0] = 0;
 
@@ -107,10 +110,11 @@ Foam::scalar Foam::Function1s::integratedNonUniformTable::intfByTdT
 
 void Foam::Function1s::integratedNonUniformTable::write
 (
-    Ostream& os
+    Ostream& os,
+    const unitConversions& units
 ) const
 {
-    NonUniformTable<scalar>::write(os);
+    NonUniformTable<scalar>::write(os, units);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.H b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.H
index 4d50546dc4..cd8e045ba3 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,12 @@ public:
     // Constructors
 
         //- Construct from entry name and dictionary
-        integratedNonUniformTable(const word& name, const dictionary& dict);
+        integratedNonUniformTable
+        (
+            const word& name,
+            const unitConversions& units,
+            const dictionary& dict
+        );
 
 
     // Member Functions
@@ -103,7 +108,7 @@ public:
         scalar intfByTdT(scalar T) const;
 
         //- Write the function coefficients
-        void write(Ostream& os) const;
+        void write(Ostream& os, const unitConversions& units) const;
 };
 
 
diff --git a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C
index eb36ab7825..8cbfe65e49 100644
--- a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C
+++ b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,8 +36,18 @@ Foam::icoTabulatedTransport<Thermo>::icoTabulatedTransport
 )
 :
     Thermo(name, dict),
-    mu_("mu", dict.subDict("transport").subDict("mu")),
-    kappa_("kappa", dict.subDict("transport").subDict("kappa"))
+    mu_
+    (
+        "mu",
+        {dimTemperature, dimDynamicViscosity},
+        dict.subDict("transport").subDict("mu")
+    ),
+    kappa_
+    (
+        "kappa",
+        {dimTemperature, dimThermalConductivity},
+        dict.subDict("transport").subDict("kappa")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C b/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C
index 9b704d4b36..4eaaa87bd8 100644
--- a/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C
+++ b/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,8 +36,18 @@ Foam::tabulatedTransport<Thermo>::tabulatedTransport
 )
 :
     Thermo(name, dict),
-    mu_("mu", dict.subDict("transport").subDict("mu")),
-    kappa_("kappa", dict.subDict("transport").subDict("kappa"))
+    mu_
+    (
+        "mu",
+        {dimPressure, dimTemperature, dimDynamicViscosity},
+        dict.subDict("transport").subDict("mu")
+    ),
+    kappa_
+    (
+        "kappa",
+        {dimPressure, dimTemperature, dimThermalConductivity},
+        dict.subDict("transport").subDict("kappa")
+    )
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
index decea7b571..7f39889019 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,18 +44,19 @@ namespace Foam
 Foam::autoPtr<Foam::Function1<Foam::scalar>> Foam::liquid::New
 (
     const word& name,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 {
     if (dict.isDict(name))
     {
-        return Function1<scalar>::New(name, dict);
+        return Function1<scalar>::New(name, {dimTemperature, dims}, dict);
     }
     else
     {
         return autoPtr<Function1<scalar>>
         (
-            new Function1s::None<scalar>(name, dict)
+            new Function1s::None<scalar>(name, {dimTemperature, dims}, dict)
         );
     }
 }
@@ -66,19 +67,19 @@ Foam::autoPtr<Foam::Function1<Foam::scalar>> Foam::liquid::New
 Foam::liquid::liquid(const dictionary& dict)
 :
     liquidProperties(dict),
-    rho_(New("rho", dict)),
-    pv_(New("pv", dict)),
-    hl_(New("hl", dict)),
-    Cp_(New("Cp", dict)),
-    h_(New("h", dict)),
-    Cpg_(New("Cpg", dict)),
-    B_(New("B", dict)),
-    mu_(New("mu", dict)),
-    mug_(New("mug", dict)),
-    kappa_(New("kappa", dict)),
-    kappag_(New("kappag", dict)),
-    sigma_(New("sigma", dict)),
-    D_(New("D", dict)),
+    rho_(New("rho", dimDensity, dict)),
+    pv_(New("pv", dimPressure, dict)),
+    hl_(New("hl", dimEnergy/dimMass, dict)),
+    Cp_(New("Cp", dimSpecificHeatCapacity, dict)),
+    h_(New("h", dimEnergy/dimMass, dict)),
+    Cpg_(New("Cpg", dimSpecificHeatCapacity, dict)),
+    B_(New("B", dimVolume/dimMass, dict)),
+    mu_(New("mu", dimDynamicViscosity, dict)),
+    mug_(New("mug", dimDynamicViscosity, dict)),
+    kappa_(New("kappa", dimThermalConductivity, dict)),
+    kappag_(New("kappag", dimThermalConductivity, dict)),
+    sigma_(New("sigma", dimForce/dimLength, dict)),
+    D_(New("D", dimArea/dimTime, dict)),
     hf_(h_->value(Tstd))
 {}
 
@@ -108,20 +109,7 @@ Foam::liquid::liquid(const liquid& lm)
 
 void Foam::liquid::write(Ostream& os) const
 {
-    liquidProperties::write(os); os << nl;
-    rho_->write(os); os << nl;
-    pv_->write(os); os << nl;
-    hl_->write(os); os << nl;
-    Cp_->write(os); os << nl;
-    h_->write(os); os << nl;
-    Cpg_->write(os); os << nl;
-    B_->write(os); os << nl;
-    mu_->write(os); os << nl;
-    mug_->write(os); os << nl;
-    kappa_->write(os); os << nl;
-    kappag_->write(os); os << nl;
-    sigma_->write(os); os << nl;
-    D_->write(os); os << endl;
+    liquidProperties::write(*this, os);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H
index 2f4eaf70e8..27e082a112 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,6 +77,7 @@ class liquid
         autoPtr<Function1<scalar>> New
         (
             const word& name,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
index d7144dc824..de6d57fd05 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,12 +36,16 @@ SourceFiles
 #define liquidProperties_H
 
 #include "thermophysicalProperties.H"
+#include "dimensionSets.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+template<class> class Function1;
+template<class> class Function2;
+
 // Forward declaration of friend functions and operators
 class liquidProperties;
 Ostream& operator<<(Ostream& os, const liquidProperties& l);
@@ -297,7 +301,32 @@ public:
         inline void readIfPresent
         (
             Func& f,
+            const Function1<scalar>&,
             const word& name,
+            const dimensionSet& dims,
+            const dictionary& dict
+        );
+
+        //- Read and set the function coefficients
+        //  if present it the given dictionary
+        template<class Func>
+        inline void readIfPresent
+        (
+            Func& f,
+            const Function2<scalar>&,
+            const word& name,
+            const dimensionSet& dims,
+            const dictionary& dict
+        );
+
+        //- Read and set the function coefficients
+        //  if present it the given dictionary
+        template<class Func>
+        inline void readIfPresent
+        (
+            Func& f,
+            const word& name,
+            const dimensionSet& dims,
             const dictionary& dict
         );
 
@@ -309,6 +338,44 @@ public:
         //- Write the function coefficients
         virtual void write(Ostream& os) const = 0;
 
+        //- ...
+        template<class Func>
+        inline void write
+        (
+            const Func& f,
+            const Function1<scalar>&,
+            const dimensionSet& dims,
+            Ostream& os
+        ) const;
+
+        //- ...
+        template<class Func>
+        inline void write
+        (
+            const Func& f,
+            const Function2<scalar>&,
+            const dimensionSet& dims,
+            Ostream& os
+        ) const;
+
+        //- ...
+        template<class Func>
+        inline void write
+        (
+            const Func& f,
+            const dimensionSet& dims,
+            Ostream& os
+        ) const;
+
+        //- ...
+        template<class Func>
+        inline void write
+        (
+            const autoPtr<Func>& f,
+            const dimensionSet& dims,
+            Ostream& os
+        ) const;
+
         //- Write the data for each of the property functions
         template<class Liquid>
         inline void write(const Liquid& l, Ostream& os) const;
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
index 3965224d09..4cd5ac7a4d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "liquidProperties.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 inline Foam::scalar Foam::liquidProperties::limit(const scalar T) const
@@ -125,17 +127,49 @@ template<class Func>
 inline void Foam::liquidProperties::readIfPresent
 (
     Func& f,
+    const Function1<scalar>&,
     const word& name,
+    const dimensionSet& dims,
     const dictionary& dict
 )
 {
     if (dict.found(name))
     {
-        f = Func(name, dict.subDict(name));
+        f = Func(name, {dimTemperature, dims}, dict.subDict(name));
     }
 }
 
 
+template<class Func>
+inline void Foam::liquidProperties::readIfPresent
+(
+    Func& f,
+    const Function2<scalar>&,
+    const word& name,
+    const dimensionSet& dims,
+    const dictionary& dict
+)
+{
+    if (dict.found(name))
+    {
+        f = Func(name, {dimTemperature, dimPressure, dims}, dict.subDict(name));
+    }
+}
+
+
+template<class Func>
+inline void Foam::liquidProperties::readIfPresent
+(
+    Func& f,
+    const word& name,
+    const dimensionSet& dims,
+    const dictionary& dict
+)
+{
+    readIfPresent(f, f, name, dims, dict);
+}
+
+
 template<class Liquid>
 inline void Foam::liquidProperties::readIfPresent
 (
@@ -144,19 +178,69 @@ inline void Foam::liquidProperties::readIfPresent
 )
 {
     l.liquidProperties::readIfPresent(dict);
-    readIfPresent(l.rho_, "rho", dict);
-    readIfPresent(l.pv_, "pv", dict);
-    readIfPresent(l.hl_, "hl", dict);
-    readIfPresent(l.Cp_, "Cp", dict);
-    readIfPresent(l.h_, "h", dict);
-    readIfPresent(l.Cpg_, "Cpg", dict);
-    readIfPresent(l.B_, "B", dict);
-    readIfPresent(l.mu_, "mu", dict);
-    readIfPresent(l.mug_, "mug", dict);
-    readIfPresent(l.kappa_, "kappa", dict);
-    readIfPresent(l.kappag_, "kappag", dict);
-    readIfPresent(l.sigma_, "sigma", dict);
-    // readIfPresent(l.D_, "D", dict);
+    readIfPresent(l.rho_, "rho", dimDensity, dict);
+    readIfPresent(l.pv_, "pv", dimPressure, dict);
+    readIfPresent(l.hl_, "hl", dimEnergy/dimMass, dict);
+    readIfPresent(l.Cp_, "Cp", dimSpecificHeatCapacity, dict);
+    readIfPresent(l.h_, "h", dimEnergy/dimMass, dict);
+    readIfPresent(l.Cpg_, "Cpg", dimSpecificHeatCapacity, dict);
+    readIfPresent(l.B_, "B", dimVolume/dimMass, dict);
+    readIfPresent(l.mu_, "mu", dimDynamicViscosity, dict);
+    readIfPresent(l.mug_, "mug", dimDynamicViscosity, dict);
+    readIfPresent(l.kappa_, "kappa", dimThermalConductivity, dict);
+    readIfPresent(l.kappag_, "kappag", dimThermalConductivity, dict);
+    readIfPresent(l.sigma_, "sigma", dimForce/dimLength, dict);
+    readIfPresent(l.D_, "D", dimArea/dimTime, dict);
+}
+
+
+template<class Func>
+inline void Foam::liquidProperties::write
+(
+    const Func& f,
+    const Function1<scalar>&,
+    const dimensionSet& dims,
+    Ostream& os
+) const
+{
+    writeEntry(os, {dimTemperature, dims}, f);
+}
+
+
+template<class Func>
+inline void Foam::liquidProperties::write
+(
+    const Func& f,
+    const Function2<scalar>&,
+    const dimensionSet& dims,
+    Ostream& os
+) const
+{
+    writeEntry(os, {dimPressure, dimTemperature, dims}, f);
+}
+
+
+template<class Func>
+inline void Foam::liquidProperties::write
+(
+    const Func& f,
+    const dimensionSet& dims,
+    Ostream& os
+) const
+{
+    write(f, f, dims, os);
+}
+
+
+template<class Func>
+inline void Foam::liquidProperties::write
+(
+    const autoPtr<Func>& fPtr,
+    const dimensionSet& dims,
+    Ostream& os
+) const
+{
+    write(fPtr(), fPtr(), dims, os);
 }
 
 
@@ -168,19 +252,19 @@ inline void Foam::liquidProperties::write
 ) const
 {
     l.liquidProperties::write(os);
-    writeEntry(os, l.rho_);
-    writeEntry(os, l.pv_);
-    writeEntry(os, l.hl_);
-    writeEntry(os, l.Cp_);
-    writeEntry(os, l.h_);
-    writeEntry(os, l.Cpg_);
-    writeEntry(os, l.B_);
-    writeEntry(os, l.mu_);
-    writeEntry(os, l.mug_);
-    writeEntry(os,  l.kappa_);
-    writeEntry(os, l.kappag_);
-    writeEntry(os, l.sigma_);
-    writeEntry(os,  l.D_);
+    write(l.rho_, dimDensity, os);
+    write(l.pv_, dimPressure, os);
+    write(l.hl_, dimEnergy/dimMass, os);
+    write(l.Cp_, dimSpecificHeatCapacity, os);
+    write(l.h_, dimEnergy/dimMass, os);
+    write(l.Cpg_, dimSpecificHeatCapacity, os);
+    write(l.B_, dimVolume/dimMass, os);
+    write(l.mu_, dimDynamicViscosity, os);
+    write(l.mug_, dimDynamicViscosity, os);
+    write(l.kappa_, dimThermalConductivity, os);
+    write(l.kappag_, dimThermalConductivity, os);
+    write(l.sigma_, dimForce/dimLength, os);
+    write(l.D_, dimArea/dimTime, os);
 }
 
 
diff --git a/src/twoPhaseModels/interfaceProperties/contactAngle/contactAngleFvPatchScalarField.C b/src/twoPhaseModels/interfaceProperties/contactAngle/contactAngleFvPatchScalarField.C
index 3d3f66e85a..7c94055b4d 100644
--- a/src/twoPhaseModels/interfaceProperties/contactAngle/contactAngleFvPatchScalarField.C
+++ b/src/twoPhaseModels/interfaceProperties/contactAngle/contactAngleFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,14 +69,15 @@ Foam::contactAngleFvPatchScalarField::contactAngleFvPatchScalarField
 {
     if (dict.found("gradient"))
     {
-        gradient() = scalarField("gradient", dict, p.size());
+        gradient() =
+            scalarField("gradient", iF.dimensions()/dimLength, dict, p.size());
         fixedGradientFvPatchScalarField::updateCoeffs();
         fixedGradientFvPatchScalarField::evaluate();
     }
     else
     {
-        fvPatchField<scalar>::operator=(patchInternalField());
         gradient() = 0.0;
+        fvPatchField<scalar>::operator=(patchInternalField());
     }
 }
 
diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/constant/constantContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/constant/constantContactAngle.C
index 508b364f57..92fb944b85 100644
--- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/constant/constantContactAngle.C
+++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/constant/constantContactAngle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "constantContactAngle.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -43,7 +42,7 @@ namespace contactAngleModels
 
 Foam::contactAngleModels::constant::constant(const dictionary& dict)
 :
-    theta0_(dict.lookup<scalar>("theta0"))
+    theta0_(dict.lookup<scalar>("theta0", unitDegrees))
 {}
 
 
@@ -62,16 +61,13 @@ Foam::contactAngleModels::constant::cosTheta
     const vectorField& nHat
 ) const
 {
-    return tmp<scalarField>
-    (
-        new scalarField(Up.size(), cos(degToRad(theta0_)))
-    );
+    return tmp<scalarField>(new scalarField(Up.size(), cos(theta0_)));
 }
 
 
 void Foam::contactAngleModels::constant::write(Ostream& os) const
 {
-    writeEntry(os, "theta0", theta0_);
+    writeEntry(os, "theta0", unitDegrees, theta0_);
 }
 
 
diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C
index e06b140f9b..68280e3296 100644
--- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C
+++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dynamicContactAngle.H"
-#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -43,10 +42,10 @@ namespace contactAngleModels
 
 Foam::contactAngleModels::dynamic::dynamic(const dictionary& dict)
 :
-    theta0_(dict.lookup<scalar>("theta0")),
-    uTheta_(dict.lookup<scalar>("uTheta")),
-    thetaAdv_(dict.lookup<scalar>("thetaAdv")),
-    thetaRec_(dict.lookup<scalar>("thetaRec"))
+    theta0_(dict.lookup<scalar>("theta0", unitDegrees)),
+    uTheta_(dict.lookup<scalar>("uTheta", dimVelocity)),
+    thetaAdv_(dict.lookup<scalar>("thetaAdv", unitDegrees)),
+    thetaRec_(dict.lookup<scalar>("thetaRec", unitDegrees))
 {}
 
 
@@ -81,19 +80,19 @@ Foam::contactAngleModels::dynamic::cosTheta
 
     return cos
     (
-        degToRad(theta0_)
-      + degToRad(thetaRec_ - theta0_)*max(uCoeff, scalar(0))
-      - degToRad(thetaAdv_ - theta0_)*min(uCoeff, scalar(0))
+        theta0_
+      + thetaRec_ - theta0_*max(uCoeff, scalar(0))
+      - thetaAdv_ - theta0_*min(uCoeff, scalar(0))
     );
 }
 
 
 void Foam::contactAngleModels::dynamic::write(Ostream& os) const
 {
-    writeEntry(os, "theta0", theta0_);
-    writeEntry(os, "uTheta", uTheta_);
-    writeEntry(os, "thetaAdv", thetaAdv_);
-    writeEntry(os, "thetaRec", thetaRec_);
+    writeEntry(os, "theta0", unitDegrees, theta0_);
+    writeEntry(os, "uTheta", dimVelocity, uTheta_);
+    writeEntry(os, "thetaAdv", unitDegrees, thetaAdv_);
+    writeEntry(os, "thetaRec", unitDegrees, thetaRec_);
 }
 
 
diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C
index 4f85758e57..9ab5ea66ff 100644
--- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C
+++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "gravitationalContactAngle.H"
-#include "unitConversion.H"
 #include "uniformDimensionedFields.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -44,10 +43,10 @@ namespace contactAngleModels
 
 Foam::contactAngleModels::gravitational::gravitational(const dictionary& dict)
 :
-    theta0_(dict.lookup<scalar>("theta0")),
-    gTheta_(dict.lookup<scalar>("gTheta")),
-    thetaAdv_(dict.lookup<scalar>("thetaAdv")),
-    thetaRec_(dict.lookup<scalar>("thetaRec"))
+    theta0_(dict.lookup<scalar>("theta0", unitDegrees)),
+    gTheta_(dict.lookup<scalar>("gTheta", dimAcceleration)),
+    thetaAdv_(dict.lookup<scalar>("thetaAdv", unitDegrees)),
+    thetaRec_(dict.lookup<scalar>("thetaRec", unitDegrees))
 {}
 
 
@@ -82,10 +81,10 @@ Foam::contactAngleModels::gravitational::cosTheta
 
 void Foam::contactAngleModels::gravitational::write(Ostream& os) const
 {
-    writeEntry(os, "theta0", theta0_);
-    writeEntry(os, "gTheta", gTheta_);
-    writeEntry(os, "thetaAdv", thetaAdv_);
-    writeEntry(os, "thetaRec", thetaRec_);
+    writeEntry(os, "theta0", unitDegrees, theta0_);
+    writeEntry(os, "gTheta", dimAcceleration, gTheta_);
+    writeEntry(os, "thetaAdv", unitDegrees, thetaAdv_);
+    writeEntry(os, "thetaRec", unitDegrees, thetaRec_);
 }
 
 
diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/temperatureDependent/temperatureDependentContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/temperatureDependent/temperatureDependentContactAngle.C
index a5f4b810d9..e2cc48eb05 100644
--- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/temperatureDependent/temperatureDependentContactAngle.C
+++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/temperatureDependent/temperatureDependentContactAngle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ Foam::contactAngleModels::temperatureDependent::temperatureDependent
 )
 :
     TName_(dict.lookupOrDefault<word>("T", "T")),
-    theta0_(Function1<scalar>::New("theta0", dict))
+    theta0_(Function1<scalar>::New("theta0", dimTemperature, unitDegrees, dict))
 {}
 
 
@@ -71,16 +71,14 @@ Foam::contactAngleModels::temperatureDependent::cosTheta
     const vectorField& nHat
 ) const
 {
-    return cos
-    (
-        degToRad
+    return
+        cos
         (
             theta0_->value
             (
                 Up.patch().lookupPatchField<volScalarField, scalar>(TName_)
             )
-        )
-    );
+        );
 }
 
 
diff --git a/src/twoPhaseModels/interfaceProperties/interfaceProperties.C b/src/twoPhaseModels/interfaceProperties/interfaceProperties.C
index 7802455114..f22cf1fd09 100644
--- a/src/twoPhaseModels/interfaceProperties/interfaceProperties.C
+++ b/src/twoPhaseModels/interfaceProperties/interfaceProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "interfaceProperties.H"
 #include "contactAngleFvPatchScalarField.H"
-#include "unitConversion.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
 #include "fvcGrad.H"
diff --git a/src/twoPhaseModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/twoPhaseModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
index 1009dcfc77..cf8b7a2a30 100644
--- a/src/twoPhaseModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
+++ b/src/twoPhaseModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
@@ -54,7 +54,16 @@ Foam::surfaceTensionModels::temperatureDependent::temperatureDependent
 :
     surfaceTensionModel(mesh),
     TName_(dict.lookupOrDefault<word>("T", "T")),
-    sigma_(Function1<scalar>::New("sigma", dict))
+    sigma_
+    (
+        Function1<scalar>::New
+        (
+            "sigma",
+            dimTemperature,
+            dimForce/dimLength,
+            dict
+        )
+    )
 {}
 
 
@@ -99,7 +108,14 @@ bool Foam::surfaceTensionModels::temperatureDependent::readDict
     const dictionary& sigmaDict = surfaceTensionModel::sigmaDict(dict);
 
     TName_ = sigmaDict.lookupOrDefault<word>("T", "T");
-    sigma_ = Function1<scalar>::New("sigma", sigmaDict);
+    sigma_ =
+        Function1<scalar>::New
+        (
+            "sigma",
+            dimTemperature,
+            dimForce/dimLength,
+            sigmaDict
+        );
 
     return true;
 }
diff --git a/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index 898dee65fe..13c6ed7188 100644
--- a/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/twoPhaseModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,13 +41,13 @@ alphaFixedPressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict, false),
-    p_("p", dict, p.size())
+    p_("p", dimPressure, dict, p.size())
 {
     if (dict.found("value"))
     {
         fvPatchField<scalar>::operator=
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
diff --git a/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C b/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
index 79605b76d6..1eaa809cc2 100644
--- a/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
+++ b/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
     {
         fixedValueInletOutletFvPatchField<scalar>::operator==
         (
-            scalarField("value", dict, p.size())
+            scalarField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -172,9 +172,7 @@ void Foam::waveAlphaFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const scalar t = db().time().userTimeValue();
-
-    operator==(alpha(t));
+    operator==(alpha(db().time().value()));
 
     fixedValueInletOutletFvPatchField<scalar>::updateCoeffs();
 }
diff --git a/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C b/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C
index 4c76a32aaf..5d70186e3d 100644
--- a/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C
+++ b/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,13 +42,34 @@ Foam::waveInletOutletFvPatchField<Type>::waveInletOutletFvPatchField
 )
 :
     mixedFvPatchField<Type>(p, iF, dict, false),
-    inletValueAbove_(Function1<Type>::New("inletValueAbove", dict)),
-    inletValueBelow_(Function1<Type>::New("inletValueBelow", dict)),
+    inletValueAbove_
+    (
+        Function1<Type>::New
+        (
+            "inletValueAbove",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    ),
+    inletValueBelow_
+    (
+        Function1<Type>::New
+        (
+            "inletValueBelow",
+            this->db().time().userUnits(),
+            iF.dimensions(),
+            dict
+        )
+    ),
     phiName_(dict.lookupOrDefault<word>("phi", "phi"))
 {
     if (dict.found("value"))
     {
-        fvPatchField<Type>::operator=(Field<Type>("value", dict, p.size()));
+        fvPatchField<Type>::operator=
+        (
+            Field<Type>("value", iF.dimensions(), dict, p.size())
+        );
     }
     else
     {
@@ -107,7 +128,8 @@ void Foam::waveInletOutletFvPatchField<Type>::updateCoeffs()
             phiName_
         );
 
-    const scalar t = this->db().time().userTimeValue();
+    const scalar t = this->db().time().value();
+
     const waveSuperposition& waves = waveSuperposition::New(this->db());
 
     const pointField& localPoints = this->patch().patch().localPoints();
@@ -134,8 +156,20 @@ template<class Type>
 void Foam::waveInletOutletFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    writeEntry(os, inletValueAbove_());
-    writeEntry(os, inletValueBelow_());
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        inletValueAbove_()
+    );
+    writeEntry
+    (
+        os,
+        this->db().time().userUnits(),
+        this->internalField().dimensions(),
+        inletValueBelow_()
+    );
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
 }
 
diff --git a/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
index da9de239a8..1257736b71 100644
--- a/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
+++ b/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
     {
         fixedValueInletOutletFvPatchField<vector>::operator==
         (
-            vectorField("value", dict, p.size())
+            vectorField("value", iF.dimensions(), dict, p.size())
         );
     }
     else
@@ -175,9 +175,7 @@ void Foam::waveVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const scalar t = db().time().userTimeValue();
-
-    operator==(U(t));
+    operator==(U(db().time().value()));
 
     fixedValueInletOutletFvPatchField<vector>::updateCoeffs();
 }
diff --git a/src/waves/fvModels/forcing/forcing.C b/src/waves/fvModels/forcing/forcing.C
index 23c614f697..8c62047d09 100644
--- a/src/waves/fvModels/forcing/forcing.C
+++ b/src/waves/fvModels/forcing/forcing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ void Foam::fv::forcing::readCoeffs()
 
     if (foundAll)
     {
-        scale_ = Function1<scalar>::New("scale", coeffs());
+        scale_ = Function1<scalar>::New("scale", dimLength, dimless, coeffs());
         if (foundOgn)
         {
             origins_.setSize(1);
@@ -145,15 +145,7 @@ Foam::dimensionedScalar Foam::fv::forcing::regionLength() const
           & directions_[i]
         );
 
-        const volScalarField scale
-        (
-            evaluate
-            (
-                *scale_,
-                dimless,
-                x
-            )
-        );
+        const volScalarField scale(evaluate(*scale_, dimless, x));
 
         vs += fvc::domainIntegrate(scale);
         vgrads += fvc::domainIntegrate(directions_[i] & fvc::grad(scale));
diff --git a/src/waves/waveModels/Airy/Airy.C b/src/waves/waveModels/Airy/Airy.C
index 830c420d5b..288c371078 100644
--- a/src/waves/waveModels/Airy/Airy.C
+++ b/src/waves/waveModels/Airy/Airy.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::waveModels::Airy::Airy
 :
     waveModel(dict, g),
     depth_(dict.lookupOrDefault<scalar>("depth", great)),
-    amplitude_(Function1<scalar>::New("amplitude", dict)),
+    amplitude_(Function1<scalar>::New("amplitude", dimTime, dimLength, dict)),
     length_(readLength(dict, depth_, amplitude(), g, celerityPtr)),
     phase_(dict.lookup<scalar>("phase"))
 {
diff --git a/src/waves/waveSuperpositions/waveSuperposition/waveSuperposition.C b/src/waves/waveSuperpositions/waveSuperposition/waveSuperposition.C
index 5d2c4c6476..d8ad42c614 100644
--- a/src/waves/waveSuperpositions/waveSuperposition/waveSuperposition.C
+++ b/src/waves/waveSuperpositions/waveSuperposition/waveSuperposition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,21 +181,42 @@ Foam::waveSuperposition::waveSuperposition(const objectRegistry& db)
             IOobject::NO_WRITE
         )
     ),
-    origin_(lookup("origin")),
-    direction_(lookup("direction")),
+    origin_(lookup<vector>("origin", dimLength)),
+    direction_(lookup<vector>("direction", dimless)),
     waveModels_(),
     waveAngles_(),
-    UMean_(Function1<vector>::New("UMean", *this)),
+    UMean_
+    (
+        Function1<vector>::New
+        (
+            "UMean",
+            db.time().userUnits(),
+            dimVelocity,
+            *this
+        )
+    ),
     scale_
     (
         found("scale")
-      ? Function1<scalar>::New("scale", *this)
+      ? Function1<scalar>::New
+        (
+            "scale",
+            db.time().userUnits(),
+            dimless,
+            *this
+        )
       : autoPtr<Function1<scalar>>()
     ),
     crossScale_
     (
         found("crossScale")
-      ? Function1<scalar>::New("crossScale", *this)
+      ? Function1<scalar>::New
+        (
+            "crossScale",
+            db.time().userUnits(),
+            dimless,
+            *this
+        )
       : autoPtr<Function1<scalar>>()
     ),
     heightAboveWave_(lookupOrDefault<Switch>("heightAboveWave", false))
@@ -340,14 +361,14 @@ void Foam::waveSuperposition::write(Ostream& os) const
             << nl << decrIndent << indent << token::END_BLOCK << nl;
     }
     os  << decrIndent << token::END_LIST << token::END_STATEMENT << nl;
-    writeEntry(os, UMean_());
+    writeEntry(os, db().time().userUnits(), dimVelocity, UMean_());
     if (scale_.valid())
     {
-        writeEntry(os, scale_());
+        writeEntry(os, db().time().userUnits(), dimless, scale_());
     }
     if (crossScale_.valid())
     {
-        writeEntry(os, crossScale_());
+        writeEntry(os, db().time().userUnits(), dimless, crossScale_());
     }
     if (heightAboveWave_)
     {
diff --git a/tutorials/XiFluid/kivaTest/system/functions b/tutorials/XiFluid/kivaTest/system/functions
index 285d837f0c..2a754a8fcc 100644
--- a/tutorials/XiFluid/kivaTest/system/functions
+++ b/tutorials/XiFluid/kivaTest/system/functions
@@ -16,27 +16,21 @@ FoamFile
 
 setDeltaT
 {
-    type coded;
-
-    // Load the library containing the 'coded' functionObject
     libs            ("libutilityFunctionObjects.so");
 
-    codeInclude
-    #{
-        #include "volFields.H"
-    #};
+    type            setTimeStep;
 
-    codeExecute
-    #{
-        const Time& runTime = mesh().time();
-        if (runTime.userTimeValue() >= -15.0)
-        {
-            const_cast<Time&>(runTime).setDeltaT
-            (
-                runTime.userTimeToTime(0.025)
-            );
-        }
-    #};
+    deltaT
+    {
+        type            table;
+        values
+        (
+            (-180 0.25)
+            (-15 0.025)
+        );
+        interpolationScheme step;
+        outOfBounds     clamp;
+    }
 }
 
 #includeFunc multiValveEngineState
diff --git a/tutorials/fluid/engine2Valve2D/0/p b/tutorials/fluid/engine2Valve2D/0/p
index 6594cff94c..20e84a4d17 100644
--- a/tutorials/fluid/engine2Valve2D/0/p
+++ b/tutorials/fluid/engine2Valve2D/0/p
@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 1e5;
+internalField   uniform 1 [bar];
 
 boundaryField
 {
@@ -27,16 +27,15 @@ boundaryField
         type            uniformTotalPressure;
         p0
         {
-            type    tableFile;
-            format  csv;
-            file                "constant/expData/pInlet";
-            nHeaderLine         2;          // Number of header lines
-            refColumn           0;          // Reference column index
-            separator           " ";        // Optional (defaults to ",")
-            componentColumns    (1);        // Component column indices
-            mergeSeparators     yes;        // Merge multiple separators
-            // For multi-cycle simulations, use repeat
-            outOfBounds     repeat;
+            type            table;
+            format          csv;
+            file            "constant/expData/pInlet";
+            nHeaderLine     2;          // Number of header lines
+            units           ([CAD] [bar]);
+            columns         (0 1);      // Column indices
+            separator       " ";        // Optional (defaults to ",")
+            mergeSeparators yes;        // Merge multiple separators
+            outOfBounds     repeat;     // For multi-cycle simulations, use repeat
             interpolationScheme linear;
         }
         value           $internalField;
@@ -48,19 +47,21 @@ boundaryField
     outlet
     {
         type            uniformTotalPressure;
-        p0              table
-        (
-            (0      1.0e5)
-            (100    1.0e5)
-            (240    1.7e5)
-            (380    1.0e5)
-            (720    1.0e5)
-        );
-
-        // For multi-cycle simulations, use repeat
-        outOfBounds     repeat;
-        interpolationScheme linear;
-
+        p0
+        {
+            type            table;
+            units           ([CAD] [bar]);
+            values
+            (
+                (0      1.0)
+                (100    1.0)
+                (240    1.7)
+                (380    1.0)
+                (720    1.0)
+            );
+            outOfBounds     repeat;     // For multi-cycle simulations, use repeat
+            interpolationScheme linear;
+        }
         value           $internalField;
         psi             psi;
         rho             rho;
diff --git a/tutorials/fluid/engine2Valve2D/constant/expData/pInlet b/tutorials/fluid/engine2Valve2D/constant/expData/pInlet
index b6d25f9a02..b80afd9d69 100644
--- a/tutorials/fluid/engine2Valve2D/constant/expData/pInlet
+++ b/tutorials/fluid/engine2Valve2D/constant/expData/pInlet
@@ -1,7 +1,7 @@
 # Intake pressure profile
-#CAD    Pa
-0       1.0e5
-340     1.5e5
-480     1.6e5
-620     1.5e5
-720     1.0e5
+#CAD    bar
+0       1.0
+340     1.5
+480     1.6
+620     1.5
+720     1.0
diff --git a/tutorials/fluid/engine2Valve2D/system/blockMeshDict b/tutorials/fluid/engine2Valve2D/system/blockMeshDict.orig
similarity index 100%
rename from tutorials/fluid/engine2Valve2D/system/blockMeshDict
rename to tutorials/fluid/engine2Valve2D/system/blockMeshDict.orig
diff --git a/tutorials/fluid/helmholtzResonance/0/T b/tutorials/fluid/helmholtzResonance/0/T
index 99c904fc42..390f89fcb0 100644
--- a/tutorials/fluid/helmholtzResonance/0/T
+++ b/tutorials/fluid/helmholtzResonance/0/T
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 0 0 1 0 0 0];
+dimensions      [temperature];
 
 internalField   uniform 300;
 
@@ -23,14 +23,14 @@ boundaryField
     inlet
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
 
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     symmetry
@@ -41,13 +41,13 @@ boundaryField
     wall
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
 
     plenum
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/fluid/helmholtzResonance/0/U b/tutorials/fluid/helmholtzResonance/0/U
index 8252f23910..da9fc9b156 100644
--- a/tutorials/fluid/helmholtzResonance/0/U
+++ b/tutorials/fluid/helmholtzResonance/0/U
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 1 -1 0 0 0 0];
+dimensions      [velocity];
 
 internalField   uniform (0 0 0);
 
@@ -23,15 +23,15 @@ boundaryField
     inlet
     {
         type            flowRateInletVelocity;
-        massFlowRate    0.0001;
-        value           uniform (0 0 0);
+        massFlowRate    0.1 [g/s];
+        value           $internalField;
     }
 
     outlet
     {
         type            pressureInletOutletVelocity;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     symmetry
@@ -42,13 +42,13 @@ boundaryField
     wall
     {
         type            fixedValue;
-        value           uniform (0 0 0);
+        value           $internalField;
     }
 
     plenum
     {
         type            pressureInletVelocity;
-        value           uniform (0 0 0);
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/fluid/helmholtzResonance/0/p b/tutorials/fluid/helmholtzResonance/0/p
index 7a34cf94d1..7045a60ad5 100644
--- a/tutorials/fluid/helmholtzResonance/0/p
+++ b/tutorials/fluid/helmholtzResonance/0/p
@@ -14,9 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -2 0 0 0 0];
+dimensions      [pressure];
 
-internalField   uniform 1e5;
+internalField   uniform 1 [bar];
 
 boundaryField
 {
@@ -28,8 +28,8 @@ boundaryField
     outlet
     {
         type            fixedMean;
-        meanValue       constant 1e5;
-        value           uniform 1e5;
+        meanValue       constant 1 [bar];
+        value           $internalField;
     }
 
     symmetry
@@ -47,15 +47,15 @@ boundaryField
         type            plenumPressure;
         gamma           1.4;
         R               287.04;
-        supplyMassFlowRate 0.0001;
+        supplyMassFlowRate 0.1 [g/s];
         supplyTotalTemperature 300;
-        plenumVolume    0.000125;
+        plenumVolume    0.125 [l];
         plenumDensity   1.1613;
         plenumTemperature 300;
-        inletAreaRatio  1.0;
-        inletDischargeCoefficient 0.8;
+        inletAreaRatio  100 [%];
+        inletDischargeCoefficient 80 [%];
         timeScale       1e-4;
-        value           uniform 1e5;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/incompressibleFluid/TJunctionFan/0/U.orig b/tutorials/incompressibleFluid/TJunctionFan/0/U.orig
index 9d38364444..55f5f0addf 100644
--- a/tutorials/incompressibleFluid/TJunctionFan/0/U.orig
+++ b/tutorials/incompressibleFluid/TJunctionFan/0/U.orig
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [m s^-1];
+dimensions      [velocity];
 
 internalField   uniform (0 0 0);
 
diff --git a/tutorials/incompressibleFluid/TJunctionFan/0/epsilon.orig b/tutorials/incompressibleFluid/TJunctionFan/0/epsilon.orig
index 6e745a0516..25298515af 100644
--- a/tutorials/incompressibleFluid/TJunctionFan/0/epsilon.orig
+++ b/tutorials/incompressibleFluid/TJunctionFan/0/epsilon.orig
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [m^2 s^-3];
+dimensions      [energy/mass/time];
 
 internalField   uniform 200;
 
diff --git a/tutorials/incompressibleFluid/TJunctionFan/0/k.orig b/tutorials/incompressibleFluid/TJunctionFan/0/k.orig
index 8813c60338..07feded95b 100644
--- a/tutorials/incompressibleFluid/TJunctionFan/0/k.orig
+++ b/tutorials/incompressibleFluid/TJunctionFan/0/k.orig
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [m^2 s^-2];
+dimensions      [energy/mass];
 
 internalField   uniform 0.375;
 
diff --git a/tutorials/incompressibleFluid/TJunctionFan/0/nuTilda.orig b/tutorials/incompressibleFluid/TJunctionFan/0/nuTilda.orig
index 1d7670eb3d..239ed194e8 100644
--- a/tutorials/incompressibleFluid/TJunctionFan/0/nuTilda.orig
+++ b/tutorials/incompressibleFluid/TJunctionFan/0/nuTilda.orig
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [m^2 s^-1];
+dimensions      [kinematicViscosity];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressibleFluid/TJunctionFan/0/nut.orig b/tutorials/incompressibleFluid/TJunctionFan/0/nut.orig
index ba8e18427d..03749f046f 100644
--- a/tutorials/incompressibleFluid/TJunctionFan/0/nut.orig
+++ b/tutorials/incompressibleFluid/TJunctionFan/0/nut.orig
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [m^2 s^-1];
+dimensions      [kinematicViscosity];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressibleFluid/TJunctionFan/0/p.orig b/tutorials/incompressibleFluid/TJunctionFan/0/p.orig
index 3bff82e7ae..eb9af5ab69 100644
--- a/tutorials/incompressibleFluid/TJunctionFan/0/p.orig
+++ b/tutorials/incompressibleFluid/TJunctionFan/0/p.orig
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [m^2 s^-2];
+dimensions      [kinematicPressure];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressibleFluid/planarPoiseuille/0/sigma b/tutorials/incompressibleFluid/planarPoiseuille/0/sigma
index d87ca64b23..82faab5c89 100644
--- a/tutorials/incompressibleFluid/planarPoiseuille/0/sigma
+++ b/tutorials/incompressibleFluid/planarPoiseuille/0/sigma
@@ -27,5 +27,4 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/WatersKing.C b/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/WatersKing.C
index 098ab4ae2e..4ae61bd470 100644
--- a/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/WatersKing.C
+++ b/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/WatersKing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-
 #include "argList.H"
 #include "viscosityModel.H"
 #include "incompressibleMomentumTransportModel.H"
@@ -107,7 +106,7 @@ int main(int argc, char *argv[])
     const scalar LOGvGreat = Foam::log(vGreat);
     while (!runTime.end())
     {
-        const scalar t = runTime.userTimeValue()/lambda;
+        const scalar t = runTime.value()/lambda;
         forAll(A, i)
         {
             if (bk[i]*t < LOGvGreat)
diff --git a/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/createFields.H b/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/createFields.H
index 9f62f651e2..67b7a2d0bd 100644
--- a/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/createFields.H
+++ b/tutorials/incompressibleFluid/planarPoiseuille/validation/WatersKing/createFields.H
@@ -6,7 +6,7 @@ const scalar nu2 =
     dimensionedScalar
     (
         "nu",
-        dimViscosity,
+        dimKinematicViscosity,
         viscosity->lookup("nu")
     ).value();
 
diff --git a/tutorials/incompressibleFluid/wingMotion/wingMotion2D_transient/system/functions b/tutorials/incompressibleFluid/wingMotion/wingMotion2D_transient/system/functions
index 24016e92c8..f600f37b11 100644
--- a/tutorials/incompressibleFluid/wingMotion/wingMotion2D_transient/system/functions
+++ b/tutorials/incompressibleFluid/wingMotion/wingMotion2D_transient/system/functions
@@ -18,7 +18,8 @@ sixDoFRigidBodyState
 {
     type           sixDoFRigidBodyState;
     libs           ("libsixDoFRigidBodyState.so");
-    angleUnits     degrees;
+    angleUnits     [deg];
+    angularVelocityUnits [deg/s];
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressibleVoF/floatingObject/system/functions b/tutorials/incompressibleVoF/floatingObject/system/functions
index ab0e3eecb4..eb9938d884 100644
--- a/tutorials/incompressibleVoF/floatingObject/system/functions
+++ b/tutorials/incompressibleVoF/floatingObject/system/functions
@@ -18,7 +18,8 @@ rigidBodyState
 {
     type           rigidBodyState;
     libs           ("librigidBodyState.so");
-    angleUnits     degrees;
+    angleUnits     [deg];
+    angularVelocityUnits [deg/s];
 }
 
 rigidBodyForces
diff --git a/tutorials/incompressibleVoF/floatingObject/system/functions.sixDoF b/tutorials/incompressibleVoF/floatingObject/system/functions.sixDoF
index 24016e92c8..f600f37b11 100644
--- a/tutorials/incompressibleVoF/floatingObject/system/functions.sixDoF
+++ b/tutorials/incompressibleVoF/floatingObject/system/functions.sixDoF
@@ -18,7 +18,8 @@ sixDoFRigidBodyState
 {
     type           sixDoFRigidBodyState;
     libs           ("libsixDoFRigidBodyState.so");
-    angleUnits     degrees;
+    angleUnits     [deg];
+    angularVelocityUnits [deg/s];
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressibleVoF/floatingObjectWaves/system/functions b/tutorials/incompressibleVoF/floatingObjectWaves/system/functions
index ab0e3eecb4..eb9938d884 100644
--- a/tutorials/incompressibleVoF/floatingObjectWaves/system/functions
+++ b/tutorials/incompressibleVoF/floatingObjectWaves/system/functions
@@ -18,7 +18,8 @@ rigidBodyState
 {
     type           rigidBodyState;
     libs           ("librigidBodyState.so");
-    angleUnits     degrees;
+    angleUnits     [deg];
+    angularVelocityUnits [deg/s];
 }
 
 rigidBodyForces
diff --git a/tutorials/incompressibleVoF/floatingObjectWaves/system/functions.sixDoF b/tutorials/incompressibleVoF/floatingObjectWaves/system/functions.sixDoF
index 24016e92c8..f600f37b11 100644
--- a/tutorials/incompressibleVoF/floatingObjectWaves/system/functions.sixDoF
+++ b/tutorials/incompressibleVoF/floatingObjectWaves/system/functions.sixDoF
@@ -18,7 +18,8 @@ sixDoFRigidBodyState
 {
     type           sixDoFRigidBodyState;
     libs           ("libsixDoFRigidBodyState.so");
-    angleUnits     degrees;
+    angleUnits     [deg];
+    angularVelocityUnits [deg/s];
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressibleVoF/planingHullW3/system/functions b/tutorials/incompressibleVoF/planingHullW3/system/functions
index 4dc400bc35..405663ae3f 100644
--- a/tutorials/incompressibleVoF/planingHullW3/system/functions
+++ b/tutorials/incompressibleVoF/planingHullW3/system/functions
@@ -29,7 +29,8 @@ rigidBodyState
 {
     type           rigidBodyState;
     libs           ("librigidBodyState.so");
-    angleUnits     degrees;
+    angleUnits     [deg];
+    angularVelocityUnits [deg/s];
 }
 
 #includeFunc surfaces
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/G b/tutorials/multiRegion/CHT/reverseBurner/0/gas/G
index b3b088971a..4c5820fc95 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/G
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/G
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 0 -3 0 0 0 0 ];
+dimensions      [mass/time^3];
 
 internalField   uniform 0;
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/T b/tutorials/multiRegion/CHT/reverseBurner/0/gas/T
index 851689e7d4..5fcf05da79 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/T
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/T
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [temperature];
 
 internalField   uniform 300;
 
@@ -27,14 +27,12 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
-
     outlet
     {
         type            inletOutlet;
         value           $internalField;
         inletValue      $internalField;
     }
-
     gas_to_solid
     {
         type            coupledTemperature;
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/U b/tutorials/multiRegion/CHT/reverseBurner/0/gas/U
index 5c5e57a666..5181e5ab6f 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/U
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/U
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [velocity];
 
 internalField   uniform (0 0 0);
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/alphat b/tutorials/multiRegion/CHT/reverseBurner/0/gas/alphat
index 65f2c0f859..6cb9ca4f82 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/alphat
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/alphat
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [thermalConductivity/specificHeatCapacity];
 
 internalField   uniform 0;
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/epsilon b/tutorials/multiRegion/CHT/reverseBurner/0/gas/epsilon
index 2964477b62..a9724d15c5 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/epsilon
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/epsilon
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [energy/mass/time];
 
 internalField   uniform 3.60203e-06;
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/k b/tutorials/multiRegion/CHT/reverseBurner/0/gas/k
index 95474dd48c..58ef3c6eae 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/k
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/k
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [energy/mass];
 
 internalField   uniform 0.00016875;
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/nut b/tutorials/multiRegion/CHT/reverseBurner/0/gas/nut
index 14b0f41cc2..ae059c323e 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/nut
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/nut
@@ -10,11 +10,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0/gas";
-    object      nutt;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 2 -1 0 0 0 0];
+dimensions      [kinematicViscosity];
 
 internalField   uniform 0;
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/p b/tutorials/multiRegion/CHT/reverseBurner/0/gas/p
index 07efbd7e87..eecea645b6 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/p
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/p
@@ -14,9 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [pressure];
 
-internalField   uniform 1e6;
+internalField   uniform 10 [bar];
 
 boundaryField
 {
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/gas/p_rgh b/tutorials/multiRegion/CHT/reverseBurner/0/gas/p_rgh
index d9478a5467..e266e612e1 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/gas/p_rgh
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/gas/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [pressure];
 
 internalField   uniform 0;
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/0/solid/T b/tutorials/multiRegion/CHT/reverseBurner/0/solid/T
index 1e53cac949..2a0122655b 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/0/solid/T
+++ b/tutorials/multiRegion/CHT/reverseBurner/0/solid/T
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [temperature];
 
 internalField   uniform 300;
 
@@ -25,11 +25,10 @@ boundaryField
     external
     {
         type            externalTemperature;
-        h               uniform 1e3;
+        h               1e3 [W/m^2/K];
         Ta              $internalField;
         value           $internalField;
     }
-
     solid_to_gas
     {
         type            coupledTemperature;
diff --git a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/pRef b/tutorials/multiRegion/CHT/reverseBurner/constant/gas/pRef
index 990b2740c4..1e6105bfd5 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/pRef
+++ b/tutorials/multiRegion/CHT/reverseBurner/constant/gas/pRef
@@ -15,6 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [1 -1 -2 0 0 0 0];
-value           1e6;
+
+value           10 [bar];
 
 // ************************************************************************* //
diff --git a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/physicalProperties b/tutorials/multiRegion/CHT/reverseBurner/constant/gas/physicalProperties
index fbe800451e..77280ff80e 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/physicalProperties
+++ b/tutorials/multiRegion/CHT/reverseBurner/constant/gas/physicalProperties
@@ -25,8 +25,121 @@ thermoType
     energy          sensibleEnthalpy;
 }
 
+species
+(
+    O2
+    H2O
+    CH4
+    CO2
+    N2
+);
+
 defaultSpecie N2;
 
-#include "thermo.compressibleGas"
+O2
+{
+    specie
+    {
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+        lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
+        As              1.753e-6;
+        Ts              139;
+    }
+}
+
+H2O
+{
+    specie
+    {
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              2.978e-7;
+        Ts              1064;
+    }
+}
+
+CH4
+{
+    specie
+    {
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
+        lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    }
+    transport
+    {
+        As              1.0194e-06;
+        Ts              171.06;
+    }
+}
+
+CO2
+{
+    specie
+    {
+        molWeight       44.01;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 );
+        lowCpCoeffs     ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 );
+    }
+    transport
+    {
+        As              1.503e-6;
+        Ts              222;
+    }
+}
+
+N2
+{
+    specie
+    {
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
+        As              1.401e-6;
+        Ts              107;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/reactions b/tutorials/multiRegion/CHT/reverseBurner/constant/gas/reactions
index 8e7b929cff..be14c28523 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/reactions
+++ b/tutorials/multiRegion/CHT/reverseBurner/constant/gas/reactions
@@ -12,10 +12,6 @@ Reference:
     Combustion science and technology, 27(1-2), 31-43.
 
 Notes:
-    The reference gives parameters in a unit system of cm-sec-mole-kcal-Kelvin,
-    whilst OpenFOAM uses m-sec-kmol-J-Kelvin, both the pre-exponential factors
-    and the activation temperature/energy require unit conversion.
-
     The mechanism used is set 3 from table 2. This should be the most accurate
     single-step methane mechanism without any negative exponents. Set 2 is not
     usable because the negative exponent on the methane concentration causes
@@ -27,11 +23,11 @@ reactions
 {
     methaneReaction
     {
-        type     irreversibleArrhenius;
+        type    irreversibleArrhenius;
         reaction "CH4^0.2 + 2O2^1.3 = CO2 + 2H2O";
-        A        2.11873e+11;
-        beta     0;
-        Ta       24357;
+        A       6.7e12 [(mol/cm^3)^-0.5/s];
+        beta    0;
+        Ea      48.4 [kcal/mol];
     }
 }
 
diff --git a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/thermo.compressibleGas b/tutorials/multiRegion/CHT/reverseBurner/constant/gas/thermo.compressibleGas
deleted file mode 100644
index 965404d706..0000000000
--- a/tutorials/multiRegion/CHT/reverseBurner/constant/gas/thermo.compressibleGas
+++ /dev/null
@@ -1,124 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-species
-(
-    O2
-    H2O
-    CH4
-    CO2
-    N2
-);
-
-O2
-{
-    specie
-    {
-        molWeight       31.9988;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
-        lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
-    }
-    transport
-    {
-        As              1.753e-6;
-        Ts              139;
-    }
-}
-
-H2O
-{
-    specie
-    {
-        molWeight       18.0153;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
-        lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    }
-    transport
-    {
-        As              2.978e-7;
-        Ts              1064;
-    }
-}
-
-CH4
-{
-    specie
-    {
-        molWeight       16.0428;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           6000;
-        Tcommon         1000;
-        highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
-        lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
-    }
-    transport
-    {
-        As              1.0194e-06;
-        Ts              171.06;
-    }
-}
-
-CO2
-{
-    specie
-    {
-        molWeight       44.01;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 );
-        lowCpCoeffs     ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 );
-    }
-    transport
-    {
-        As              1.503e-6;
-        Ts              222;
-    }
-}
-
-N2
-{
-    specie
-    {
-        molWeight       28.0134;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
-        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
-    }
-    transport
-    {
-        As              1.401e-6;
-        Ts              107;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiRegion/CHT/reverseBurner/system/gas/fvSolution b/tutorials/multiRegion/CHT/reverseBurner/system/gas/fvSolution
index 0ebcbac8ce..8dceaeae21 100644
--- a/tutorials/multiRegion/CHT/reverseBurner/system/gas/fvSolution
+++ b/tutorials/multiRegion/CHT/reverseBurner/system/gas/fvSolution
@@ -52,8 +52,8 @@ solvers
 
     G
     {
-        solver          GAMG;
-        smoother        GaussSeidel;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-5;
         relTol          0.1;
     }
diff --git a/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/phaseProperties b/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/phaseProperties
index 7b2c30a5ae..9a11ee61c5 100644
--- a/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/phaseProperties
+++ b/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/phaseProperties
@@ -130,22 +130,18 @@ saturationTemperature
 {
     gas_liquid
     {
-        type function1;
+        type            function1;
 
-        function scale;
-
-        xScale 1e-6;
-        scale   1;
-        value
+        function
         {
-            type                tableFile;
-            format              csv;
-            nHeaderLine         1;
-            refColumn           1;
-            componentColumns    (0);
-            mergeSeparators     no;
+            type            table;
+            format          csv;
+            nHeaderLine     1;
+            units           ([MPa] [K]);
+            columns         (1 0);
+            mergeSeparators no;
             file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
-            outOfBounds         clamp;
+            outOfBounds     clamp;
             interpolationScheme linear;
         }
     }
diff --git a/tutorials/multiphaseEuler/boilingBed/constant/phaseProperties b/tutorials/multiphaseEuler/boilingBed/constant/phaseProperties
index 4a59a6c312..43eaf0ef77 100644
--- a/tutorials/multiphaseEuler/boilingBed/constant/phaseProperties
+++ b/tutorials/multiphaseEuler/boilingBed/constant/phaseProperties
@@ -209,17 +209,13 @@ saturationTemperature
     {
         type            function1;
 
-        function        scale;
-
-        xScale          1e-5;
-        scale           1;
-        value
+        function
         {
             type            table;
             format          csv;
             nHeaderLine     1;
-            refColumn       1;
-            componentColumns (0);
+            units           ([bar] [K]);
+            columns         (1 0);
             mergeSeparators no;
             file            "constant/water-saturation.csv";
             outOfBounds     clamp;
diff --git a/tutorials/multiphaseEuler/titaniaSynthesis/0/T.particles b/tutorials/multiphaseEuler/titaniaSynthesis/0/T.particles
index 9de66d9db3..146c6a8552 100644
--- a/tutorials/multiphaseEuler/titaniaSynthesis/0/T.particles
+++ b/tutorials/multiphaseEuler/titaniaSynthesis/0/T.particles
@@ -23,8 +23,8 @@ boundaryField
 
     inlet
     {
-        type                fixedValue;
-        value               uniform 296;
+        type            fixedValue;
+        value           uniform 296;
     }
 
     outlet
@@ -37,15 +37,14 @@ boundaryField
         type            fixedProfile;
         profile
         {
-            type                tableFile;
-            format              csv;        // Input format
-            nHeaderLine         0;          // Number of header lines
-            refColumn           0;          // Reference column index
-            componentColumns    (1);        // Component column indices
-            separator           " ";        // Optional (defaults to ",")
-            mergeSeparators     yes;        // Merge multiple separators
-            outOfBounds         clamp;      // Optional out-of-bounds handling
-            file                "validation/exptData/wallTemperature";
+            type            table;
+            format          csv;        // Input format
+            nHeaderLine     0;          // Number of header lines
+            columns         (0 1);      // Column indices
+            separator       " ";        // Optional (defaults to ",")
+            mergeSeparators yes;        // Merge multiple separators
+            outOfBounds     clamp;      // Optional out-of-bounds handling
+            file            "validation/exptData/wallTemperature";
             interpolationScheme linear;     // Optional interpolation scheme
         }
         direction        (1 0 0);
diff --git a/tutorials/multiphaseEuler/titaniaSynthesis/0/T.vapour b/tutorials/multiphaseEuler/titaniaSynthesis/0/T.vapour
index 862883e67a..ca11b41c6e 100644
--- a/tutorials/multiphaseEuler/titaniaSynthesis/0/T.vapour
+++ b/tutorials/multiphaseEuler/titaniaSynthesis/0/T.vapour
@@ -23,8 +23,8 @@ boundaryField
 
     inlet
     {
-        type                fixedValue;
-        value               uniform 296;
+        type            fixedValue;
+        value           uniform 296;
     }
 
     outlet
@@ -37,15 +37,14 @@ boundaryField
         type            fixedProfile;
         profile
         {
-            type                tableFile;
-            format              csv;        // Input format
-            nHeaderLine         0;          // Number of header lines
-            refColumn           0;          // Reference column index
-            componentColumns    (1);        // Component column indices
-            separator           " ";        // Optional (defaults to ",")
-            mergeSeparators     yes;        // Merge multiple separators
-            outOfBounds         clamp;      // Optional out-of-bounds handling
-            file                "validation/exptData/wallTemperature";
+            type            table;
+            format          csv;        // Input format
+            nHeaderLine     0;          // Number of header lines
+            columns         (0 1);      // Column indices
+            separator       " ";        // Optional (defaults to ",")
+            mergeSeparators yes;        // Merge multiple separators
+            outOfBounds     clamp;      // Optional out-of-bounds handling
+            file            "validation/exptData/wallTemperature";
             interpolationScheme linear;     // Optional interpolation scheme
         }
         direction        (1 0 0);
diff --git a/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.particles b/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.particles
index 9de66d9db3..146c6a8552 100644
--- a/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.particles
+++ b/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.particles
@@ -23,8 +23,8 @@ boundaryField
 
     inlet
     {
-        type                fixedValue;
-        value               uniform 296;
+        type            fixedValue;
+        value           uniform 296;
     }
 
     outlet
@@ -37,15 +37,14 @@ boundaryField
         type            fixedProfile;
         profile
         {
-            type                tableFile;
-            format              csv;        // Input format
-            nHeaderLine         0;          // Number of header lines
-            refColumn           0;          // Reference column index
-            componentColumns    (1);        // Component column indices
-            separator           " ";        // Optional (defaults to ",")
-            mergeSeparators     yes;        // Merge multiple separators
-            outOfBounds         clamp;      // Optional out-of-bounds handling
-            file                "validation/exptData/wallTemperature";
+            type            table;
+            format          csv;        // Input format
+            nHeaderLine     0;          // Number of header lines
+            columns         (0 1);      // Column indices
+            separator       " ";        // Optional (defaults to ",")
+            mergeSeparators yes;        // Merge multiple separators
+            outOfBounds     clamp;      // Optional out-of-bounds handling
+            file            "validation/exptData/wallTemperature";
             interpolationScheme linear;     // Optional interpolation scheme
         }
         direction        (1 0 0);
diff --git a/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.vapour b/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.vapour
index 862883e67a..ca11b41c6e 100644
--- a/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.vapour
+++ b/tutorials/multiphaseEuler/titaniaSynthesisSurface/0/T.vapour
@@ -23,8 +23,8 @@ boundaryField
 
     inlet
     {
-        type                fixedValue;
-        value               uniform 296;
+        type            fixedValue;
+        value           uniform 296;
     }
 
     outlet
@@ -37,15 +37,14 @@ boundaryField
         type            fixedProfile;
         profile
         {
-            type                tableFile;
-            format              csv;        // Input format
-            nHeaderLine         0;          // Number of header lines
-            refColumn           0;          // Reference column index
-            componentColumns    (1);        // Component column indices
-            separator           " ";        // Optional (defaults to ",")
-            mergeSeparators     yes;        // Merge multiple separators
-            outOfBounds         clamp;      // Optional out-of-bounds handling
-            file                "validation/exptData/wallTemperature";
+            type            table;
+            format          csv;        // Input format
+            nHeaderLine     0;          // Number of header lines
+            columns         (0 1);      // Column indices
+            separator       " ";        // Optional (defaults to ",")
+            mergeSeparators yes;        // Merge multiple separators
+            outOfBounds     clamp;      // Optional out-of-bounds handling
+            file            "validation/exptData/wallTemperature";
             interpolationScheme linear;     // Optional interpolation scheme
         }
         direction        (1 0 0);
diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphaseEuler/wallBoilingIATE/constant/phaseProperties
index 7949788e52..8955c107c7 100644
--- a/tutorials/multiphaseEuler/wallBoilingIATE/constant/phaseProperties
+++ b/tutorials/multiphaseEuler/wallBoilingIATE/constant/phaseProperties
@@ -167,22 +167,18 @@ saturationTemperature
 {
     gas_liquid
     {
-        type function1;
+        type            function1;
 
-        function scale;
-
-        xScale 1e-6;
-        scale   1;
-        value
+        function
         {
-            type                tableFile;
-            format              csv;
-            nHeaderLine         1;
-            refColumn           1;
-            componentColumns    (0);
-            mergeSeparators     no;
+            type            table;
+            format          csv;
+            nHeaderLine     1;
+            units           ([MPa] [K]);
+            columns         (1 0);
+            mergeSeparators no;
             file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
-            outOfBounds         clamp;
+            outOfBounds     clamp;
             interpolationScheme linear;
         }
     }
diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/phaseProperties b/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/phaseProperties
index 56f46e3323..050b0903e1 100644
--- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/phaseProperties
+++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/phaseProperties
@@ -216,22 +216,18 @@ saturationTemperature
 {
     gas_liquid
     {
-        type function1;
+        type            function1;
 
-        function scale;
-
-        xScale 1e-6;
-        scale   1;
-        value
+        function
         {
-            type                tableFile;
-            format              csv;
-            nHeaderLine         1;
-            refColumn           1;
-            componentColumns    (0);
-            mergeSeparators     no;
+            type            table;
+            format          csv;
+            nHeaderLine     1;
+            units           ([MPa] [K]);
+            columns         (1 0);
+            mergeSeparators no;
             file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
-            outOfBounds         clamp;
+            outOfBounds     clamp;
             interpolationScheme linear;
         }
     }
diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/phaseProperties b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
index 53ab3516bc..852e02f8cd 100644
--- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
+++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
@@ -274,22 +274,18 @@ saturationTemperature
 {
     gas_liquid
     {
-        type function1;
+        type            function1;
 
-        function scale;
-
-        xScale 1e-6;
-        scale   1;
-        value
+        function
         {
-            type                tableFile;
-            format              csv;
-            nHeaderLine         1;
-            refColumn           1;
-            componentColumns    (0);
-            mergeSeparators     no;
+            type            table;
+            format          csv;
+            nHeaderLine     1;
+            units           ([MPa] [K]);
+            columns         (1 0);
+            mergeSeparators no;
             file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
-            outOfBounds         clamp;
+            outOfBounds     clamp;
             interpolationScheme linear;
         }
     }