diff --git a/.github/workflows/c-linter.yml b/.github/workflows/c-linter.yml index 3393104b8..6856d1879 100644 --- a/.github/workflows/c-linter.yml +++ b/.github/workflows/c-linter.yml @@ -5,7 +5,7 @@ jobs: cpp-linter: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -33,13 +33,13 @@ jobs: config_file: ${GITHUB_WORKSPACE}/.clang-tidy - name: Archive clang tidy report - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: clang-tidy-report path: clang-tidy-report.txt - name: Archive cppcheck report - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: cppcheck-report path: cppcheck-report.txt \ No newline at end of file diff --git a/.github/workflows/check-ifdefs.yml b/.github/workflows/check-ifdefs.yml index 555886423..9afa5f016 100644 --- a/.github/workflows/check-ifdefs.yml +++ b/.github/workflows/check-ifdefs.yml @@ -14,23 +14,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.10' - - - name: Cache pip - uses: actions/cache@v3 - with: - # this path is specific to Ubuntu - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' - name: Run check-ifdefs run: | diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 031a8eeb5..2aeb59687 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -14,21 +14,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.10' - - - name: Cache pip - uses: actions/cache@v3 - with: - # this path is specific to Ubuntu - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' + cache: "pip" - name: Install dependencies run: pip install codespell diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index c9053b0bc..5dd6c24b9 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get the version id: get_version diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index 0fcda7559..884c50540 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Install pandoc and doxygen @@ -22,18 +22,10 @@ jobs: sudo apt install pandoc doxygen - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.10' - - - name: Cache pip - uses: actions/cache@v3 - with: - # this path is specific to Ubuntu - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' + cache: "pip" - name: Install dependencies run: pip install -r ./requirements.txt diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 4286b2bcd..055dbab52 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -10,33 +10,17 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install pandoc and doxygen run: | sudo apt install pandoc doxygen - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: '3.8' - - - name: Upgrade pip - run: | - # install pip=>20.1 to use "pip cache dir" - python3 -m pip install --upgrade pip - - - name: Get pip cache dir - id: pip-cache - run: echo "::set-output name=dir::$(pip cache dir)" - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ${{ steps.pip-cache.outputs.dir }} - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' + cache: "pip" - name: Install dependencies run: python3 -m pip install -r ./requirements.txt diff --git a/.github/workflows/gpu_action.yml b/.github/workflows/gpu_action.yml index 21946cb6d..395441215 100644 --- a/.github/workflows/gpu_action.yml +++ b/.github/workflows/gpu_action.yml @@ -5,7 +5,7 @@ jobs: gpu-compilation: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/reacting_bubble-compare.yml b/.github/workflows/reacting_bubble-compare.yml index a895a3e58..232f01b95 100644 --- a/.github/workflows/reacting_bubble-compare.yml +++ b/.github/workflows/reacting_bubble-compare.yml @@ -5,7 +5,7 @@ jobs: reacting_bubble-2d: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/Source/param/parse_maestro_params.py b/Source/param/parse_maestro_params.py index adf35c8c4..587998bcd 100755 --- a/Source/param/parse_maestro_params.py +++ b/Source/param/parse_maestro_params.py @@ -206,7 +206,7 @@ def parse_params(infile, out_directory): for p in params_nm: cq.write(p.get_default_string()) - cq.write(p.get_query_string("C++")) + cq.write(p.get_query_string()) cq.write("\n") cq.close() diff --git a/external/Microphysics b/external/Microphysics index 9d0655b75..649063a33 160000 --- a/external/Microphysics +++ b/external/Microphysics @@ -1 +1 @@ -Subproject commit 9d0655b75c2d7c0690fe637f8491fa572227a1dc +Subproject commit 649063a33f1ef83dd9acc457d7a79ceebcf3b60c diff --git a/external/amrex b/external/amrex index a068330e6..52393d3fa 160000 --- a/external/amrex +++ b/external/amrex @@ -1 +1 @@ -Subproject commit a068330e6c66b5d9a7c6ca0e1c874f318e73f4cc +Subproject commit 52393d3fafc835fa379f0420aa2de4ccdddf155a