Merge remote-tracking branch 'origin/main'

Author: Matthias Fabry

docs/source/about.rst

@@ -115,6 +115,7 @@ Developers
 * Eoin Farrell
 * `Meridith Joyce <http://www.meridithjoyce.com/>`__
 * Pablo Marchant
+* `Joey Mombarg <https://jmombarg.github.io/PersonalWebsite/index.html>`__
 * `Radek Smolec <https://www.camk.edu.pl/en/staff/smolec/>`__
 * Anne Thoul
 * `Frank Timmes <http://cococubed.asu.edu/>`__

docs/source/changelog.rst

@@ -13,6 +13,32 @@ Changes in main
 Backwards-incompatible changes
 ------------------------------
 
+Renamed controls for upper limits
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following controls in ``&controls`` for upper limits on
+`when to stop <reference/controls.html#when-to-stop>`_ have
+been renamed:
+
++------------------------------+------------------------------------+
++ Old                          + New                                +
++==============================+====================================+
++                              +                                    +
++ ``log_center_density_limit`` + ``log_center_density_upper_limit`` +
++                              +                                    +
++ ``log_center_temp_limit``    + ``log_center_temp_upper_limit``    +
++                              +                                    +
++ ``center_entropy_limit``     + ``center_entropy_upper_limit``     +
++                              +                                    +
++ ``max_entropy_limit``        + ``max_entropy_upper_limit``        +
++                              +                                    +
++------------------------------+------------------------------------+
+
+You can substitute the new names for the old ones using the command
+line tool ``sed`` with, e.g. ::
+
+    $ sed 's/log_center_density_limit/log_center_density_upper_limit' -i <inlist_filename>
+
 Extra inlist controls are now arrays
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/source/known_bugs.rst

@@ -26,6 +26,17 @@ Both issues will effect previous versions of MESA as well.
 
 Both issues have been fixed in the git main branch.
 
+See `gh-491 <https://github.com/MESAHub/mesa/issues/491>`_ and `gh-497 <https://github.com/MESAHub/mesa/issues/497>`_
+
+RTI
+===
+
+A bug has existed since shortly after r15140 where RTI mixing will be effectively zero in a model even with the RTI_flag=.true.
+
+This has now been fixed in the git main.
+
+See `gh-503 <https://github.com/MESAHub/mesa/issues/503>`_
+
 
 
 r22.05.1

kap/private/kap_eval.f90

@@ -28,13 +28,13 @@ module kap_eval
       use kap_def
       use const_def, only: dp, ln10, sige
       use math_lib
-      
+
       implicit none
-      
-            
+
+
       contains
-      
-      
+
+
       subroutine Get_kap_Results( &
            rq, zbar, X, Z, XC, XN, XO, XNe, logRho, logT, &
            lnfree_e, d_lnfree_e_dlnRho, d_lnfree_e_dlnT, &
@@ -67,7 +67,7 @@ subroutine Get_kap_Results( &
          type(auto_diff_real_2var_order1) :: blend_logT, blend_logR, blend
 
          real(dp) :: frac_Type2, frac_highT, frac_lowT
-         
+
          logical :: dbg
 
          include 'formats'
@@ -221,13 +221,13 @@ subroutine Get_kap_Results( &
          dlnkap_rad_dlnT = logkap_rad% d1val2
 
          call combine_rad_with_conduction( &
-            rq, Rho, logRho, T, logT, zbar, &
+            rq, logRho, logT, zbar, &
             kap_rad, dlnkap_rad_dlnRho, dlnkap_rad_dlnT, &
             kap, dlnkap_dlnRho, dlnkap_dlnT, ierr)
-         
+
       end subroutine Get_kap_Results
-      
-      
+
+
       subroutine Get_kap_Results_blend_T( &
            rq, X, Z, XC, XN, XO, XNe, logRho_in, logT_in, &
            frac_lowT, frac_highT, frac_Type2, kap, dlnkap_dlnRho, dlnkap_dlnT, ierr)
@@ -237,7 +237,7 @@ subroutine Get_kap_Results_blend_T( &
 
         ! INPUT
         type (Kap_General_Info), pointer :: rq
-        real(dp), intent(in) :: X, Z, XC, XN, XO, XNe ! composition    
+        real(dp), intent(in) :: X, Z, XC, XN, XO, XNe ! composition
         real(dp), intent(in) :: logRho_in ! density
         real(dp), intent(in) :: logT_in ! temperature
 
@@ -255,7 +255,7 @@ subroutine Get_kap_Results_blend_T( &
         real(dp) :: lowT_logT_max, logT_min
 
         logical :: clipped_Rho
-        
+
         logical :: dbg
 
         real(dp) :: alfa, beta, &
@@ -313,7 +313,7 @@ subroutine Get_kap_Results_blend_T( &
         case (kap_lowT_AESOPUS)
            lowT_logT_max = kA % max_logT
         case default
-           lowT_logT_max = kap_lowT_z_tables(rq% kap_lowT_option)% ar(1)% x_tables(1)% logT_max           
+           lowT_logT_max = kap_lowT_z_tables(rq% kap_lowT_option)% ar(1)% x_tables(1)% logT_max
         end select
 
 
@@ -347,7 +347,7 @@ subroutine Get_kap_Results_blend_T( &
         alfa0 = (logT - lower_bdy) / (upper_bdy - lower_bdy)
         d_alfa0_dlnT = 1d0/(upper_bdy - lower_bdy)/ln10
 
-        ! must smooth the transitions near alfa = 0.0 and 1.0  
+        ! must smooth the transitions near alfa = 0.0 and 1.0
         ! Rich Townsend's smoothing function for this
         alfa = -alfa0*alfa0*alfa0*(-10d0 + alfa0*(15d0 - 6d0*alfa0))
         d_alfa_dlnT = 30d0*(alfa0 - 1d0)*(alfa0 - 1d0)*alfa0*alfa0*d_alfa0_dlnT
@@ -398,7 +398,7 @@ subroutine Get_kap_lowT_Results( &
 
         ! INPUT
         type (Kap_General_Info), pointer :: rq
-        real(dp), intent(in) :: X, Z, XC, XN, XO, XNe ! composition    
+        real(dp), intent(in) :: X, Z, XC, XN, XO, XNe ! composition
         real(dp), intent(in) :: logRho_in ! density
         real(dp), intent(in) :: logT_in ! temperature
         ! free_e := total combined number per nucleon of free electrons and positrons
@@ -455,7 +455,7 @@ subroutine Get_kap_lowT_Results( &
            call AESOPUS_get(Zbase, X, XC, XN, XO, logRho, logT, &
                 kap, dlnkap_dlnRho, dlnkap_dlnT, ierr)
 
-           
+
         case default
            if (rq% kap_lowT_option == kap_lowT_test) then
               if (dbg) write(*,*) 'Calling test for lowT'
@@ -489,7 +489,7 @@ subroutine Get_kap_highT_Results(rq, &
 
         ! INPUT
         type (Kap_General_Info), pointer :: rq
-        real(dp), intent(in) :: X, Z, XC_in, XN_in, XO_in, XNe_in ! composition    
+        real(dp), intent(in) :: X, Z, XC_in, XN_in, XO_in, XNe_in ! composition
         real(dp), intent(in) :: logRho_in ! density
         real(dp), intent(in) :: logT_in ! temperature
 
@@ -700,24 +700,24 @@ end subroutine Get_kap_highT_Results
 
 
       subroutine combine_rad_with_conduction( &
-            rq, Rho, logRho, T, logT, zbar, &
+            rq, logRho, logT, zbar, &
             kap_rad, dlnkap_rad_dlnRho, dlnkap_rad_dlnT, &
             kap, dlnkap_dlnRho, dlnkap_dlnT, ierr)
 
          use condint, only: do_electron_conduction
          type (Kap_General_Info), pointer :: rq
-         real(dp), intent(in) :: Rho, logRho, T, logT, zbar
+         real(dp), intent(in) :: logRho, logT, zbar
          real(dp), intent(inout) :: kap_rad, dlnkap_rad_dlnRho, dlnkap_rad_dlnT
          real(dp), intent(out) :: kap, dlnkap_dlnRho, dlnkap_dlnT
          integer, intent(out) :: ierr ! 0 means AOK.
-      
+
          real(dp) :: kap_ec, dlnkap_ec_dlnRho, dlnkap_ec_dlnT
          logical, parameter :: dbg = .false.
-         
+
          include 'formats'
-         
+
          ierr = 0
-         
+
          if (.not. rq% include_electron_conduction) then
             kap = kap_rad
             dlnkap_dlnRho = dlnkap_rad_dlnRho
@@ -744,12 +744,12 @@ subroutine combine_rad_with_conduction( &
          if (dbg) write(*,1) 'dlnkap_ec_dlnRho', dlnkap_ec_dlnRho
          if (dbg) write(*,1) 'dlnkap_ec_dlnT', dlnkap_ec_dlnT
          if (dbg) write(*,*)
-         
+
          kap = 1d0 / (1d0/kap_rad + 1d0/kap_ec)
          if (dbg) write(*,1) 'kap_rad', kap_rad
          if (dbg) write(*,1) 'kap', kap
          if (dbg) write(*,1) 'log10(kap)', log10(kap)
-         
+
          if (is_bad(kap)) then
             ierr = -1; return
             write(*,1) 'kap', kap
@@ -769,9 +769,9 @@ subroutine combine_rad_with_conduction( &
             write(*,1) 'kap_ec', kap_ec
             call mesa_error(__FILE__,__LINE__,'combine_rad_with_conduction')
          end if
-         
+
          dlnkap_dlnT = (kap/kap_rad) * dlnkap_rad_dlnT + (kap/kap_ec) * dlnkap_ec_dlnT
-         
+
          if (is_bad(dlnkap_dlnT)) then
             ierr = -1; return
             write(*,1) 'dlnkap_dlnT', dlnkap_dlnT
@@ -787,8 +787,8 @@ subroutine combine_rad_with_conduction( &
          if (dbg) write(*,1) 'dlnkap_dlnRho', dlnkap_dlnRho
          if (dbg) write(*,1) 'dlnkap_dlnT', dlnkap_dlnT
          if (dbg) call mesa_error(__FILE__,__LINE__,'combine_rad_with_conduction')
-      
-      
+
+
       end subroutine combine_rad_with_conduction
 
 
@@ -810,7 +810,7 @@ subroutine Compton_Opacity(rq, &
          real(dp), intent(in) :: eta_in, d_eta_dlnRho, d_eta_dlnT
          real(dp), intent(out) :: kap, dlnkap_dlnRho, dlnkap_dlnT
          integer, intent(out) :: ierr
-         
+
          type(auto_diff_real_2var_order1) :: T, rho, free_e, eta, kap_auto
          type(auto_diff_real_2var_order1) :: zeta, f1, f2, f3, alpha, tbr, theta, tkev, mfp
 
@@ -828,15 +828,15 @@ subroutine Compton_Opacity(rq, &
             c22    = -0.0067d0, &
             c31    = -0.037d0, &
             c32    =  0.0031d0
-         
+
          include 'formats'
-         
+
          ierr = 0
 
          ! set up auto diff
          ! var1: Rho
          ! var2: T
-         
+
          Rho = Rho_in
          Rho% d1val1 = 1d0
          Rho% d1val2 = 0d0
@@ -871,9 +871,8 @@ subroutine Compton_Opacity(rq, &
          kap = kap_auto% val
          dlnkap_dlnRho = Rho% val * kap_auto% d1val1 / kap
          dlnkap_dlnT = T% val * kap_auto% d1val2 / kap
-         
+
       end subroutine Compton_Opacity
 
 
       end module kap_eval
-      

kap/public/kap_lib.f90

@@ -411,7 +411,7 @@ subroutine kap_get_op_mono( &
          kap_rad = exp10(g1)
 
          call combine_rad_with_conduction( &
-            rq, rho, logRho, T, logT, zbar, &
+            rq, logRho, logT, zbar, &
             kap_rad, dlnkap_rad_dlnRho, dlnkap_rad_dlnT, &
             kap, dlnkap_dlnRho, dlnkap_dlnT, ierr)
 
@@ -773,7 +773,7 @@ subroutine call_compute_gamma_grid_mombarg(j, fk, ierr)
       end subroutine call_compute_gamma_grid_mombarg
 
       subroutine call_compute_kappa_mombarg(handle, k,&
-        fk, T_cntr, Rho_cntr, logT_cntr, logRho_cntr,&
+        fk, logT_cntr, logRho_cntr,&
         zbar, lnfree_e, d_lnfree_e_dlnRho, d_lnfree_e_dlnT, &
         kap, dlnkap_dlnT, dlnkap_dlnRho, log_kap_rad_cell, ierr)
         use kap_eval, only: combine_rad_with_conduction
@@ -785,7 +785,7 @@ subroutine call_compute_kappa_mombarg(handle, k,&
         integer, intent(in) :: handle ! from alloc_kap_handle
         integer, intent(in) :: k
         real(dp), intent(in) :: fk(:)
-        real(dp), intent(in) :: T_cntr, Rho_cntr, logT_cntr, logRho_cntr
+        real(dp), intent(in) :: logT_cntr, logRho_cntr
         real(dp), intent(in) :: zbar ! average ionic charge (for electron conduction)
         real(dp), intent(in) :: lnfree_e, d_lnfree_e_dlnRho, d_lnfree_e_dlnT
         integer, intent(inout) :: ierr
@@ -803,6 +803,7 @@ subroutine call_compute_kappa_mombarg(handle, k,&
         call kap_ptr(handle,rq,ierr)
         if (ierr /= 0) return
 
+
         eid = (/ ih1, ihe4, ic12, in14, io16, ine20, ina23, &
         img24, ial27, isi28, is32, iar40, ica40, icr52, imn55, ife56, ini58 /)
 
@@ -851,7 +852,7 @@ subroutine call_compute_kappa_mombarg(handle, k,&
         kap_rad = exp10(log_kap_rad_cell)
 
         call combine_rad_with_conduction( &
-             rq, Rho_cntr, logRho_cntr, T_cntr, logT_cntr, zbar, &
+             rq, logRho_cntr, logT_cntr, zbar, &
              kap_rad, dlnkap_rad_dlnRho, dlnkap_rad_dlnT, &
              kap, dlnkap_dlnRho, dlnkap_dlnT, ierr)