merge main into branch

Author: Debraheem

.github/workflows/build-linux.yml

@@ -7,21 +7,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: ["20.12.1", "21.4.1", "22.6.1"]
+        sdk: ["21.4.1", "22.6.1", "23.7.3"]
 
     runs-on: ubuntu-latest
 
     steps:
       - name: Delete unused packages
         run: |
-          # commands lifted from https://github.com/jlumbroso/free-disk-space
+          # runners have 150GB of disk space and the Ubuntu image is big so we sometimes found it ran out of space for MESA
+          # others have encountered this too so we took commands from this action
+          # https://github.com/jlumbroso/free-disk-space
+          # currently commented because we don't need it and these commands can need changing when the Ubuntu image changes
           sudo rm -rf /usr/local/lib/android
-          sudo apt-get remove -y '^aspnetcore-.*'
-          sudo apt-get remove -y '^dotnet-.*' # 990 MB
-          sudo apt-get remove -y '^llvm-.*' # 1052 MB
+          # sudo apt-get remove -y '^aspnetcore-.*'
+          # sudo apt-get remove -y '^dotnet-.*' # 990 MB
+          # sudo apt-get remove -y '^llvm-.*' # 1052 MB
           # sudo apt-get remove -y 'php.*' # 56.6 MB
           # sudo apt-get remove -y '^mysql-.*' # 209 MB
-          sudo apt-get remove -y azure-cli google-cloud-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri # 2274 MB
+          # sudo apt-get remove -y azure-cli google-cloud-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri # 2274 MB
           sudo apt-get autoremove -y # 771 MB
           sudo apt-get clean
 
@@ -42,7 +45,7 @@ jobs:
       - name: Git LFS Pull
         run: git lfs pull
         if: steps.lfs-cache.outputs.cache-hit != 'true'
-  
+
       - name: Git LFS Checkout
         run: git lfs checkout
         if: steps.lfs-cache.outputs.cache-hit == 'true'
@@ -61,12 +64,6 @@ jobs:
           key: ${{ runner.os }}-${{matrix.sdk}}
 
 
-      - name: Get SDK ${{ runner.os }} '20.12.1'
-        if: ${{ (steps.cache.outputs.cache-hit != 'true') && (  matrix.sdk  == '20.12.1') }}
-        run: |
-            wget -q https://zenodo.org/record/4587206/files/mesasdk-x86_64-linux-20.12.1.tar.gz
-        shell: bash
-
       - name: Get SDK ${{ runner.os }} '21.4.1'
         if: ${{ (steps.cache.outputs.cache-hit != 'true') && (  matrix.sdk == '21.4.1') }}
         run: |
@@ -79,6 +76,12 @@ jobs:
             wget -q https://zenodo.org/record/7457681/files/mesasdk-x86_64-linux-22.6.1.tar.gz
         shell: bash
 
+      - name: Get SDK ${{ runner.os }} '23.7.3'
+        if: ${{ (steps.cache.outputs.cache-hit != 'true') && (  matrix.sdk == '23.7.3') }}
+        run: |
+            wget -q https://zenodo.org/record/10624843/files/mesasdk-x86_64-linux-23.7.3.tar.gz
+        shell: bash
+
       - name: Unpack SDK ${{ runner.os }} ${{matrix.sdk}}
         run: |
             tar xvf mesasdk-x86_64-linux-${{matrix.sdk}}.tar.gz
@@ -87,10 +90,10 @@ jobs:
       - name: Compile
         shell: bash
         run: |
-          # Linux runners have 2 cores
-          # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
-          export OMP_NUM_THREADS=2
-          export NPROCS=2
+          # Linux runners have 4 cores
+          # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+          export OMP_NUM_THREADS=4
+          export NPROCS=4
           export "MESASDK_ROOT=$(readlink -f mesasdk)"
           source "${MESASDK_ROOT}/bin/mesasdk_init.sh"
           export "MESA_DIR=$(readlink -f ./)"

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         = 11701
+PROJECT_NUMBER         = r24.03.04
 
 # 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/binary_controls.defaults

@@ -664,8 +664,6 @@
 !     else
 !        change_factor = change_factor*(1.0-implicit_lambda) &
 !           + implicit_lambda*(1+change_factor_fraction*(mass_transfer_prev/mass_transfer_rate-1))
-!        change_factor = change_factor*(1.0-implicit_lambda) &
-!           + implicit_lambda*(1+change_factor_fraction*(mass_transfer_rate/mass_transfer_prev-1))
 !     end if
 
 ! Choosing ``implicit_lambda = 0`` will keep the change factor constant.
@@ -1494,3 +1492,16 @@
     use_other_CE_binary_evolve_step = .false.
     use_other_CE_binary_finish_step = .false.
     use_other_e2 = .false.
+
+
+! extra params as a convenience for developing new features
+! note: the parameter ``num_x_ctrls`` is defined in ``binary_def.f90``
+
+! ::
+
+    x_ctrl(1:binary_num_x_ctrls) = 0d0
+    x_integer_ctrl(1:binary_num_x_ctrls) = 0
+    x_logical_ctrl(1:binary_num_x_ctrls) = .false.
+    x_character_ctrl(1:binary_num_x_ctrls) = ''
+
+

binary/private/binary_ctrls_io.f90

@@ -224,6 +224,10 @@ module binary_ctrls_io
          use_other_CE_rlo_mdot, &
          use_other_CE_binary_evolve_step, &
          use_other_CE_binary_finish_step, &
+         x_ctrl, &
+         x_integer_ctrl, &
+         x_logical_ctrl, &
+         x_character_ctrl, &
 
          ! extra files
          read_extra_binary_controls_inlist, extra_binary_controls_inlist_name
@@ -530,6 +534,11 @@ subroutine store_binary_controls(b, ierr)
          b% use_other_CE_rlo_mdot = use_other_CE_rlo_mdot
          b% use_other_CE_binary_evolve_step = use_other_CE_binary_evolve_step
          b% use_other_CE_binary_finish_step = use_other_CE_binary_finish_step
+
+         b% x_ctrl = x_ctrl
+         b% x_integer_ctrl = x_integer_ctrl
+         b% x_logical_ctrl = x_logical_ctrl
+         b% x_character_ctrl = x_character_ctrl
 
       end subroutine store_binary_controls
 
@@ -720,6 +729,11 @@ subroutine set_binary_controls_for_writing(b, ierr)
          use_other_CE_binary_evolve_step = b% use_other_CE_binary_evolve_step
          use_other_CE_binary_finish_step = b% use_other_CE_binary_finish_step
 
+         x_ctrl = b% x_ctrl
+         x_integer_ctrl = b% x_integer_ctrl
+         x_logical_ctrl = b% x_logical_ctrl
+         x_character_ctrl = b% x_character_ctrl
+
       end subroutine set_binary_controls_for_writing
 
       subroutine write_binary_controls(io,ierr)

binary/private/run_binary_support.f90

@@ -643,14 +643,14 @@ end subroutine extras_binary_controls
 
          end do step_loop
 
+         partial_result = b% extras_binary_finish_step(b% binary_id)
+         result = worst_result(result, partial_result)
+
          if(result == keep_going) result = binary_finish_step(b)
          if (b% CE_flag .and. b% CE_init .and. result == keep_going) then
             result = worst_result(result, CE_binary_finish_step(b))
          end if
 
-         partial_result = b% extras_binary_finish_step(b% binary_id)
-         result = worst_result(result, partial_result)
-
          if (result == keep_going) then
             ! write terminal info
             model = b% model_number

binary/public/binary_controls.inc

@@ -177,4 +177,9 @@ logical :: use_other_CE_binary_finish_step
 logical :: use_other_e2
 logical :: use_other_pgbinary_plots
 
+real(dp) :: x_ctrl(binary_num_x_ctrls)
+integer :: x_integer_ctrl(binary_num_x_ctrls)
+logical :: x_logical_ctrl(binary_num_x_ctrls)
+character (len=strlen) :: x_character_ctrl(binary_num_x_ctrls)
+
 ! end of controls

binary/public/binary_def.f90

@@ -37,6 +37,7 @@ module binary_def
 
       integer, parameter :: maxlen_binary_history_column_name = 80
       integer, parameter :: binary_num_xtra_vals = 30
+      integer, parameter :: binary_num_x_ctrls = 100
 
       ! time_step limit identifiers
       integer, parameter :: b_Tlim_comp = 1

data/star_data/zams_models/CenterXfrac.png

@@ -7,7 +7,7 @@
 
 &star_job
 
-      mesa_dir = '../../../..'
+      !mesa_dir = '../../../..'
 
       read_extra_star_job_inlist(2) = .true.
       extra_star_job_inlist_name(2) = 'inlist_create_zams'