Backport change from main to a new release branch

.gitattributes

@@ -27,3 +27,4 @@ star/dev_cases_star_to_RSP2 export-ignore
 star/dev_cases_test_RSP2 export-ignore
 star/dev_cases_test_TDC export-ignore
 star/rsp2_utils export-ignore
+data/colors_data/colors_data.txz filter=lfs diff=lfs merge=lfs -text

.github/actions/install-mesa/action.yml

@@ -9,27 +9,23 @@ inputs:
     required: false
     default: '23.7.3'
 
+
 runs:
 
   using: 'composite'
 
   steps:
-    - name: Delete unused packages
-      run: |
-        # 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 '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 autoremove -y # 771 MB
-        sudo apt-get clean
-      shell: bash
+    - name: Install SDK Linux
+      if: ${{ (runner.os == 'Linux') }}
+      uses: ./.github/actions/install-sdk-linux
+      with:
+        sdk: ${{inputs.sdk}}
+
+    - name: Install SDK Linux
+      if: ${{ (runner.os == 'Macos') }}
+      uses: ./.github/actions/install-sdk-macos
+      with:
+        sdk: ${{inputs.sdk}}
 
     - name: Create LFS file list
       run: |
@@ -53,69 +49,38 @@ runs:
       shell: bash
       if: steps.lfs-cache.outputs.cache-hit == 'true'
 
-    - name: Install dependencies Linux
-      run: |
-        sudo apt-get -y update
-        sudo apt-get -y install wget binutils make perl libx11-6 libx11-dev zlib1g zlib1g-dev tcsh
+    - name: Set MESA environment variables
       shell: bash
-
-    - uses: actions/cache@v4
-      id: cache
-      with:
-        path: |
-          mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
-        key: ${{ runner.os }}-${{inputs.sdk}}
-
-    - name: Get SDK ${{ runner.os }} '21.4.1'
-      if: ${{ (steps.cache.outputs.cache-hit != 'true') && (  inputs.sdk == '21.4.1') }}
       run: |
-        wget -q https://zenodo.org/record/5802444/files/mesasdk-x86_64-linux-21.4.1.tar.gz
-      shell: bash
+        echo "MESA_DIR=$PWD" >> $GITHUB_ENV
 
-    - name: Get SDK ${{ runner.os }} '22.6.1'
-      if: ${{ (steps.cache.outputs.cache-hit != 'true') && (  inputs.sdk ==  '22.6.1') }}
-      run: |
-        wget -q https://zenodo.org/record/7457681/files/mesasdk-x86_64-linux-22.6.1.tar.gz
+    - name: Setup environment Linux
       shell: bash
-
-    - name: Get SDK ${{ runner.os }} '23.7.3'
-      if: ${{ (steps.cache.outputs.cache-hit != 'true') && (  inputs.sdk == '23.7.3') }}
+      if: runner.os == 'Linux'
       run: |
-        wget -q https://zenodo.org/record/10624843/files/mesasdk-x86_64-linux-23.7.3.tar.gz
-      shell: bash
+        # Linux runners have 4 cores
+        # https://docs.github.com/en/actions/reference/runners/github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+        echo "OMP_NUM_THREADS=4" >> $GITHUB_ENV
+        echo "NPROCS=4" >> $GITHUB_ENV
+        echo "SED=sed" >> $GITHUB_ENV
 
-    - name: Get SDK ${{ runner.os }} '24.7.1'
-      if: ${{ (steps.cache.outputs.cache-hit != 'true') && (  inputs.sdk == '24.7.1') }}
-      run: |
-        wget -q https://zenodo.org/records/13768913/files/mesasdk-x86_64-linux-24.7.1.tar.gz
+    - name: Setup environment MacOS
       shell: bash
-
-    - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}}
+      if: runner.os == 'macOS'
       run: |
-        tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
-      shell: bash
+        # MacOS runners have 3 cores
+        # https://docs.github.com/en/actions/reference/runners/github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+        echo "OMP_NUM_THREADS=3" >> $GITHUB_ENV
+        echo "NPROCS=3" >> $GITHUB_ENV
+        echo "SED=gsed" >> $GITHUB_ENV
 
     - name: Compile
       run: |
-        # 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 ./)"
-        # Save environment variables to Github environment
-        echo "OMP_NUM_THREADS=${OMP_NUM_THREADS}" >> $GITHUB_ENV
-        echo "NPROCS=${NPROCS}" >> $GITHUB_ENV
-        echo "MESASDK_ROOT=${MESASDK_ROOT}" >> $GITHUB_ENV
-        echo "MESA_DIR=${MESA_DIR}" >> $GITHUB_ENV
         # Everything is run as root so we need to disable the root check in the install script
-        sed -i 's/\${EUID:-\$(id -u)}/1/' install
+        $SED -i 's/\${EUID:-\$(id -u)}/1/' install
         # Turn off caching during build to save more space
-        sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90
-        sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90
+        $SED -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90
+        $SED -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90
         ./install
-        if [ ! -f lib/libbinary.a ]; then
-          exit 1
-        fi
       shell: bash

.github/actions/install-sdk-linux/action.yml

@@ -0,0 +1,54 @@
+---
+name: 'install-sdk-linux'
+description: 'Download and unpack the Linux MESA SDK and its required dependencies'
+
+inputs:
+  sdk:
+    description: 'The version of the MESA SDK to install'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Install dependencies
+      run: |
+        sudo apt-get -y update
+        sudo apt-get -y install wget binutils make perl libx11-6 libx11-dev zlib1g zlib1g-dev tcsh
+        sudo apt-get -y autoremove
+        sudo apt-get clean
+      shell: bash
+
+    - uses: actions/cache@v4
+      id: cache
+      with:
+        path: |
+          mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
+        key: linux-${{inputs.sdk}}
+
+    - name: Download SDK '${{ inputs.sdk }}'
+      shell: bash
+      if: ${{ (steps.cache.outputs.cache-hit != 'true') }}
+      run: |
+        declare -A version
+        version[24.7.1]="https://zenodo.org/records/13768913"
+        version[25.12.1]="https://zenodo.org/records/18163992"
+        version[26.3.2]="https://zenodo.org/records/19210930"
+
+        curl -O ${version[${{inputs.sdk}}]}/files/mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
+
+    - name: Unpack SDK
+      run: |
+        tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
+      shell: bash
+
+    - name: Set SDK environment
+      if: ${{ (inputs.sdk != '26.3.2') }}
+      run: |
+        echo "MESASDK_ROOT=$(readlink -f mesasdk)" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Set SDK environment
+      if: ${{ (inputs.sdk == '26.3.2') }}
+      run: |
+        echo "MESASDK_ROOT=$(readlink -f mesasdk-26.3.2)" >> $GITHUB_ENV
+      shell: bash

.github/actions/install-sdk-macos/action.yml

@@ -0,0 +1,46 @@
+---
+name: 'install-sdk-macos'
+description: 'Download and unpack the MacOS MESA SDK and its required dependencies'
+
+inputs:
+  sdk:
+    description: 'The version of the MESA SDK to install'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Install dependencies
+      run: |
+        brew install --cask xquartz
+        brew install gnu-sed bash
+      shell: bash
+
+    - uses: actions/cache@v4
+      id: cache
+      with:
+        path: |
+          mesasdk-aarch64-macos-${{inputs.sdk}}.tar.gz
+        key: macos-${{inputs.sdk}}
+
+    - name: Download SDK
+      shell: bash
+      if: ${{ (steps.cache.outputs.cache-hit != 'true') }}
+      run: |
+        declare -A version
+        version[24.7.1]="https://zenodo.org/records/13769017/files"
+        version[25.12.1]="http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/"
+        version[26.3.2]="https://zenodo.org/records/19210744/files"
+
+        curl -O ${version[${{inputs.sdk}}]}/mesasdk-aarch64-macos-${{inputs.sdk}}.pkg
+
+    - name: Unpack SDK
+      run: |
+        sudo installer -pkg mesasdk-aarch64-macos-${{inputs.sdk}}.pkg -target /
+        ln -s /Applications/mesasdk mesasdk
+      shell: bash
+
+    - name: Set SDK environment
+      run: |
+        echo "MESASDK_ROOT=$(readlink -f mesasdk)" >> $GITHUB_ENV
+      shell: bash

.github/workflows/build-linux.yml → .github/workflows/build.yml

@@ -1,5 +1,5 @@
 ---
-name: Build on Linux with SDK
+name: Build with SDK
 
 on:
   workflow_dispatch:
@@ -14,8 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: ["22.6.1", "23.7.3", "24.7.1"]  # pick 2 or 3 most recent.
-    runs-on: ubuntu-latest
+        sdk: ["24.7.1", "25.12.1", "26.3.2"]  # pick 2 or 3 most recent.
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.gitignore

@@ -115,6 +115,6 @@ TAGS
 *~
 
 ## Colors
-**/colors/data/.extraction_complete
-colors/data/filters/
-colors/data/stellar_models/
+**/data/colors_data/.extraction_complete
+data/colors_data/filters/
+data/colors_data/stellar_models/

CODE_OF_CONDUCT.rst

@@ -41,10 +41,10 @@ Enforcement
 Instances of Code-of-Conduct violations should be reported by contacting
 one or more of the following MESA Responsible Persons (MRPs):
 
--  Lars Bildsten (bildsten@kitp.ucsb.edu)
--  Frank Timmes (fxt44@mac.com)
--  Anne Thoul (anne.thoul@uliege.be)
 -  Rich Townsend (rhtownsend@wisc.edu)
+-  Bill Wolf (wolfwm@uwec.edu)
+-  Meridith Joyce (meridith.joyce@gmail.com)
+-  Jared Goldberg (goldstar@msu.edu)
 
 All reports will be reviewed and investigated and will result in a
 response that is deemed necessary and appropriate to the circumstances.

CONTRIBUTING.rst

@@ -41,7 +41,7 @@ New contributions must be proposed through GitHub's *pull request*
 (PR) system.  The process is roughly:
 
 1. fork the ``mesa`` repo (click *Fork* in the top-right of the GitHub interface),
-2. clone your fork to your computer,
+2. clone your fork to your computer (since the mesa repository contains large files, you'll need to have `git-lfs <https://git-lfs.com/>`_ installed),
 3. create a new branch for your additions (e.g. ``git switch -c my-new-hook``),
 4. make, commit and push your changes and
 5. open a PR against the ``main`` branch.

README.rst

@@ -16,7 +16,7 @@ Modules for Experiments in Stellar Astrophysics (MESA)
     :target: https://docs.mesastar.org/en/latest/
 .. image:: https://img.shields.io/github/v/release/MESAHub/mesa
     :alt: GitHub release (latest by date)
-    :target: https://zenodo.org/records/13353788
+    :target: https://zenodo.org/records/18023257
 .. image:: https://img.shields.io/badge/zenodo-community-blue
     :alt: Zenodo
     :target: https://zenodo.org/communities/mesa/records?q=&l=list&p=1&s=10
@@ -27,10 +27,10 @@ Modules for Experiments in Stellar Astrophysics (MESA)
     :title: Coverage
     :alt: Coverage
     :target: http://MESAHub.github.io/mesa
-.. image:: https://github.com/MESAHub/mesa/actions/workflows/build-linux.yml/badge.svg
-    :title: BuildLinux
-    :alt: BuildLinux
-    :target: https://github.com/MESAHub/mesa/actions/workflows/build-linux.yml
+.. image:: https://github.com/MESAHub/mesa/actions/workflows/build.yml/badge.svg
+    :title: Build
+    :alt: Build
+    :target: https://github.com/MESAHub/mesa/actions/workflows/build.yml
 .. image:: https://github.com/MESAHub/mesa/actions/workflows/static-analysis.yml/badge.svg
     :title: StaticAnalysis
     :alt: StaticAnalysis
@@ -40,7 +40,7 @@ Modules for Experiments in Stellar Astrophysics (MESA)
 
    **WARNING**: The default ``main`` branch is the development version of
    MESA and is not guaranteed to function correctly.  If you are using
-   MESA, you should use an `official release version <https://zenodo.org/records/13353788>`__.
+   MESA, you should use an `official release version <https://zenodo.org/records/18023257>`__.
 
 
 Overview
@@ -86,7 +86,7 @@ Links
 Download
 ========
 
-* `MESA Official Release Version <https://zenodo.org/records/13353788>`__ for the latest release of MESA.
+* `MESA Official Release Version <https://zenodo.org/records/18023257>`__ for the latest release of MESA.
 * `MESA SDK <http://user.astro.wisc.edu/~townsend/static.php?ref=mesasdk>`__ for: `MacOS (ARM) <https://zenodo.org/records/13769017>`__, `MacOS (Intel) <https://zenodo.org/records/13768941>`__, `Linux (Intel/AMD) <https://zenodo.org/records/13768913>`__.
 
 

clean

@@ -15,7 +15,7 @@ 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/colors_data/filters data/colors_data/stellar_models data/colors_data/.extraction_complete
 rm -rf data/rates_data/cache
 
 rm -rf data/rates_data/cache/*

colors/.gitattributes

@@ -1 +1 @@
-colors/data/colors_data.txz filter=lfs diff=lfs merge=lfs -text
+data/colors_data/colors_data.txz filter=lfs diff=lfs merge=lfs -text