Skip to content

Commit

Permalink
fixed python grammar issues throughout
Browse files Browse the repository at this point in the history
  • Loading branch information
wrguenthner committed Apr 23, 2024
1 parent a004379 commit ebd812d
Show file tree
Hide file tree
Showing 8 changed files with 992 additions and 424 deletions.
2 changes: 1 addition & 1 deletion src/pythermo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"""

__all__ = ['constants','crystal','tT_path','tT_model']
__all__ = ['constants', 'crystal', 'tT_path', 'tT_model']

from .constants import *
from .crystal import *
Expand Down
36 changes: 18 additions & 18 deletions src/pythermo/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,39 @@
import numpy as np

#time constants
sec_per_myr = 3.15569259747*10**13
sec_per_yr = 3.15569259747*10**7
sec_per_myr = 3.15569259747 * 10**13
sec_per_yr = 3.15569259747 * 10**7

#gas constant in kJ/K * mol-1
gas_constant = 0.008314462618

#jaffey decay constants, 1/s
lambda_232 = np.log(2)/(1.405*10**10) * (1/sec_per_yr)
lambda_235 = np.log(2)/(7.0381*10**8) * (1/sec_per_yr)
lambda_238 = np.log(2)/(4.4683*10**9) * (1/sec_per_yr)
lambda_232 = np.log(2) / (1.405 * 10**10) * (1/sec_per_yr)
lambda_235 = np.log(2) / (7.0381 * 10**8) * (1/sec_per_yr)
lambda_238 = np.log(2) / (4.4683 * 10**9) * (1/sec_per_yr)

#jaffey decay constants, 1/yr
lambda_232_yr = np.log(2)/(1.405*10**10)
lambda_235_yr = np.log(2)/(7.0381*10**8)
lambda_238_yr = np.log(2)/(4.4683*10**9)
lambda_232_yr = np.log(2) / (1.405 * 10**10)
lambda_235_yr = np.log(2) / (7.0381 * 10**8)
lambda_238_yr = np.log(2) / (4.4683 * 10**9)

#Sm and FT decay constants, 1/s
lambda_147 = 6.54*10**-12 * (1/sec_per_yr)
lambda_f = 8.46*10**-17 * (1/sec_per_yr)
lambda_147 = 6.54 * 10**-12 * (1 / sec_per_yr)
lambda_f = 8.46 * 10**-17 * (1 / sec_per_yr)

#Sm and FT decay constants, 1/yr
lambda_147_yr = 6.54*10**-12
lambda_f_yr = 8.46*10**-17
lambda_147_yr = 6.54 * 10**-12
lambda_f_yr = 8.46 * 10**-17

#Avogadro conversion constants
atom_mol = 6.02214076*10**23
atom_nmol = 6.02214076*10**14
atom_mol = 6.02214076 * 10**23
atom_nmol = 6.02214076 * 10**14

#ppm to atoms/g conversion factor, atomic weights from 2021 IUPAC report, uses 1/137.818 ratio for U isotopes
U235_ppm_atom=(1/1000000)*(0.0072559/238.02891)*atom_mol
U238_ppm_atom=(1/1000000)*(0.99274405/238.02891)*atom_mol
Th_ppm_atom=(1/1000000)*(1/232.0377)*atom_mol
Sm_ppm_atom = (1/1000000)*(0.015/150.36)*atom_mol
U235_ppm_atom = (1 / 1000000) * (0.0072559 / 238.02891) * atom_mol
U238_ppm_atom = (1 / 1000000) * (0.99274405 / 238.02891) * atom_mol
Th_ppm_atom = (1 / 1000000) * (1 / 232.0377) * atom_mol
Sm_ppm_atom = (1 / 1000000) * (0.015 / 150.36) * atom_mol

#mineral densities g/cc
ap_density = 3.19
Expand Down
Loading

0 comments on commit ebd812d

Please sign in to comment.