Skip to content

Commit c986703

Browse files
evbauerevbauer
committed
Merge branch 'main' into remove_HELM_floor
2 parents 143cf6d + ab64b54 commit c986703

File tree

166 files changed

+1551
-898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+1551
-898
lines changed

‎CODEOWNERS‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ gyre/ @rhdtownsend @warrickball
1818
hdfio5 @rhdtownsend
1919
interp_1d/ @rhdtownsend
2020
interp_2d/ @rhdtownsend
21-
kap/ @fxt44
21+
kap/ @fxt44 @Debraheem
2222
linters/
2323
turb/
2424
math/ @rhdtownsend
@@ -88,6 +88,7 @@ star/test_suite/make_he_wd @evbauer @fxt44
8888
star/test_suite/make_metals @fxt44
8989
star/test_suite/make_o_ne_wd @fxt44 @evbauer
9090
star/test_suite/make_planets @fxt44
91+
star/test_suite/make_pre_ccsn_13bvn @Debraheem
9192
star/test_suite/make_sdb @evbauer
9293
star/test_suite/make_zams @fxt44
9394
star/test_suite/make_zams_low_mass @fxt44
@@ -126,11 +127,11 @@ star/test_suite/wd_he_shell_ignition @wmwolf
126127
star/test_suite/wd_nova_burst @wmwolf
127128
star/test_suite/wd_stable_h_burn @wmwolf
128129

129-
star/test_suite/12M_pre_ms_to_core_collapse
130-
star/test_suite/20M_pre_ms_to_core_collapse
131-
star/test_suite/split_burn_big_net
132-
star/test_suite/zams_to_cc_80
133-
star/test_suite/20M_z2m2_high_rotation
130+
star/test_suite/12M_pre_ms_to_core_collapse @Debraheem
131+
star/test_suite/20M_pre_ms_to_core_collapse @Debraheem
132+
star/test_suite/split_burn_big_net
133+
star/test_suite/zams_to_cc_80 @Debraheem
134+
star/test_suite/20M_z2m2_high_rotation
134135

135136

136137
binary/test_suite/double_bh @orlox

‎binary/test_suite/double_bh/history_columns.list‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,8 +584,7 @@
584584
! sqrt(2) pi^2/(integral of brunt_N/r dr)
585585
!log_delta_Pg
586586
!nu_max ! estimate from scaling relation (microHz)
587-
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
588-
! with nu_max_sun = 3100 microHz, Teff_sun = 5777
587+
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
589588
!nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
590589
!acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
591590
!acoustic_radius ! integral of dr/csound (seconds)

‎binary/test_suite/evolve_both_stars/history_columns.list‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,7 @@
529529
! sqrt(2) pi^2/(integral of brunt_N/r dr)
530530
!log_delta_Pg
531531
!nu_max ! estimate from scaling relation (microHz)
532-
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
533-
! with nu_max_sun = 3100 microHz, Teff_sun = 5777
532+
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
534533
!nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
535534
!acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
536535
!ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

‎binary/test_suite/jdot_ls_check/history_columns.list‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,7 @@
529529
! sqrt(2) pi^2/(integral of brunt_N/r dr)
530530
!log_delta_Pg
531531
!nu_max ! estimate from scaling relation (microHz)
532-
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
533-
! with nu_max_sun = 3100 microHz, Teff_sun = 5777
532+
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
534533
!nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
535534
!acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
536535
!ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

‎binary/test_suite/jdot_ml_check/history_columns.list‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,7 @@
529529
! sqrt(2) pi^2/(integral of brunt_N/r dr)
530530
!log_delta_Pg
531531
!nu_max ! estimate from scaling relation (microHz)
532-
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
533-
! with nu_max_sun = 3100 microHz, Teff_sun = 5777
532+
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
534533
!nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
535534
!acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
536535
!ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

‎binary/test_suite/star_plus_point_mass/history_columns.list‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,7 @@
529529
! sqrt(2) pi^2/(integral of brunt_N/r dr)
530530
!log_delta_Pg
531531
!nu_max ! estimate from scaling relation (microHz)
532-
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
533-
! with nu_max_sun = 3100 microHz, Teff_sun = 5777
532+
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
534533
!nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
535534
!acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
536535
!ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

‎binary/test_suite/star_plus_point_mass_explicit_mdot/history_columns.list‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,7 @@
529529
! sqrt(2) pi^2/(integral of brunt_N/r dr)
530530
!log_delta_Pg
531531
!nu_max ! estimate from scaling relation (microHz)
532-
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
533-
! with nu_max_sun = 3100 microHz, Teff_sun = 5777
532+
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
534533
!nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
535534
!acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
536535
!ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

‎binary/test_suite/wind_fed_bhhmxb/history_columns.list‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,7 @@
529529
! sqrt(2) pi^2/(integral of brunt_N/r dr)
530530
!log_delta_Pg
531531
!nu_max ! estimate from scaling relation (microHz)
532-
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/Teff_sun)^0.5)
533-
! with nu_max_sun = 3100 microHz, Teff_sun = 5777
532+
! nu_max = nu_max_sun * M/Msun / ((R/Rsun)^2 (Teff/astero_Teff_sun)^0.5)
534533
!nu_max_3_4th_div_delta_nu ! nu_max^0.75/delta_nu
535534
!acoustic_cutoff ! 0.5*g*sqrt(gamma1*rho/P) at surface
536535
!ng_for_nu_max ! = 1 / (nu_max*delta_Pg)

‎docs/source/changelog.rst‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ Previously we had logic to determine if a extra history value should be saved
2828
as an int or a float (users can only provide data as a float). This was error
2929
prone, so now we save extra history values as floats.
3030

31+
Asteroseismic scaling relations
32+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33+
34+
The default values of the parameters ``delta_nu_sun`` and ``nu_max_sun`` used in the asteroseismic scaling relations
35+
have been updated to the values reported by `Lund et al. (2017) <https://ui.adsabs.harvard.edu/abs/2017ApJ...835..172L/abstract>`_
36+
(:math:`\Delta\nu_\odot = \mathrm{134.91}\,\mu\mathrm{Hz}` and :math:`\nu_{\mathrm{max},\odot} = \mathrm{3078}\,\mu\mathrm{Hz}`).
37+
The parameter ``Teff_sun`` has been renamed ``astero_Teff_sun`` to avoid confusion
38+
with the fixed constant ``Teffsun`` in the ``const`` module. ``astero_Teff_sun``'s
39+
default value has been set to 5772 K, as in `IAU 2015 Resolution B3 <https://ui.adsabs.harvard.edu/abs/2015arXiv151007674M>`_.
3140

3241
.. _New Features main:
3342

@@ -47,7 +56,6 @@ to a ``rates_list`` file, or by using the option ``filename_of_special_rate``.
4756
Several examples in the test suite now make use of these rates, such as
4857
massive stars and models for building white dwarfs.
4958

50-
5159
Maximum net size
5260
~~~~~~~~~~~~~~~~
5361

@@ -87,10 +95,22 @@ section (see documentation at :ref:`reference/controls:phase_separation_option`)
8795
The phase diagram for O/Ne separation comes from
8896
`Blouin & Daligault (2021b) <https://ui.adsabs.harvard.edu/abs/2021ApJ...919...87B/abstract>`_.
8997

98+
Massive Star test_suite Updates
99+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
100+
101+
The ``12Msun_pre_ms_to_core_collapse``, ``20Msun_pre_ms_to_core_collapse``, and ``zams_to_cc_80``
102+
test_suites have each been updated and now fully evolve models at solar metallicities to core
103+
collapse while keeping their surface boundaries at tau = 1. The models offer a framework which
104+
has been tested to function with large reaction networks containing > 200 isotopes thanks to
105+
'op_split_burn'. This updates includes the revival of the ``make_pre_ccsn_13bvn`` test_suite
106+
as seen in section 6.9 of MESA IV.
107+
108+
90109
.. _Bug Fixes main:
91110

92111
Bug Fixes
93112
---------
113+
94114
The ZAMS model data used to generate the initial model for simulations with
95115
``create_pre_main_sequence_model = .false.`` and ``load_saved_model = .false.``
96116
had an issue where stars between 1.0 and 1.58 Msun would have a starting
@@ -100,8 +120,8 @@ and now all pre-computed ZAMS models have a central hydrogen mass fraction very
100120
near 0.697.
101121

102122
The ``fixed_Teff``, ``fixed_Tsurf``, ``fixed_Psurf``, and ``fixed_Psurf_and_Tsurf``
103-
atmosphere options have been reimplemented, although we caution users that their
104-
implementation might conflict with mlt_option = ``TDC``.
123+
atmosphere options were removed in r15140. We have reimplemented them although we
124+
caution users that their implementation could conflict with ``mlt_option = 'TDC'``.
105125

106126
Changes in r23.05.1
107127
===================

‎scripts/shmesa/shmesa‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,8 @@ shmesa_zip () {
252252
if [[ ! $(find "$dir_to_zip" -type f -iname "*inlist*") ]]; then
253253
echo "Warning: No inlist files found in the directory '$dir_to_zip'."
254254
fi
255-
256-
local include_pattern="*inlist* *.mod *.list *.net */src/*"
257-
local exclude_pattern="*/make/*.mod *.bak"
258-
zip -r "$zip_name" "$dir_to_zip" -i "$include_pattern" -x "$exclude_pattern"
255+
256+
zip -r "$zip_name" "$dir_to_zip" -x "*/make/*mod" "*/make/*.o" "*.bak" "*star" "*binary" "*LOGS*" "*photos*" "*png*" "*.mesa_temp_cache"
259257
}
260258

261259

0 commit comments

Comments
 (0)