Skip to content

Commit

Permalink
Merge branch 'development' into ROCK4
Browse files Browse the repository at this point in the history
  • Loading branch information
zingale authored Feb 8, 2025
2 parents 99495e5 + 8c5e060 commit 0ba1517
Show file tree
Hide file tree
Showing 88 changed files with 1,854 additions and 1,447 deletions.
4 changes: 4 additions & 0 deletions .codespell-ignore-words
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
aprox
blocs
bloc
inout
Expand All @@ -15,3 +16,6 @@ crate
vie
rock4
rock2
hep
ine

4 changes: 2 additions & 2 deletions .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
make realclean
make NETWORK_DIR=ignition_reaclib/URCA-simple USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4
- name: compile test_nse_net (ase)
- name: compile nse_net_cell (ase)
run: |
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
cd unit_test/test_nse_net
cd unit_test/nse_net_cell
make USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4
2 changes: 1 addition & 1 deletion .github/workflows/jac_cell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Run jac_cell
run: |
cd unit_test/jac_cell
./main3d.gnu.ex inputs_aprox13 > test.out
./main3d.gnu.ex inputs > test.out
- name: Compare to stored output
run: |
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/nse_net.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,42 +26,42 @@ jobs:
sudo apt-get update -y -qq
sudo apt-get -qq -y install curl cmake jq clang g++>=9.3.0
- name: Compile, test_nse_net (NSE_NET, ase)
- name: Compile, nse_net_cell (NSE_NET, ase)
run: |
cd unit_test/test_nse_net
cd unit_test/nse_net_cell
make realclean
make -j 4
- name: Run test_nse_net (NSE_NET, ase)
- name: Run nse_net_cell (NSE_NET, ase)
run: |
cd unit_test/test_nse_net
cd unit_test/nse_net_cell
./main3d.gnu.ex inputs_ase amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out
- name: Print backtrace
if: ${{ failure() && hashFiles('unit_test/test_nse_net/Backtrace.0') != '' }}
run: cat unit_test/test_nse_net/Backtrace.0
if: ${{ failure() && hashFiles('unit_test/nse_net_cell/Backtrace.0') != '' }}
run: cat unit_test/nse_net_cell/Backtrace.0

- name: Compare to stored output (NSE_NET, ase)
run: |
cd unit_test/test_nse_net
cd unit_test/nse_net_cell
diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_unit_test.out
- name: Compile, test_nse_net/make_table (NSE_NET, ase, make_table)
- name: Compile, nse_net_cell/make_table (NSE_NET, ase, make_table)
run: |
cd unit_test/test_nse_net/make_table
cd unit_test/nse_net_cell/make_table
make realclean
make -j 4
- name: Run, test_nse_net/make_table (NSE_NET, ase, make_table)
- name: Run, nse_net_cell/make_table (NSE_NET, ase, make_table)
run: |
cd unit_test/test_nse_net/make_table
cd unit_test/nse_net_cell/make_table
./main3d.gnu.ex amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out
- name: Print backtrace
if: ${{ failure() && hashFiles('unit_test/test_nse_net/make_table/Backtrace.0') != '' }}
run: cat unit_test/test_nse_net/make_table/Backtrace.0
if: ${{ failure() && hashFiles('unit_test/nse_net_cell/make_table/Backtrace.0') != '' }}
run: cat unit_test/nse_net_cell/make_table/Backtrace.0

- name: Compare to stored output (NSE_NET, ase, make_table)
run: |
cd unit_test/test_nse_net/make_table
cd unit_test/nse_net_cell/make_table
diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_make_table_unit_test.out
8 changes: 4 additions & 4 deletions .github/workflows/test_partition_functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ jobs:
- name: Compile
run: |
cd unit_test/test_part_func
cd unit_test/part_func_cell
make clean
make -j 4
- name: Run test_part_func
- name: Run part_func_cell
run: |
cd unit_test/test_part_func
cd unit_test/part_func_cell
./main3d.gnu.ex > test.out
- name: Compare to stored output
run: |
cd unit_test/test_part_func
cd unit_test/part_func_cell
diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/part_func.out
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*.ind
Docs/*/*.pdf
Docs/*/*.ps
Docs/source/runtime_parameters.rst
MaestroUsersGuide.out
MaestroUsersGuide.old

Expand Down Expand Up @@ -79,7 +80,7 @@ extern.f90
build/
doxy_files
Docs/source/runtime_parameters.rst

Docs/source/changelog.md

# C++ parameters
extern_parameters.H
Expand Down
Loading

0 comments on commit 0ba1517

Please sign in to comment.