瀏覽代碼

Reduce the diff between dimensionful-angles branch and master

David Peter 2 年之前
父節點
當前提交
751cd848ca

+ 6 - 6
numbat/modules/core/dimensions.nbt

@@ -23,9 +23,9 @@ dimension Power = Energy / Time = Force × Speed
 dimension Pressure = Force / Area = Energy / Volume  # also: stress
 dimension Action = Energy × Time
 dimension MassDensity = Mass / Length^3
-dimension MomentOfInertia = Mass × Length^2
-dimension AngularMomentum = MomentOfInertia × Angle / Time
-dimension Torque = Length × Force  # also: moment of force
+dimension MomentOfInertia = Mass × Length^2 / Angle^2
+dimension AngularMomentum = MomentOfInertia × Angle / Time = Mass × Length^2 / Time / Angle
+dimension Torque = Length × Force / Angle  # also: moment of force
 dimension EnergyDensity = Energy / Volume
 
 dimension Current
@@ -43,11 +43,11 @@ dimension Inductance = MagneticFlux / Current
 dimension ElectricChargeDensity = ElectricCharge / Volume
 dimension CurrentDensity = Current / Area
 dimension ElectricDipoleMoment = ElectricCharge × Length
-dimension MagneticDipoleMoment = Current × Area = Torque / MagneticFluxDensity
+dimension MagneticDipoleMoment = Current × Area #= Torque / MagneticFluxDensity
 dimension ElectricFieldStrength = Voltage / Length
 dimension ElectricDisplacementFieldStrength = ElectricCharge / Area
-dimension ElectricPermittivity = Time^4 × Current^2 / Mass / Length^3 = ElectricDisplacementFieldStrength / ElectricFieldStrength
-dimension MagneticPermeability = Length × Mass / Time^2 / Current^2 = MagneticFluxDensity / MagneticFieldStrength
+dimension ElectricPermittivity = Time^4 × Current^2 / Mass / Length^3 × Angle = ElectricDisplacementFieldStrength / ElectricFieldStrength × Angle
+dimension MagneticPermeability = Length × Mass / Time^2 / Current^2 / Angle = MagneticFluxDensity / MagneticFieldStrength / Angle
 dimension Polarizability = ElectricDipoleMoment / ElectricFieldStrength = Current^2 × Time^4 / Mass
 dimension ElectricMobility = Speed / ElectricFieldStrength
 

+ 3 - 3
numbat/modules/physics/constants.nbt

@@ -19,7 +19,7 @@ let g0 = gravity
 let planck_constant = 6.62607015e-34 J / Hz
 
 # The reduced Planck constant
-let ℏ = planck_constant / 2π
+let ℏ: AngularMomentum = planck_constant / 2π
 let h_bar = ℏ
 
 # Mass of the electron
@@ -30,12 +30,12 @@ let elementary_charge: ElectricCharge =  1.602176634e-19 C
 let electron_charge: ElectricCharge = elementary_charge
 
 # Magnetic constant (vacuum magnetic permeability)
-let magnetic_constant: Force / Current^2 =  1.25663706212e-6 N / A²
+let magnetic_constant: MagneticPermeability =  1.25663706212e-6 N / A²
 let µ0 = magnetic_constant
 let mu0 = magnetic_constant
 
 # Electric constant ( vacuum electric permittivity)
-let electric_constant: Capacitance / Length = 8.8541878128e-12 F / m
+let electric_constant: ElectricPermittivity = 8.8541878128e-12 F / m
 let ε0 = electric_constant
 let eps0 = electric_constant
 

+ 3 - 0
numbat/modules/units/misc.nbt

@@ -33,6 +33,9 @@ unit kilogram_force: Force = 9.80665 newton
 @aliases(hp: short)
 unit horsepower: Power = 735.49875 W
 
+@aliases(revolutions, rev: short)
+unit revolution: Angle = 360°
+
 @aliases(RPM: short)
 unit rpm: Frequency = 1 / minute
 

+ 1 - 1
numbat/modules/units/si.nbt

@@ -39,7 +39,7 @@ unit radian: Angle = meter / meter
 
 @metric_prefixes
 @aliases(steradians, sr: short)
-unit steradian: SolidAngle = meter^2 / meter^2
+unit steradian: SolidAngle = radian^2
 
 @metric_prefixes
 @aliases(Hz: short)