wind_ae 2.0.1__tar.gz → 2.0.2__tar.gz

{wind_ae-2.0.1/wind_ae.egg-info → wind_ae-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wind_ae
-Version: 2.0.1
+Version: 2.0.2
 Summary: 1D relaxation Parker wind model with metal and X-ray physics based on Murray-Clay et al. (2009)
 Author: Madelyn Broome, John McCann, Ruth Murray-Clay
 License-Expression: BSD-3-Clause

{wind_ae-2.0.1 → wind_ae-2.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wind_ae"
-version = "2.0.1"
+version = "2.0.2"
 authors = [
     { name = "Madelyn Broome" },
     { name = "John McCann" },

{wind_ae-2.0.1 → wind_ae-2.0.2}/wind_ae/wrapper/wrapper_utils/plots.py

@@ -605,13 +605,17 @@ def energy_plot(windsoln, ax=None, alpha=1, plot_dom_lines=True, N_top_lines=2,
         r = windsoln.soln_norm['r']
 
         profiles = {}
-        for species in ['OI', 'OII', 'CI', 'CII', 'FeI', 'MgI','CaII', 'NeII']:
+        for species in ['OI', 'OII', 'CI', 'CII', 'FeI','FeII', 'MgI','MgII','CaI','CaII','NeII','NeIII']:
             if species in windsoln.species_list_unspaced:
                 species_spaced = McAtom.formatting_species_list([species])[0]
                 element_name, lowest_state = species_spaced.split()
                 highest_state = McAtom.arabic_to_roman(McAtom.roman_to_arabic(lowest_state) + 1)
-                ion_name = element_name + highest_state
-
+                lower_ion = element_name + lowest_state
+                higher_ion = element_name + highest_state
+                if lower_ion in coeff_table['Species'].values:
+                    ion_name = lower_ion
+                else:
+                    ion_name = higher_ion
                 lines = coeff_table.loc[coeff_table['Species'] == ion_name, 'Line'].astype(int).tolist()
                 for line_num in lines:
                     key = f'cool_{ion_name}_{line_num:.0f}A'

{wind_ae-2.0.1 → wind_ae-2.0.2}/wind_ae/wrapper/wrapper_utils/windsoln.py

@@ -368,7 +368,7 @@ class wind_solution:
         self.R_exo = np.nan
         # Skip unnecessary calculations when users is expediting windsoln
         if calc_postfacto:
-            self.add_user_vars(expedite = expedite_postfacto)
+            self.add_user_vars(expedite = expedite_postfacto, print_warnings=print_warnings)
             
 
     def _rate_coeff_interpolater(self,species):
@@ -881,8 +881,12 @@ class wind_solution:
                 highest_state = McAtom.arabic_to_roman(
                     McAtom.roman_to_arabic(lowest_state) + 1
                 )
-
-                ion_name = element_name + highest_state
+                lower_ion = element_name + lowest_state
+                higher_ion = element_name + highest_state
+                if lower_ion in coeff_table['Species'].values:
+                    ion_name = lower_ion
+                else:
+                    ion_name = higher_ion
                 mask = (coeff_table['Species'] == ion_name)
                 line, A, T_line, nc = (
                     coeff_table[mask]["Line"],
@@ -892,6 +896,7 @@ class wind_solution:
                 )
                 nIONj = self.soln["n_"+ion_name]
                 for idx in range(len(A.T)):
+                    # print(ion_name)
                     line_cool_cols[f'cool_{ion_name}_{line.iloc[idx]:.0f}A'] = (
                         -nIONj
                         * n_e
@@ -900,8 +905,9 @@ class wind_solution:
                         / (n_e * (1 + nc.iloc[idx] / n_e))
                     )
 
-            for species in ['OI', 'OII', 'CI', 'CII', 'FeI', 'MgI', 'CaI', 'NeII']:
+            for species in ['OI', 'OII', 'CI', 'CII', 'FeI', 'FeII', 'MgI', 'MgII', 'CaI', 'CaII', 'NeII', 'NeIII']:
                 if species in self.species_list_unspaced:
+                    # print(f"Computing line cooling for species: {species}")
                     compute_line_cool(species)
                 
             _assign_soln_cols(line_cool_cols)

{wind_ae-2.0.1 → wind_ae-2.0.2/wind_ae.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wind_ae
-Version: 2.0.1
+Version: 2.0.2
 Summary: 1D relaxation Parker wind model with metal and X-ray physics based on Murray-Clay et al. (2009)
 Author: Madelyn Broome, John McCann, Ruth Murray-Clay
 License-Expression: BSD-3-Clause