Skip to content

Commit

Permalink
Merge pull request #1454 from jules-ch/fix-719-hour-alias
Browse files Browse the repository at this point in the history
Update hour symbol to `h`
  • Loading branch information
jules-ch authored Mar 3, 2022
2 parents 7b72cd9 + c71b836 commit 7394cd9
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Pint Changelog

### Breaking Changes

- Update hour default symbol to `h`. (Issue #719)
- Replace `h` with `ℎ` (U+210E) as default symbol for planck constant.
- Change minimal Python version support to 3.8+
- Change minimal Numpy version support to 1.19+

Expand Down
30 changes: 15 additions & 15 deletions pint/constants_en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ eulers_number = 2.71828182845904523536028747135266249775724709369995
#### DEFINED EXACT CONSTANTS ####

speed_of_light = 299792458 m/s = c = c_0 # since 1983
planck_constant = 6.62607015e-34 J s = h # since May 2019
planck_constant = 6.62607015e-34 J s = # since May 2019
elementary_charge = 1.602176634e-19 C = e # since May 2019
avogadro_number = 6.02214076e23 # since May 2019
boltzmann_constant = 1.380649e-23 J K^-1 = k = k_B # since May 2019
Expand All @@ -31,19 +31,19 @@ conventional_von_klitzing_constant = 2.5812807e4 ohm = R_K90 # since Jan 1990
# Floating-point conversion may introduce inaccuracies

zeta = c / (cm/s) = ζ
dirac_constant = h / (2 * π) = ħ = hbar = atomic_unit_of_action = a_u_action
dirac_constant = / (2 * π) = ħ = hbar = atomic_unit_of_action = a_u_action
avogadro_constant = avogadro_number * mol^-1 = N_A
molar_gas_constant = k * N_A = R
faraday_constant = e * N_A
conductance_quantum = 2 * e ** 2 / h = G_0
magnetic_flux_quantum = h / (2 * e) = Φ_0 = Phi_0
josephson_constant = 2 * e / h = K_J
von_klitzing_constant = h / e ** 2 = R_K
stefan_boltzmann_constant = 2 / 15 * π ** 5 * k ** 4 / (h ** 3 * c ** 2) = σ = sigma
first_radiation_constant = 2 * π * h * c ** 2 = c_1
second_radiation_constant = h * c / k = c_2
wien_wavelength_displacement_law_constant = h * c / (k * wien_x)
wien_frequency_displacement_law_constant = wien_u * k / h
conductance_quantum = 2 * e ** 2 / = G_0
magnetic_flux_quantum = / (2 * e) = Φ_0 = Phi_0
josephson_constant = 2 * e / = K_J
von_klitzing_constant = / e ** 2 = R_K
stefan_boltzmann_constant = 2 / 15 * π ** 5 * k ** 4 / ( ** 3 * c ** 2) = σ = sigma
first_radiation_constant = 2 * π * * c ** 2 = c_1
second_radiation_constant = * c / k = c_2
wien_wavelength_displacement_law_constant = * c / (k * wien_x)
wien_frequency_displacement_law_constant = wien_u * k /

#### MEASURED CONSTANTS ####
# Recommended CODATA-2018 values
Expand All @@ -65,10 +65,10 @@ K_alpha_W_d_220 = 0.108852175

#### DERIVED CONSTANTS ####

fine_structure_constant = (2 * h * R_inf / (m_e * c)) ** 0.5 = α = alpha
vacuum_permeability = 2 * α * h / (e ** 2 * c) = µ_0 = mu_0 = mu0 = magnetic_constant
vacuum_permittivity = e ** 2 / (2 * α * h * c) = ε_0 = epsilon_0 = eps_0 = eps0 = electric_constant
impedance_of_free_space = 2 * α * h / e ** 2 = Z_0 = characteristic_impedance_of_vacuum
fine_structure_constant = (2 * * R_inf / (m_e * c)) ** 0.5 = α = alpha
vacuum_permeability = 2 * α * / (e ** 2 * c) = µ_0 = mu_0 = mu0 = magnetic_constant
vacuum_permittivity = e ** 2 / (2 * α * * c) = ε_0 = epsilon_0 = eps_0 = eps0 = electric_constant
impedance_of_free_space = 2 * α * / e ** 2 = Z_0 = characteristic_impedance_of_vacuum
coulomb_constant = α * hbar * c / e ** 2 = k_C
classical_electron_radius = α * hbar / (m_e * c) = r_e
thomson_cross_section = 8 / 3 * π * r_e ** 2 = σ_e = sigma_e
4 changes: 2 additions & 2 deletions pint/default_en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ planck_mass = (hbar * c / gravitational_constant) ** 0.5

# Time
minute = 60 * second = min
hour = 60 * minute = hr
hour = 60 * minute = h = hr
day = 24 * hour = d
week = 7 * day
fortnight = 2 * week
Expand Down Expand Up @@ -255,7 +255,7 @@ joule = newton * meter = J
erg = dyne * centimeter
watt_hour = watt * hour = Wh = watthour
electron_volt = e * volt = eV
rydberg = h * c * R_inf = Ry
rydberg = * c * R_inf = Ry
hartree = 2 * rydberg = E_h = Eh = hartree_energy = atomic_unit_of_energy = a_u_energy
calorie = 4.184 * joule = cal = thermochemical_calorie = cal_th
international_calorie = 4.1868 * joule = cal_it = international_steam_table_calorie
Expand Down

0 comments on commit 7394cd9

Please sign in to comment.