add anhydrous HP igneous solutions

geodynamics · May 28, 2024 · 731aacf · 731aacf
1 parent 5f640f3
commit 731aacf
Show file tree

Hide file tree

Showing 4 changed files with 561 additions and 3 deletions.
diff --git a/burnman/data/input_raw_endmember_datasets/hpx_eos_to_burnman.py b/burnman/data/input_raw_endmember_datasets/hpx_eos_to_burnman.py
@@ -24,6 +24,7 @@
 dataset = HGP_2018_ds633
 mbr_dataset = "HGP_2018_ds633"
 solution_file = "tc-thermoinput-igneous-2022-01-23/tc-ig50NCKFMASHTOCr.txt"
+solution_file = "tc-thermoinput-igneous-2022-01-23/tc-ig50NCKFMASTOCr.txt"
 first_model = "pl4tr"  # melt and fl are (currently unreadable) Temkin models
 
 # logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
@@ -146,8 +147,12 @@ def ordering_modifier(property_modifier, ordered):
                 if increment_i:
                     i += 1
 
+n_data = len(data)
+
 noods = []
-for k in range(16):
+while True:
+    if i > n_data - 3:
+        break
     name = data[i][0]
     n_mbrs = int(data[i][1])
     logging.debug(f"Solution: {name}")

diff --git a/burnman/minerals/__init__.py b/burnman/minerals/__init__.py
@@ -53,6 +53,7 @@
 from . import JH_2015
 from . import HGP_2018_ds633
 from . import ig50NCKFMASHTOCr
+from . import ig50NCKFMASTOCr
 
 # Kurnosov et al. 2017
 from . import KMFBZ_2017