Skip to content

Commit

Permalink
corrected mineral table
Browse files Browse the repository at this point in the history
  • Loading branch information
bomtuckle committed Mar 3, 2022
1 parent 0ba572f commit 2026f46
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions pyrolite/mineral/normative.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"An": {"name": "anorthite", "formulae": "CaO Al2O3 2SiO2"},
"Ns": {"name": "sodium metasilicate", "formulae": "Na2O SiO2"},
"Ac": {"name": "acmite", "formulae": "Na2O Fe2O3 4SiO2"},
"Tn": {"name": "thenardite", "formulae": "Na2O SO3"},
"Th": {"name": "thenardite", "formulae": "Na2O SO3"},
"Ab": {"name": "albite", "formulae": "Na2O Al2O3 6SiO2"},
"Or": {"name": "orthoclase", "formulae": "K2O Al2O3 6SiO2"},
"Pf": {"name": "perovskite", "formulae": "CaO TiO2"},
Expand All @@ -48,8 +48,9 @@
"Fe-Hy": {"name": "ferrosilite", "formulae": "FeO SiO2"},
"Mg-Hy": {"name": "enstatite", "formulae": "MgO SiO2"},
"Wo": {"name": "wollastonite", "formulae": "CaO SiO2"},
"Nc": {"name": "sodium carbonate", "formulae": "Na2O CO2"},
"Hl": {"name": "halite", "formulae": "NaCl"}
"Nc": {"name": "cancrinite", "formulae": "Na2O CO2"},
"Hl": {"name": "halite", "formulae": "NaCl"},
"Tn": {"name": "titanite", "formulae": "CaO TiO2 SiO2"},
}

# Add standard masses to minerals
Expand Down Expand Up @@ -623,7 +624,7 @@ def corr_m_wt(oxide):
minerals['Cc']['mass'] = df['MW_CaO_corr'] + 44.0095
minerals['Ab']['mass'] = df['MW_Na2O_corr'] + 462.467076
minerals['Ne']['mass'] = df['MW_Na2O_corr'] + 222.129876
minerals['Tn']['mass'] = df['MW_Na2O_corr'] + 80.0642
minerals['Th']['mass'] = df['MW_Na2O_corr'] + 80.0642
minerals['Nc']['mass'] = df['MW_Na2O_corr'] + 44.0095
minerals['Ac']['mass'] = df['MW_Na2O_corr'] + 400.0254
minerals['Ns']['mass'] = df['MW_Na2O_corr'] + 60.0843
Expand Down

0 comments on commit 2026f46

Please sign in to comment.