diff --git a/src/Base/Unit.cpp b/src/Base/Unit.cpp index 2092392b66..64cefecf85 100644 --- a/src/Base/Unit.cpp +++ b/src/Base/Unit.cpp @@ -625,59 +625,59 @@ QString Unit::getTypeString() const } // SI base units -Unit Unit::AmountOfSubstance (0, 0, 0, 0, 0, 1); -Unit Unit::ElectricCurrent (0, 0, 0, 1); -Unit Unit::Length (1); -Unit Unit::LuminousIntensity (0, 0, 0, 0, 0, 0, 1); -Unit Unit::Mass (0, 1); -Unit Unit::Temperature (0, 0, 0, 0, 1); -Unit Unit::TimeSpan (0, 0, 1); +const Unit Unit::AmountOfSubstance (0, 0, 0, 0, 0, 1); +const Unit Unit::ElectricCurrent (0, 0, 0, 1); +const Unit Unit::Length (1); +const Unit Unit::LuminousIntensity (0, 0, 0, 0, 0, 0, 1); +const Unit Unit::Mass (0, 1); +const Unit Unit::Temperature (0, 0, 0, 0, 1); +const Unit Unit::TimeSpan (0, 0, 1); // all other units -Unit Unit::Acceleration (1, 0, -2); -Unit Unit::Angle (0, 0, 0, 0, 0, 0, 0, 1); -Unit Unit::AngleOfFriction (0, 0, 0, 0, 0, 0, 0, 1); -Unit Unit::Area (2); -Unit Unit::CompressiveStrength (-1, 1, -2); -Unit Unit::CurrentDensity (-2, 0, 0, 1); -Unit Unit::Density (-3, 1); -Unit Unit::DissipationRate (2, 0, -3); // https://cfd-online.com/Wiki/Turbulence_dissipation_rate -Unit Unit::DynamicViscosity (-1, 1, -1); -Unit Unit::ElectricalCapacitance (-2, -1, 4, 2); -Unit Unit::ElectricalConductance (-2, -1, 3, 2); -Unit Unit::ElectricalConductivity (-3, -1, 3, 2); -Unit Unit::ElectricalInductance (2, 1, -2, -2); -Unit Unit::ElectricalResistance (2, 1, -3, -2); -Unit Unit::ElectricCharge (0, 0, 1, 1); -Unit Unit::ElectricPotential (2, 1, -3, -1); -Unit Unit::Force (1, 1, -2); -Unit Unit::Frequency (0, 0, -1); -Unit Unit::HeatFlux (0, 1, -3, 0, 0); -Unit Unit::InverseArea (-2, 0, 0); -Unit Unit::InverseLength (-1, 0, 0); -Unit Unit::InverseVolume (-3, 0, 0); -Unit Unit::KinematicViscosity (2, 0, -1); -Unit Unit::MagneticFieldStrength (-1,0,0,1); -Unit Unit::MagneticFlux (2,1,-2,-1); -Unit Unit::MagneticFluxDensity (0,1,-2,-1); -Unit Unit::Magnetization (-1,0,0,1); -Unit Unit::Pressure (-1,1,-2); -Unit Unit::Power (2, 1, -3); -Unit Unit::ShearModulus (-1,1,-2); -Unit Unit::SpecificEnergy (2, 0, -2); -Unit Unit::SpecificHeat (2, 0, -2, 0, -1); -Unit Unit::Stiffness (0, 1, -2); -Unit Unit::Stress (-1,1,-2); -Unit Unit::ThermalConductivity (1, 1, -3, 0, -1); -Unit Unit::ThermalExpansionCoefficient(0, 0, 0, 0, -1); -Unit Unit::ThermalTransferCoefficient (0, 1, -3, 0, -1); -Unit Unit::UltimateTensileStrength (-1,1,-2); -Unit Unit::VacuumPermittivity (-3, -1, 4, 2); -Unit Unit::Velocity (1, 0, -1); -Unit Unit::Volume (3); -Unit Unit::VolumeFlowRate (3, 0, -1); -Unit Unit::VolumetricThermalExpansionCoefficient(0, 0, 0, 0, -1); -Unit Unit::Work (2, 1, -2); -Unit Unit::YieldStrength (-1,1,-2); -Unit Unit::YoungsModulus (-1,1,-2); +const Unit Unit::Acceleration (1, 0, -2); +const Unit Unit::Angle (0, 0, 0, 0, 0, 0, 0, 1); +const Unit Unit::AngleOfFriction (0, 0, 0, 0, 0, 0, 0, 1); +const Unit Unit::Area (2); +const Unit Unit::CompressiveStrength (-1, 1, -2); +const Unit Unit::CurrentDensity (-2, 0, 0, 1); +const Unit Unit::Density (-3, 1); +const Unit Unit::DissipationRate (2, 0, -3); // https://cfd-online.com/Wiki/Turbulence_dissipation_rate +const Unit Unit::DynamicViscosity (-1, 1, -1); +const Unit Unit::ElectricalCapacitance (-2, -1, 4, 2); +const Unit Unit::ElectricalConductance (-2, -1, 3, 2); +const Unit Unit::ElectricalConductivity (-3, -1, 3, 2); +const Unit Unit::ElectricalInductance (2, 1, -2, -2); +const Unit Unit::ElectricalResistance (2, 1, -3, -2); +const Unit Unit::ElectricCharge (0, 0, 1, 1); +const Unit Unit::ElectricPotential (2, 1, -3, -1); +const Unit Unit::Force (1, 1, -2); +const Unit Unit::Frequency (0, 0, -1); +const Unit Unit::HeatFlux (0, 1, -3, 0, 0); +const Unit Unit::InverseArea (-2, 0, 0); +const Unit Unit::InverseLength (-1, 0, 0); +const Unit Unit::InverseVolume (-3, 0, 0); +const Unit Unit::KinematicViscosity (2, 0, -1); +const Unit Unit::MagneticFieldStrength (-1,0,0,1); +const Unit Unit::MagneticFlux (2,1,-2,-1); +const Unit Unit::MagneticFluxDensity (0,1,-2,-1); +const Unit Unit::Magnetization (-1,0,0,1); +const Unit Unit::Pressure (-1,1,-2); +const Unit Unit::Power (2, 1, -3); +const Unit Unit::ShearModulus (-1,1,-2); +const Unit Unit::SpecificEnergy (2, 0, -2); +const Unit Unit::SpecificHeat (2, 0, -2, 0, -1); +const Unit Unit::Stiffness (0, 1, -2); +const Unit Unit::Stress (-1,1,-2); +const Unit Unit::ThermalConductivity (1, 1, -3, 0, -1); +const Unit Unit::ThermalExpansionCoefficient(0, 0, 0, 0, -1); +const Unit Unit::ThermalTransferCoefficient (0, 1, -3, 0, -1); +const Unit Unit::UltimateTensileStrength (-1,1,-2); +const Unit Unit::VacuumPermittivity (-3, -1, 4, 2); +const Unit Unit::Velocity (1, 0, -1); +const Unit Unit::Volume (3); +const Unit Unit::VolumeFlowRate (3, 0, -1); +const Unit Unit::VolumetricThermalExpansionCoefficient(0, 0, 0, 0, -1); +const Unit Unit::Work (2, 1, -2); +const Unit Unit::YieldStrength (-1,1,-2); +const Unit Unit::YoungsModulus (-1,1,-2); // clang-format on diff --git a/src/Base/Unit.h b/src/Base/Unit.h index 1e55763a04..8b4a4aec70 100644 --- a/src/Base/Unit.h +++ b/src/Base/Unit.h @@ -106,71 +106,71 @@ public: /** Predefined Unit types. */ //@{ /// Length unit - static Unit Length; + static const Unit Length; /// Mass unit - static Unit Mass; + static const Unit Mass; /// Angle - static Unit Angle; - static Unit AngleOfFriction; + static const Unit Angle; + static const Unit AngleOfFriction; - static Unit Density; + static const Unit Density; - static Unit Area; - static Unit Volume; - static Unit TimeSpan; - static Unit Frequency; - static Unit Velocity; - static Unit Acceleration; - static Unit Temperature; + static const Unit Area; + static const Unit Volume; + static const Unit TimeSpan; + static const Unit Frequency; + static const Unit Velocity; + static const Unit Acceleration; + static const Unit Temperature; - static Unit CurrentDensity; - static Unit ElectricCurrent; - static Unit ElectricPotential; - static Unit ElectricCharge; - static Unit MagneticFieldStrength; - static Unit MagneticFlux; - static Unit MagneticFluxDensity; - static Unit Magnetization; - static Unit ElectricalCapacitance; - static Unit ElectricalInductance; - static Unit ElectricalConductance; - static Unit ElectricalResistance; - static Unit ElectricalConductivity; - static Unit AmountOfSubstance; - static Unit LuminousIntensity; + static const Unit CurrentDensity; + static const Unit ElectricCurrent; + static const Unit ElectricPotential; + static const Unit ElectricCharge; + static const Unit MagneticFieldStrength; + static const Unit MagneticFlux; + static const Unit MagneticFluxDensity; + static const Unit Magnetization; + static const Unit ElectricalCapacitance; + static const Unit ElectricalInductance; + static const Unit ElectricalConductance; + static const Unit ElectricalResistance; + static const Unit ElectricalConductivity; + static const Unit AmountOfSubstance; + static const Unit LuminousIntensity; // Pressure - static Unit CompressiveStrength; - static Unit Pressure; - static Unit ShearModulus; - static Unit Stress; - static Unit UltimateTensileStrength; - static Unit YieldStrength; - static Unit YoungsModulus; + static const Unit CompressiveStrength; + static const Unit Pressure; + static const Unit ShearModulus; + static const Unit Stress; + static const Unit UltimateTensileStrength; + static const Unit YieldStrength; + static const Unit YoungsModulus; - static Unit Stiffness; + static const Unit Stiffness; - static Unit Force; - static Unit Work; - static Unit Power; + static const Unit Force; + static const Unit Work; + static const Unit Power; - static Unit SpecificEnergy; - static Unit ThermalConductivity; - static Unit ThermalExpansionCoefficient; - static Unit VolumetricThermalExpansionCoefficient; - static Unit SpecificHeat; - static Unit ThermalTransferCoefficient; - static Unit HeatFlux; - static Unit DynamicViscosity; - static Unit KinematicViscosity; - static Unit VacuumPermittivity; - static Unit VolumeFlowRate; - static Unit DissipationRate; + static const Unit SpecificEnergy; + static const Unit ThermalConductivity; + static const Unit ThermalExpansionCoefficient; + static const Unit VolumetricThermalExpansionCoefficient; + static const Unit SpecificHeat; + static const Unit ThermalTransferCoefficient; + static const Unit HeatFlux; + static const Unit DynamicViscosity; + static const Unit KinematicViscosity; + static const Unit VacuumPermittivity; + static const Unit VolumeFlowRate; + static const Unit DissipationRate; - static Unit InverseLength; - static Unit InverseArea; - static Unit InverseVolume; + static const Unit InverseLength; + static const Unit InverseArea; + static const Unit InverseVolume; //@} private: