fix site solution model names

Author: bobmyhill

burnman/data/input_raw_endmember_datasets/hpx_eos_to_burnman.py

@@ -18,6 +18,10 @@
 from sympy.parsing.sympy_parser import parse_expr
 from burnman.constants import gas_constant
 from datetime import date
+import importlib
+import re
+import subprocess
+from pathlib import Path
 
 ds = [
     ["tc-thermoinput-igneous-2022-01-23/tc-ig50NCKFMASHTOCr.txt", "HGP_2018_ds633"],
@@ -119,9 +123,29 @@ def ordering_modifier(property_modifier, ordered):
             return np.array([E_disord, S_disord, V_disord])
 
 
+digit_map = {
+    "0": "zero",
+    "1": "one",
+    "2": "two",
+    "3": "three",
+    "4": "four",
+    "5": "five",
+    "6": "six",
+    "7": "seven",
+    "8": "eight",
+    "9": "nine",
+}
+
+
+def replace_numbers(match):
+    num_str = match.group()
+    return "".join(digit_map[d] for d in num_str)
+
+
 for solution_file, mbr_dataset in ds:
     logging.debug(f"{solution_file}, {mbr_dataset}")
-    dataset = eval(mbr_dataset)
+
+    dataset = importlib.import_module(f"burnman.minerals.{mbr_dataset}")
     out_ss = ""
     out_make = ""
 
@@ -332,6 +356,7 @@ def ordering_modifier(property_modifier, ordered):
                 # rename for insertion into string
                 if site_sp[0] == "x":
                     site_sp = site_sp[1:]
+                    site_sp = re.sub(r"\d+(\.\d+)?", replace_numbers, site_sp)
                     site_sp = "".join(filter(str.isalpha, site_sp)).title()
 
                 ss[i_site].append(site_sp)
@@ -405,8 +430,9 @@ def ordering_modifier(property_modifier, ordered):
         f"dataset {mbr_dataset}.\n"
         "The values in this document are all in S.I. units,\n"
         "unlike those in the original THERMOCALC file.\n"
-        "This file is autogenerated using process_HPX_eos.py\n"
+        "This file is autogenerated using hpx_eos_to_burnman.py\n"
         '"""\n\n'
+        f"import numpy as np\n"
         f"from numpy import array, nan\n"
         f"from . import {mbr_dataset}\n"
         "from ..classes.mineral import Mineral\n"
@@ -424,4 +450,7 @@ def ordering_modifier(property_modifier, ordered):
         print(f"from . import {solution_dataset}")
         text_file.write(output_string)
 
-print("Copy the above to ../../minerals/__init__.py:")
+print("Copy the above to ../../minerals/__init__.py.\n")
+
+directory = Path("../../minerals/")
+subprocess.run(["black", str(directory)])