From d0f2aeb010a03b32c2aa00f318ec76e6b489664b Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 3 Feb 2010 11:36:42 +0000 Subject: [PATCH] STYLE: define derived dimensionSets by calculating from existing ones --- src/OpenFOAM/dimensionSet/dimensionSets.C | 24 ++++++++++++----------- src/OpenFOAM/dimensionSet/dimensionSets.H | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C index e89f3c944f..693bd27c91 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSets.C +++ b/src/OpenFOAM/dimensionSet/dimensionSets.C @@ -38,19 +38,21 @@ const Foam::dimensionSet Foam::dimMoles(0, 0, 0, 0, 1, 0, 0); const Foam::dimensionSet Foam::dimCurrent(0, 0, 0, 0, 0, 1, 0); const Foam::dimensionSet Foam::dimLuminousIntensity(0, 0, 0, 0, 0, 0, 1); -const Foam::dimensionSet Foam::dimArea(0, 2, 0, 0, 0, 0, 0); -const Foam::dimensionSet Foam::dimVolume(0, 3, 0, 0, 0, 0, 0); -const Foam::dimensionSet Foam::dimVol(0, 3, 0, 0, 0, 0, 0); +const Foam::dimensionSet Foam::dimArea(sqr(dimLength)); +const Foam::dimensionSet Foam::dimVolume(pow3(dimLength)); +const Foam::dimensionSet Foam::dimVol(dimVolume); -const Foam::dimensionSet Foam::dimDensity(1, -3, 0, 0, 0, 0, 0); -const Foam::dimensionSet Foam::dimForce(1, 1, -2, 0, 0, 0, 0); -const Foam::dimensionSet Foam::dimEnergy(1, 2, -2, 0, 0, 0, 0); +const Foam::dimensionSet Foam::dimVelocity(dimLength/dimTime); +const Foam::dimensionSet Foam::dimAcceleration(dimVelocity/dimTime); -const Foam::dimensionSet Foam::dimVelocity(0, 1, -1, 0, 0, 0, 0); -const Foam::dimensionSet Foam::dimAcceleration(0, 1, -2, 0, 0, 0, 0); -const Foam::dimensionSet Foam::dimPressure(1, -1, -2, 0, 0, 0, 0); -const Foam::dimensionSet Foam::dimGasConstant(0, 2, -2, -1, 0, 0, 0); -const Foam::dimensionSet Foam::dimSpecificHeatCapacity(0, 2, -2, -1, 0, 0, 0); +const Foam::dimensionSet Foam::dimDensity(dimMass/dimVolume); +const Foam::dimensionSet Foam::dimForce(dimMass*dimAcceleration); +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::dimGasConstant(dimEnergy/dimMass/dimTemperature); +const Foam::dimensionSet Foam::dimSpecificHeatCapacity(dimGasConstant); // ************************************************************************* // diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.H b/src/OpenFOAM/dimensionSet/dimensionSets.H index 93d9c1aadc..1369cd5e87 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSets.H +++ b/src/OpenFOAM/dimensionSet/dimensionSets.H @@ -61,6 +61,7 @@ extern const dimensionSet dimVol; extern const dimensionSet dimDensity; extern const dimensionSet dimForce; extern const dimensionSet dimEnergy; +extern const dimensionSet dimPower; extern const dimensionSet dimVelocity; extern const dimensionSet dimAcceleration;