Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
zingale committed Feb 1, 2024
2 parents 3bc83ea + 4dd5ba2 commit 2926140
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 65 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/c-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
cpp-linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -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
15 changes: 3 additions & 12 deletions .github/workflows/check-ifdefs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/docs-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install pandoc and doxygen
run: |
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
Expand Down
24 changes: 4 additions & 20 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gpu_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
gpu-compilation:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reacting_bubble-compare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Source/param/parse_maestro_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion external/Microphysics
Submodule Microphysics updated 114 files
2 changes: 1 addition & 1 deletion external/amrex
Submodule amrex updated 75 files
+10 −10 .github/workflows/apps.yml
+2 −2 .github/workflows/ascent.yml
+9 −9 .github/workflows/bittree.yml
+13 −13 .github/workflows/clang.yml
+1 −1 .github/workflows/cleanup-cache-postpr.yml
+1 −1 .github/workflows/cleanup-cache.yml
+8 −8 .github/workflows/codeql.yml
+1 −1 .github/workflows/codespell.yml
+13 −13 .github/workflows/cuda.yml
+20 −6 .github/workflows/dependencies/dependencies_codeplay.sh
+4 −2 .github/workflows/dependencies/dependencies_hip.sh
+8 −9 .github/workflows/docs.yml
+55 −55 .github/workflows/gcc.yml
+13 −13 .github/workflows/hip.yml
+15 −15 .github/workflows/hypre.yml
+28 −36 .github/workflows/intel.yml
+5 −5 .github/workflows/macos.yml
+6 −6 .github/workflows/petsc.yml
+1 −1 .github/workflows/post-pr.yml
+2 −2 .github/workflows/sensei.yml
+6 −6 .github/workflows/smoke.yml
+3 −3 .github/workflows/style.yml
+10 −10 .github/workflows/sundials.yml
+6 −6 .github/workflows/windows.yml
+53 −0 CHANGES
+1 −1 Docs/sphinx_documentation/source/EB.rst
+5 −1 Src/Base/AMReX.cpp
+18 −0 Src/Base/AMReX_Algorithm.H
+1 −1 Src/Base/AMReX_BLProfiler.H
+122 −4 Src/Base/AMReX_BaseFab.H
+12 −0 Src/Base/AMReX_Extension.H
+18 −0 Src/Base/AMReX_Functional.H
+75 −1 Src/Base/AMReX_GpuAtomic.H
+4 −1 Src/Base/AMReX_GpuComplex.H
+0 −1 Src/Base/AMReX_GpuContainers.H
+7 −2 Src/Base/AMReX_OpenMP.H
+31 −1 Src/Base/AMReX_OpenMP.cpp
+30 −2 Src/Base/AMReX_Reduce.H
+7 −14 Src/Base/AMReX_TableData.H
+14 −0 Src/Base/AMReX_Tuple.H
+48 −1 Src/Base/AMReX_TypeList.H
+406 −0 Src/LinearSolvers/AMReX_GMRES.H
+147 −0 Src/LinearSolvers/AMReX_GMRES_MLMG.H
+3 −0 Src/LinearSolvers/CMakeLists.txt
+3 −0 Src/LinearSolvers/MLMG/AMReX_MLLinOp.H
+19 −12 Src/LinearSolvers/MLMG/AMReX_MLMG.H
+4 −0 Src/LinearSolvers/MLMG/Make.package
+9 −0 Src/LinearSolvers/Make.package
+4 −0 Src/LinearSolvers/OpenBC/Make.package
+3 −2 Src/Particle/AMReX_DenseBins.H
+2 −2 Src/Particle/AMReX_NeighborList.H
+22 −1 Src/Particle/AMReX_Particle.H
+10 −5 Src/Particle/AMReX_ParticleCommunication.H
+0 −5 Src/Particle/AMReX_ParticleContainer.H
+0 −50 Src/Particle/AMReX_ParticleContainerI.H
+57 −18 Src/Particle/AMReX_ParticleIO.H
+2 −2 Src/Particle/AMReX_ParticleLocator.H
+6 −2 Src/Particle/AMReX_ParticleMesh.H
+3 −1 Src/Particle/AMReX_ParticleReduce.H
+10 −2 Src/Particle/AMReX_ParticleTile.H
+10 −2 Src/Particle/AMReX_ParticleTransformation.H
+0 −74 Src/Particle/AMReX_Particle_mod_K.H
+357 −153 Src/Particle/AMReX_TracerParticle_mod_K.H
+25 −12 Src/Particle/AMReX_WriteBinaryParticleData.H
+3 −3 Tests/Amr/Advection_AmrCore/Source/AmrCoreAdv.H
+0 −8 Tests/Amr/Advection_AmrCore/Source/AmrCoreAdv.cpp
+1 −1 Tests/LinearSolvers/ABecLaplacian_C/GNUmakefile
+4 −0 Tests/LinearSolvers/ABecLaplacian_C/MyTest.H
+90 −1 Tests/LinearSolvers/ABecLaplacian_C/MyTest.cpp
+2 −1 Tests/LinearSolvers/ABecLaplacian_C/MyTestPlotfile.cpp
+17 −0 Tests/LinearSolvers/ABecLaplacian_C/inputs.gmres
+0 −4 Tests/Particles/AssignDensity/main.cpp
+0 −4 Tests/Particles/AssignMultiLevelDensity/main.cpp
+1 −1 Tests/Particles/CheckpointRestartSOA/main.cpp
+10 −9 Tools/Plotfile/fcompare.cpp

0 comments on commit 2926140

Please sign in to comment.