add arrays for nested inlist

remains compatible with previous MESA versions while also checking nested
inlist for MESA > r23.05.1.

This addresses the non-backward compatible change introduced in this MESA
version, see https://docs.mesastar.org/en/latest/changelog.html#changes-in-r23-05-1

Author: mathren

README.org

@@ -19,7 +19,7 @@ This can be used inside of scripts or notebooks, or from command line
    Install the latest version from this repository:
 
 #+begin_src bash
-pip install git+https://github.com/mathren/compare_workdir_MESA/
+$ pip install git+https://github.com/mathren/compare_workdir_MESA/
 #+end_src
 
 

src/compare_workdir/compare_all_workdir_inlists.py

@@ -131,6 +131,7 @@ def check_if_more_star_job(job: "dict", work_dir="./") -> "list":
     Check if there are more star_job namelists to be read and returns a
     list of the paths to their inlists
     """
+    print(job)
     inlists_to_be_read = []
     if job.get("read_extra_star_job_inlist1") == ".true.":
         new_inlist = job.get("extra_star_job_inlist1_name").strip("'").strip('"')
@@ -147,6 +148,22 @@ def check_if_more_star_job(job: "dict", work_dir="./") -> "list":
     if job.get("read_extra_star_job_inlist5") == ".true.":
         new_inlist = job.get("extra_star_job_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if job.get("read_extra_star_job_inlist(1)") == ".true.":
+        new_inlist = job.get("extra_star_job_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_star_job_inlist(2)") == ".true.":
+        new_inlist = job.get("extra_star_job_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_star_job_inlist(3)") == ".true.":
+        new_inlist = job.get("extra_star_job_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_star_job_inlist(4)") == ".true.":
+        new_inlist = job.get("extra_star_job_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_star_job_inlist(5)") == ".true.":
+        new_inlist = job.get("extra_star_job_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 
@@ -171,6 +188,22 @@ def check_if_more_eos(eos: "dict", work_dir="./") -> "list":
     if eos.get("read_extra_eos_inlist5") == ".true.":
         new_inlist = eos.get("extra_eos_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if eos.get("read_extra_eos_inlist(1)") == ".true.":
+        new_inlist = eos.get("extra_eos_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if eos.get("read_extra_eos_inlist(2)") == ".true.":
+        new_inlist = eos.get("extra_eos_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if eos.get("read_extra_eos_inlist(3)") == ".true.":
+        new_inlist = eos.get("extra_eos_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if eos.get("read_extra_eos_inlist(4)") == ".true.":
+        new_inlist = eos.get("extra_eos_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if eos.get("read_extra_eos_inlist(5)") == ".true.":
+        new_inlist = eos.get("extra_eos_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 
@@ -195,6 +228,22 @@ def check_if_more_kap(kap: "dict", work_dir="./") -> "list":
     if kap.get("read_extra_kap_inlist5") == ".true.":
         new_inlist = kap.get("extra_kap_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if kap.get("read_extra_kap_inlist(1)") == ".true.":
+        new_inlist = kap.get("extra_kap_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if kap.get("read_extra_kap_inlist(2)") == ".true.":
+        new_inlist = kap.get("extra_kap_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if kap.get("read_extra_kap_inlist(3)") == ".true.":
+        new_inlist = kap.get("extra_kap_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if kap.get("read_extra_kap_inlist(4)") == ".true.":
+        new_inlist = kap.get("extra_kap_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if kap.get("read_extra_kap_inlist(5)") == ".true.":
+        new_inlist = kap.get("extra_kap_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 
@@ -219,6 +268,22 @@ def check_if_more_binary_job(job: "dict", work_dir="./") -> "list":
     if job.get("read_extra_binary_job_inlist5") == ".true.":
         new_inlist = job.get("extra_binary_job_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if job.get("read_extra_binary_job_inlist(1)") == ".true.":
+        new_inlist = job.get("extra_binary_job_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_binary_job_inlist(2)") == ".true.":
+        new_inlist = job.get("extra_binary_job_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_binary_job_inlist(3)") == ".true.":
+        new_inlist = job.get("extra_binary_job_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_binary_job_inlist(4)") == ".true.":
+        new_inlist = job.get("extra_binary_job_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if job.get("read_extra_binary_job_inlist(5)") == ".true.":
+        new_inlist = job.get("extra_binary_job_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 
@@ -243,6 +308,22 @@ def check_if_more_controls(controls: "dict", work_dir="./") -> "inlist":
     if controls.get("read_extra_controls_inlist5") == ".true.":
         new_inlist = controls.get("extra_controls_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if controls.get("read_extra_controls_inlist(1)") == ".true.":
+        new_inlist = controls.get("extra_controls_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if controls.get("read_extra_controls_inlist(2)") == ".true.":
+        new_inlist = controls.get("extra_controls_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if controls.get("read_extra_controls_inlist(3)") == ".true.":
+        new_inlist = controls.get("extra_controls_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if controls.get("read_extra_controls_inlist(4)") == ".true.":
+        new_inlist = controls.get("extra_controls_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if controls.get("read_extra_controls_inlist(5)") == ".true.":
+        new_inlist = controls.get("extra_controls_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 
@@ -267,6 +348,22 @@ def check_if_more_binary_controls(binary_controls: "dict", work_dir="./") -> "li
     if binary_controls.get("read_extra_binary_controls_inlist5") == ".true.":
         new_inlist = binary_controls.get("extra_binary_controls_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if binary_controls.get("read_extra_binary_controls_inlist(1)") == ".true.":
+        new_inlist = binary_controls.get("extra_binary_controls_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_controls.get("read_extra_binary_controls_inlist(2)") == ".true.":
+        new_inlist = binary_controls.get("extra_binary_controls_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_controls.get("read_extra_binary_controls_inlist(3)") == ".true.":
+        new_inlist = binary_controls.get("extra_binary_controls_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_controls.get("read_extra_binary_controls_inlist(4)") == ".true.":
+        new_inlist = binary_controls.get("extra_binary_controls_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_controls.get("read_extra_binary_controls_inlist(5)") == ".true.":
+        new_inlist = binary_controls.get("extra_binary_controls_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 
@@ -291,6 +388,22 @@ def check_if_more_pgstar(pgstar: "dict", work_dir="./") -> "list":
     if pgstar.get("read_extra_pgstar_inlist5") == ".true.":
         new_inlist = pgstar.get("extra_pgstar_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if pgstar.get("read_extra_pgstar_inlist(1)") == ".true.":
+        new_inlist = pgstar.get("extra_pgstar_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if pgstar.get("read_extra_pgstar_inlist(2)") == ".true.":
+        new_inlist = pgstar.get("extra_pgstar_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if pgstar.get("read_extra_pgstar_inlist(3)") == ".true.":
+        new_inlist = pgstar.get("extra_pgstar_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if pgstar.get("read_extra_pgstar_inlist(4)") == ".true.":
+        new_inlist = pgstar.get("extra_pgstar_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if pgstar.get("read_extra_pgstar_inlist(5)") == ".true.":
+        new_inlist = pgstar.get("extra_pgstar_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 
@@ -315,6 +428,22 @@ def check_if_more_binary_pgstar(binary_pgstar: "dict", work_dir="./") -> "list":
     if binary_pgstar.get("read_extra_binary_pgstar_inlist5") == ".true.":
         new_inlist = binary_pgstar.get("extra_binary_pgstar_inlist5_name").strip("'").strip('"')
         inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    # MESA versions > 23.05.1 turned these into arrays
+    if binary_pgstar.get("read_extra_binary_pgstar_inlist(1)") == ".true.":
+        new_inlist = binary_pgstar.get("extra_binary_pgstar_inlist_name(1)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_pgstar.get("read_extra_binary_pgstar_inlist(2)") == ".true.":
+        new_inlist = binary_pgstar.get("extra_binary_pgstar_inlist_name(2)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_pgstar.get("read_extra_binary_pgstar_inlist(3)") == ".true.":
+        new_inlist = binary_pgstar.get("extra_binary_pgstar_inlist_name(3)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_pgstar.get("read_extra_binary_pgstar_inlist(4)") == ".true.":
+        new_inlist = binary_pgstar.get("extra_binary_pgstar_inlist_name(4)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
+    if binary_pgstar.get("read_extra_binary_pgstar_inlist(5)") == ".true.":
+        new_inlist = binary_pgstar.get("extra_binary_pgstar_inlist_name(5)").strip("'").strip('"')
+        inlists_to_be_read = append_inlist_path(inlists_to_be_read, new_inlist, work_dir)
     return inlists_to_be_read
 
 

src/compare_workdir/compare_inlists.py

@@ -193,10 +193,17 @@ def get_job_namelist(inlist: "str"):
     return job, is_binary
 
 
-def get_controls_namelist(inlist: "str") -> "dict":
+def get_controls_namelist(inlist: str):
     """
     returns a dictionary of the controls or binary_controls namelist entries and values
     and a flag for binaries
+    Parameters:
+    ----------
+    inlist: `str` path to inlist
+    Returns:
+    controls: `dict`, dictionary of the controls namelist options and values
+    is_binary: `bool`, was the namelist binary_constrols inlist of not
+    -------
     """
     controls = {}
     is_binary = False