Skip to content

Add ANEOS pyrolite EOS table #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Francyrad wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add ANEOS pyrolite EOS table #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ set by a base type ID (multiplied by 100) plus a minor type:
+ Forsterite (Stewart et al. 2019): `ANEOS_forsterite` : `400`
+ Iron (Stewart, zenodo.org/record/3866507): `ANEOS_iron` : `401`
+ Fe85Si15 (Stewart, zenodo.org/record/3866550): `ANEOS_Fe85Si15` : `402`
+ Pyrolite ([Stewart 2022](https://github.com/ststewart/aneos-pyrolite-2022)): `ANEOS_pyrolite` : `403`
+ Custom (in SESAME-style tables): ``9``
+ User-provided custom material(s): ``900``, ``901``, ..., ``904``

Expand Down
639,856 changes: 639,856 additions & 0 deletions woma/data/ANEOS_pyrolite_2022.txt
View file
Open in desktop

Large diffs are not rendered by default.

119 changes: 119 additions & 0 deletions woma/eos/sesame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,33 @@ def load_phase_table_ANEOS_forsterite():
np.zeros((2, 2)),
np.zeros((2, 2)),
)
(
A1_rho_ANEOS_pyrolite,
A1_T_ANEOS_pyrolite,
A2_u_ANEOS_pyrolite,
A2_P_ANEOS_pyrolite,
A2_c_ANEOS_pyrolite,
A2_s_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A1_log_T_ANEOS_pyrolite,
A2_log_u_ANEOS_pyrolite,
A2_log_P_ANEOS_pyrolite,
A2_log_c_ANEOS_pyrolite,
A2_log_s_ANEOS_pyrolite,
) = (
np.zeros(1),
np.zeros(1),
np.zeros((2, 2)),
np.zeros((2, 2)),
np.zeros((2, 2)),
np.zeros((2, 2)),
np.zeros(1),
np.zeros(1),
np.zeros((2, 2)),
np.zeros((2, 2)),
np.zeros((2, 2)),
np.zeros((2, 2)),
)

# AQUA
(
Expand Down Expand Up @@ -767,6 +794,14 @@ def Z_rho_T(rho, T, mat_id, Z_choice):
A2_Z = A2_u_ANEOS_Fe85Si15
elif Z_choice == "s":
A2_Z = A2_s_ANEOS_Fe85Si15
elif mat_id == gv.id_ANEOS_pyrolite:
A1_log_rho, A1_log_T = (A1_log_rho_ANEOS_pyrolite, A1_log_T_ANEOS_pyrolite)
if Z_choice == "P":
A2_Z = A2_P_ANEOS_pyrolite
elif Z_choice == "u":
A2_Z = A2_u_ANEOS_pyrolite
elif Z_choice == "s":
A2_Z = A2_s_ANEOS_pyrolite
elif mat_id == gv.id_AQUA:
A1_log_rho, A1_log_T = (A1_log_rho_AQUA, A1_log_T_AQUA)
if Z_choice == "P":
Expand Down Expand Up @@ -1086,6 +1121,24 @@ def Z_rho_Y(rho, Y, mat_id, Z_choice, Y_choice):
A2_log_Y = A2_log_s_ANEOS_Fe85Si15
elif Y_choice == "c":
A2_log_Y = A2_log_c_ANEOS_Fe85Si15
elif mat_id == gv.id_ANEOS_pyrolite:
A1_log_rho = A1_log_rho_ANEOS_pyrolite
if Z_choice == "P":
A2_Z = A2_P_ANEOS_pyrolite
elif Z_choice == "u":
A2_Z = A2_u_ANEOS_pyrolite
elif Z_choice == "s":
A2_Z = A2_s_ANEOS_pyrolite
elif Z_choice == "c":
A2_Z = A2_c_ANEOS_pyrolite
if Y_choice == "P":
A2_log_Y = A2_log_P_ANEOS_pyrolite
elif Y_choice == "u":
A2_log_Y = A2_log_u_ANEOS_pyrolite
elif Y_choice == "s":
A2_log_Y = A2_log_s_ANEOS_pyrolite
elif Y_choice == "c":
A2_log_Y = A2_log_c_ANEOS_pyrolite
elif mat_id == gv.id_AQUA:
A1_log_rho = A1_log_rho_AQUA
if Z_choice == "P":
Expand Down Expand Up @@ -1508,6 +1561,24 @@ def Z_X_T(X, T, mat_id, Z_choice, X_choice):
A2_log_X = A2_log_s_ANEOS_Fe85Si15
elif X_choice == "c":
A2_log_X = A2_log_c_ANEOS_Fe85Si15
elif mat_id == gv.id_ANEOS_pyrolite:
A1_log_T = A1_log_T_ANEOS_pyrolite
if Z_choice == "P":
A2_Z = A2_P_ANEOS_pyrolite
elif Z_choice == "u":
A2_Z = A2_u_ANEOS_pyrolite
elif Z_choice == "s":
A2_Z = A2_s_ANEOS_pyrolite
elif Z_choice == "c":
A2_Z = A2_c_ANEOS_pyrolite
if X_choice == "P":
A2_log_X = A2_log_P_ANEOS_pyrolite
elif X_choice == "u":
A2_log_X = A2_log_u_ANEOS_pyrolite
elif X_choice == "s":
A2_log_X = A2_log_s_ANEOS_pyrolite
elif X_choice == "c":
A2_log_X = A2_log_c_ANEOS_pyrolite
elif mat_id == gv.id_AQUA:
A1_log_T = A1_log_T_AQUA
if Z_choice == "P":
Expand Down Expand Up @@ -1824,6 +1895,12 @@ def P_u_rho(u, rho, mat_id):
A1_log_rho_ANEOS_Fe85Si15,
A2_log_u_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A2_P, A1_log_rho, A2_log_u = (
A2_P_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A2_log_u_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A2_P, A1_log_rho, A2_log_u = (A2_P_AQUA, A1_log_rho_AQUA, A2_log_u_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down Expand Up @@ -2015,6 +2092,12 @@ def P_T_rho(T, rho, mat_id):
A1_log_rho_ANEOS_Fe85Si15,
A1_log_T_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A2_P, A1_log_rho, A1_log_T = (
A2_P_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A1_log_T_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A2_P, A1_log_rho, A1_log_T = (A2_P_AQUA, A1_log_rho_AQUA, A1_log_T_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down Expand Up @@ -2179,6 +2262,12 @@ def T_rho_s(rho, s, mat_id):
A1_log_rho_ANEOS_Fe85Si15,
A2_s_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A1_log_T, A1_log_rho, A2_s = (
A1_log_T_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A2_s_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A1_log_T, A1_log_rho, A2_s = (A1_log_T_AQUA, A1_log_rho_AQUA, A2_s_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down Expand Up @@ -2332,6 +2421,12 @@ def T_u_rho(u, rho, mat_id):
A1_log_rho_ANEOS_Fe85Si15,
A2_u_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A1_log_T, A1_log_rho, A2_u = (
A1_log_T_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A2_u_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A1_log_T, A1_log_rho, A2_u = (A1_log_T_AQUA, A1_log_rho_AQUA, A2_u_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down Expand Up @@ -2488,6 +2583,12 @@ def u_rho_T(rho, T, mat_id):
A1_log_rho_ANEOS_Fe85Si15,
A1_log_T_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A2_u, A1_log_rho, A1_log_T = (
A2_u_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A1_log_T_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A2_u, A1_log_rho, A1_log_T = (A2_u_AQUA, A1_log_rho_AQUA, A1_log_T_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down Expand Up @@ -2669,6 +2770,12 @@ def s_u_rho(u, rho, mat_id):
A1_log_rho_ANEOS_Fe85Si15,
A2_log_u_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A2_s, A1_log_rho, A2_log_u = (
A2_s_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A2_log_u_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A2_s, A1_log_rho, A2_log_u = (A2_s_AQUA, A1_log_rho_AQUA, A2_log_u_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down Expand Up @@ -2855,6 +2962,12 @@ def s_rho_T(rho, T, mat_id):
A1_log_rho_ANEOS_Fe85Si15,
A1_log_T_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A2_s, A1_log_rho, A1_log_T = (
A2_s_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A1_log_T_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A2_s, A1_log_rho, A1_log_T = (A2_s_AQUA, A1_log_rho_AQUA, A1_log_T_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down Expand Up @@ -3039,6 +3152,12 @@ def rho_u_P(u, P, mat_id, rho_ref):
A1_log_rho_ANEOS_Fe85Si15,
A2_log_u_ANEOS_Fe85Si15,
)
elif mat_id == gv.id_ANEOS_pyrolite:
A2_P, A1_log_rho, A2_log_u = (
A2_P_ANEOS_pyrolite,
A1_log_rho_ANEOS_pyrolite,
A2_log_u_ANEOS_pyrolite,
)
elif mat_id == gv.id_AQUA:
A2_P, A1_log_rho, A2_log_u = (A2_P_AQUA, A1_log_rho_AQUA, A2_log_u_AQUA)
elif mat_id == gv.id_CMS19_H:
Expand Down
3 changes: 3 additions & 0 deletions woma/misc/glob_vars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"ANEOS_forsterite": Di_mat_type["ANEOS"] * type_factor, # Stewart et al. (2019)
"ANEOS_iron": Di_mat_type["ANEOS"] * type_factor + 1, # Stewart (2020)
"ANEOS_Fe85Si15": Di_mat_type["ANEOS"] * type_factor + 2, # Stewart (2020)
"ANEOS_pyrolite": Di_mat_type["ANEOS"] * type_factor + 3, # Stewart (2022)
# Mixed
"mixed_HHe_heavy": Di_mat_type["mixed"] * type_factor, # Vazan et al. (2013)
"mixed_HHe_rock": Di_mat_type["mixed"] * type_factor + 1,
Expand Down Expand Up @@ -97,6 +98,7 @@
id_ANEOS_forsterite = Di_mat_id["ANEOS_forsterite"]
id_ANEOS_iron = Di_mat_id["ANEOS_iron"]
id_ANEOS_Fe85Si15 = Di_mat_id["ANEOS_Fe85Si15"]
id_ANEOS_pyrolite = Di_mat_id["ANEOS_pyrolite"]
id_mixed_HHe_heavy = Di_mat_id["mixed_HHe_heavy"]
id_mixed_HHe_rock = Di_mat_id["mixed_HHe_rock"]
id_mixed_HHe_water = Di_mat_id["mixed_HHe_water"]
Expand Down Expand Up @@ -141,6 +143,7 @@
Fp_ANEOS_forsterite = dir_data + "ANEOS_forsterite_S19.txt"
Fp_ANEOS_iron = dir_data + "ANEOS_iron_S20.txt"
Fp_ANEOS_Fe85Si15 = dir_data + "ANEOS_Fe85Si15_S20.txt"
Fp_ANEOS_pyrolite = dir_data + "ANEOS_pyrolite_2022.txt"
# Mixed tables
Fp_mixed_HHe_rock = dir_data + "mixed_HHe_rock.hdf5"
Fp_mixed_HHe_water = dir_data + "mixed_HHe_water.hdf5"
Expand Down
17 changes: 17 additions & 0 deletions woma/misc/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,8 @@ def check_loaded_eos_tables():
A1_mat.remove("ANEOS_iron")
if len(eos.sesame.A1_rho_ANEOS_Fe85Si15) == 1:
A1_mat.remove("ANEOS_Fe85Si15")
if len(eos.sesame.A1_rho_ANEOS_pyrolite) == 1:
A1_mat.remove("ANEOS_pyrolite")

if len(eos.sesame.A1_rho_AQUA) == 1:
A1_mat.remove("AQUA")
Expand Down Expand Up @@ -886,6 +888,21 @@ def load_eos_tables(A1_mat_input=None):
eos.sesame.A2_log_c_ANEOS_Fe85Si15,
eos.sesame.A2_log_s_ANEOS_Fe85Si15,
) = eos.sesame.load_table_SESAME(gv.Fp_ANEOS_Fe85Si15)
if "ANEOS_pyrolite" in A1_mat and len(eos.sesame.A1_rho_ANEOS_pyrolite) == 1:
(
eos.sesame.A1_rho_ANEOS_pyrolite,
eos.sesame.A1_T_ANEOS_pyrolite,
eos.sesame.A2_u_ANEOS_pyrolite,
eos.sesame.A2_P_ANEOS_pyrolite,
eos.sesame.A2_c_ANEOS_pyrolite,
eos.sesame.A2_s_ANEOS_pyrolite,
eos.sesame.A1_log_rho_ANEOS_pyrolite,
eos.sesame.A1_log_T_ANEOS_pyrolite,
eos.sesame.A2_log_u_ANEOS_pyrolite,
eos.sesame.A2_log_P_ANEOS_pyrolite,
eos.sesame.A2_log_c_ANEOS_pyrolite,
eos.sesame.A2_log_s_ANEOS_pyrolite,
) = eos.sesame.load_table_SESAME(gv.Fp_ANEOS_pyrolite)
if "AQUA" in A1_mat and len(eos.sesame.A1_rho_AQUA) == 1:
(
eos.sesame.A1_rho_AQUA,
Expand Down