merge main into branch

Author: Eb

CODEOWNERS

@@ -18,7 +18,8 @@ gyre/ @rhdtownsend @warrickball
 hdfio5 @rhdtownsend
 interp_1d/ @rhdtownsend 
 interp_2d/ @rhdtownsend 
-kap/ @fxt44
+ionization/ @fxt44
+kap/ @fxt44 @Debraheem
 linters/ 
 turb/ 
 math/ @rhdtownsend
@@ -88,6 +89,7 @@ star/test_suite/make_he_wd @evbauer @fxt44
 star/test_suite/make_metals @fxt44
 star/test_suite/make_o_ne_wd @fxt44 @evbauer
 star/test_suite/make_planets @fxt44
+star/test_suite/make_pre_ccsn_13bvn @Debraheem
 star/test_suite/make_sdb @evbauer
 star/test_suite/make_zams @fxt44
 star/test_suite/make_zams_low_mass @fxt44
@@ -126,11 +128,11 @@ star/test_suite/wd_he_shell_ignition @wmwolf
 star/test_suite/wd_nova_burst @wmwolf
 star/test_suite/wd_stable_h_burn @wmwolf
 
-star/test_suite/12M_pre_ms_to_core_collapse 
-star/test_suite/20M_pre_ms_to_core_collapse 
-star/test_suite/split_burn_big_net 
-star/test_suite/zams_to_cc_80 
-star/test_suite/20M_z2m2_high_rotation 
+star/test_suite/12M_pre_ms_to_core_collapse @Debraheem
+star/test_suite/20M_pre_ms_to_core_collapse @Debraheem
+star/test_suite/split_burn_big_net
+star/test_suite/zams_to_cc_80 @Debraheem
+star/test_suite/20M_z2m2_high_rotation
 
 
 binary/test_suite/double_bh @orlox 

astero/defaults/astero_search.defaults

@@ -85,6 +85,8 @@
    ! constraint_sigma(:)
    ! ~~~~~~~~~~~~~~~~~~~
 
+   ! ::
+
       constraint_name(:) = '' ! change this to whatever you want
       constraint_target(:) = 0
       constraint_sigma(:) = 0
@@ -102,7 +104,7 @@
    ! Z_div_X_solar
    ! ~~~~~~~~~~~~~
    ! Convenience parameter leftover from the old interface that
-   ! can be used when calculating things relative to solar metallicity.
+   ! can be used when calculating things relative to solar metallicity. ::
 
       Z_div_X_solar = 0.02293d0
 
@@ -130,7 +132,7 @@
 
    ! dt_for_smaller_steps_before_age_target
    ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   ! This should be much smaller than ``age_sigma``.
+   ! This should be much smaller than ``age_sigma``. ::
 
       dt_for_smaller_steps_before_age_target = 0.0065d8 ! 1/10 age_sigma
 
@@ -570,6 +572,7 @@
    ! parameters in the ``set_param`` subroutine in
    ! ``run_star_extras.f90``, or rely on the default
    ! implementation, which provides the legacy options
+
    ! * ``initial_mass``
    ! * ``initial_Y``
    ! * ``initial_FeH``
@@ -587,7 +590,7 @@
    ! ~~~~~~~~~~
    ! If ``.true.``, that parameter will be varied by the search.
    ! If ``.false.``, that parameter will be fixed at the first value
-   ! (see ``first_param``).
+   ! (see ``first_param``). ::
 
       vary_param(:) = .false.
 
@@ -941,7 +944,7 @@
    ! ~~~~~~~~~~~~~~~~~~~~~~~~~
 
    ! Formats for writing floats (reals), integers and characters
-   ! (strings) to the results file.
+   ! (strings) to the results file. ::
 
       astero_results_dbl_format = '(1pes26.16)'
       astero_results_int_format = '(i26)'
@@ -1166,16 +1169,16 @@
    ! The GYRE controls are read from the ``gyre_input_file``.
    ! Rich offers the following comments on setting them:
 
-   ! > I suggest setting freq_min to 0.9*MINVAL(l0_obs),
-   ! > and freq_max to 1.1*MAXVAL(l0_obs)
-   ! > (similarly for the other l values).
+   !  I suggest setting freq_min to 0.9*MINVAL(l0_obs),
+   !  and freq_max to 1.1*MAXVAL(l0_obs)
+   !  (similarly for the other l values).
 
-   ! > freq_units should be 'UHZ',
-   ! > and set grid_type to 'LINEAR'.
+   !  freq_units should be 'UHZ',
+   !  and set grid_type to 'LINEAR'.
 
-   ! > For n_freq, I suggest either setting it to 10*(freq_max - freq_min)/dfreq,
-   ! > where dfreq is the estimated frequency spacing; or, set it to 10*nl0.
-   ! > The factor 10 is arbitrary, but seems to be a good safety factor.
+   !  For n_freq, I suggest either setting it to 10*(freq_max - freq_min)/dfreq,
+   !  where dfreq is the estimated frequency spacing; or, set it to 10*nl0.
+   !  The factor 10 is arbitrary, but seems to be a good safety factor.
 
    ! gyre_input_file
    ! ~~~~~~~~~~~~~~~

binary/test_suite/double_bh/history_columns.list

@@ -584,8 +584,7 @@
          ! sqrt(2) pi^2/(integral of brunt_N/r dr)
       !log_delta_Pg
       !nu_max ! estimate from scaling relation (microHz)
-         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
-         ! with nu_max_sun = 3100 microHz, Teff_sun = 5777
+         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
       !nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
       !acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
       !acoustic_radius ! integral of dr/csound (seconds)

binary/test_suite/evolve_both_stars/history_columns.list

@@ -529,8 +529,7 @@
          ! sqrt(2) pi^2/(integral of brunt_N/r dr)
       !log_delta_Pg
       !nu_max ! estimate from scaling relation (microHz)
-         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
-         ! with nu_max_sun = 3100 microHz, Teff_sun = 5777
+         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
       !nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
       !acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
       !ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

binary/test_suite/jdot_ls_check/history_columns.list

@@ -529,8 +529,7 @@
          ! sqrt(2) pi^2/(integral of brunt_N/r dr)
       !log_delta_Pg
       !nu_max ! estimate from scaling relation (microHz)
-         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
-         ! with nu_max_sun = 3100 microHz, Teff_sun = 5777
+         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
       !nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
       !acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
       !ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

binary/test_suite/jdot_ml_check/history_columns.list

@@ -529,8 +529,7 @@
          ! sqrt(2) pi^2/(integral of brunt_N/r dr)
       !log_delta_Pg
       !nu_max ! estimate from scaling relation (microHz)
-         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
-         ! with nu_max_sun = 3100 microHz, Teff_sun = 5777
+         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
       !nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
       !acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
       !ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

binary/test_suite/star_plus_point_mass/history_columns.list

@@ -529,8 +529,7 @@
          ! sqrt(2) pi^2/(integral of brunt_N/r dr)
       !log_delta_Pg
       !nu_max ! estimate from scaling relation (microHz)
-         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
-         ! with nu_max_sun = 3100 microHz, Teff_sun = 5777
+         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
       !nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
       !acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
       !ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

binary/test_suite/star_plus_point_mass_explicit_mdot/history_columns.list

@@ -529,8 +529,7 @@
          ! sqrt(2) pi^2/(integral of brunt_N/r dr)
       !log_delta_Pg
       !nu_max ! estimate from scaling relation (microHz)
-         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
-         ! with nu_max_sun = 3100 microHz, Teff_sun = 5777
+         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
       !nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
       !acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
       !ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

binary/test_suite/wind_fed_bhhmxb/history_columns.list

@@ -529,8 +529,7 @@
          ! sqrt(2) pi^2/(integral of brunt_N/r dr)
       !log_delta_Pg
       !nu_max ! estimate from scaling relation (microHz)
-         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
-         ! with nu_max_sun = 3100 microHz, Teff_sun = 5777
+         ! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
       !nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
       !acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
       !ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

clean

@@ -13,6 +13,7 @@ echo "removing some data to force reinstall"
 rm -rf data/atm_data
 rm -rf data/eosDT_data
 rm -rf data/kap_data
+rm -rf data/ionization_data
 rm -rf data/chem_data
 rm -rf data/colors_data
 rm -rf data/rates_data/cache