Merge branch 'main' into EbF/reimplement_drag_in_riemann_hydro

Author: Debraheem

CODEOWNERS

@@ -24,10 +24,10 @@ linters/
 turb/ 
 math/ @rhdtownsend
 mtx/  @mjoyceGR
-net/ @fxt44
-neu/ @fxt44
+net/ @fxt44 @Debraheem
+neu/ @fxt44 @Debraheem
 num/ 
-rates/ @fxt44
+rates/ @fxt44 @Debraheem
 #star/
 #star_data/
 #stella/ 

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MESA"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = r24.03.04
+PROJECT_NUMBER         = r24.06.1-rc1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

binary/defaults/pgbinary.defaults

@@ -2971,11 +2971,11 @@
    Orbit_title = 'Orbit'
    Orbit_txt_scale_factor = 1.0
 
-      ! show the roche lobe sizes
+      ! show the star sizes
 
       ! ::
 
-   Orbit_show_RL = .true.
+   Orbit_show_stars = .true.
 
       ! file output
 

binary/private/pgbinary_ctrls_io.f90

@@ -1332,7 +1332,7 @@ module pgbinary_ctrls_io
       Orbit_file_width, &
       Orbit_file_aspect_ratio, &
       Orbit_txt_scale_factor, &
-      Orbit_show_RL, &
+      Orbit_show_stars, &
 
       annotation1_ci, &
       annotation1_ch, &
@@ -2806,7 +2806,7 @@ subroutine store_pgbinary_controls(b, ierr)
       pg% Orbit_file_width = Orbit_file_width
       pg% Orbit_file_aspect_ratio = Orbit_file_aspect_ratio
       pg% Orbit_txt_scale_factor = Orbit_txt_scale_factor
-      pg% Orbit_show_RL = Orbit_show_RL
+      pg% Orbit_show_stars = Orbit_show_stars
 
       pg% annotation1_ci = annotation1_ci
       pg% annotation1_ch = annotation1_ch

binary/private/pgbinary_orbit.f90

@@ -131,9 +131,7 @@ subroutine orbit_panel(b, device_id, &
       xmax = max(x1max, x2max)
 
       q = b% m(2) / b% m(1)
-      if (b% pg% Orbit_show_RL .and. abs(log10(q)) <= 2) then
-         call pgsci(clr_Goldenrod)
-         call pgpt1(x1s(1), y1s(1), -1)
+      if (b% pg% Orbit_show_stars .and. abs(log10(q)) <= 2) then
          if (b% point_mass_i /= 1) then
             this_psi = Psi_fit(b% r(1) / b% separation, q)
             xl1 = xl1_fit(q)
@@ -167,6 +165,9 @@ subroutine orbit_panel(b, device_id, &
             y1s_RL(2 * num_points + 1) = y1s_RL(1)
             x1max = maxval(abs(x1s_RL))
             xmax = max(x1max, xmax)
+         else
+            x1s_RL = 0d0
+            y1s_RL = 0d0
          end if
 
          if (b% point_mass_i /= 2) then
@@ -203,8 +204,11 @@ subroutine orbit_panel(b, device_id, &
             y2s_RL(2 * num_points + 1) = y2s_RL(1)
             x2max = maxval(abs(x2s_RL))
             xmax = max(x2max, xmax)
+         else
+            x2s_RL = 0d0
+            y2s_RL = 0d0
          end if
-      else if (b% pg% Orbit_show_RL .and. abs(log10(q)) > 2) then
+      else if (b% pg% Orbit_show_stars .and. abs(log10(q)) > 2) then
          write(*, 1) "pgbinary: Not plotting RL, q too extreme: abs(log(q)) = ", abs(log10(q))
       end if
 
@@ -226,7 +230,7 @@ subroutine orbit_panel(b, device_id, &
       call pgslw(b% pg% pgbinary_lw / 2)
       call pgline(2 * num_points + 1, x2s, y2s)
 
-      if (b% pg% Orbit_show_RL .and. abs(log10(q)) <= 2) then
+      if (b% pg% Orbit_show_stars .and. abs(log10(q)) <= 2) then
          call pgslw(int(2.0 * b% pg% pgbinary_lw / 3.0))
          call pgsfs(3)
          call pgshs(45.0, 0.33, 0.0)

binary/private/pgbinary_star.f90

@@ -203,7 +203,7 @@ subroutine do_star_plot(b, id, device_id, xleft, xright, &
             call plot_case(b% s1, b% star_ids(1))
             call update_pgstar_history_file(b% s1, ierr)
          else
-            write(mass, '(f3.2)') b% m(1) / Msun
+            write(mass, '(f0.2)') b% m(1) / Msun
             call pgmtxt('T', -2.0, 0.5, 0.5, 'Star 1 not simulated')
             call pgmtxt('T', -3.0, 0.5, 0.5, 'point mass of ' // trim(adjustl(mass)) // ' M\d\(2281)')
          end if
@@ -216,13 +216,12 @@ subroutine do_star_plot(b, id, device_id, xleft, xright, &
             call pgsvp(xleft, xright, ybot, ytop)
          end if
          if (b% point_mass_i /= 2) then
-
             call read_pgstar_inlist(b% s2, b% job% inlist_names(2), ierr)
             call update_pgstar_data(b% s2, ierr)
             call plot_case(b% s2, b% star_ids(2))
             call update_pgstar_history_file(b% s2, ierr)
          else
-            write(mass, '(f3.2)') b% m(2) / Msun
+            write(mass, '(f0.2)') b% m(2) / Msun
             call pgmtxt('T', -2.0, 0.5, 0.5, 'Star 2 not simulated')
             call pgmtxt('T', -3.0, 0.5, 0.5, 'point mass of ' // trim(adjustl(mass)) // ' M\d\(2281)')
          end if

binary/public/pgbinary_controls.inc

@@ -924,7 +924,7 @@ character (len = strlen) :: Star2_title, Star2_plot_name
 logical :: show_mtrans_status
 
 logical :: Orbit_win_flag, Orbit_file_flag, do_Orbit_win, do_Orbit_file
-logical :: Orbit_show_RL
+logical :: Orbit_show_stars
 integer :: Orbit_file_interval, id_Orbit_win, id_Orbit_file
 character (len = strlen) :: Orbit_file_dir, Orbit_file_prefix, Orbit_title
 real :: Orbit_win_width, Orbit_win_aspect_ratio, &

binary/test_suite/star_plus_point_mass/inlist

@@ -20,6 +20,6 @@
 &pgbinary
 
       read_extra_pgbinary_inlist(1) = .true.
-      extra_pgbinary_inlist_name(1) = 'inlist_project'
+      extra_pgbinary_inlist_name(1) = 'inlist_pgbinary'
 
 / ! end of pgbinary namelist

binary/test_suite/star_plus_point_mass/inlist1

@@ -7,6 +7,9 @@
 
 / ! end of star_job namelist
 
+&eos
+
+/ ! end of eos namelist
 
 &kap
 
@@ -46,6 +49,7 @@
 
 
 &pgstar
-         
+   read_extra_pgstar_inlist(1) = .true.
+   extra_pgstar_inlist_name(1)= 'inlist_pgstar'         
 
 / ! end of pgstar namelist

binary/test_suite/star_plus_point_mass/inlist2

@@ -30,7 +30,8 @@
 
 
 &pgstar
-         
+   read_extra_pgstar_inlist(1) = .true.
+   extra_pgstar_inlist_name(1)= 'inlist_pgstar'         
 
 
 / ! end of pgstar namelist