Skip to content

Commit 53de453

Browse files
zingalezingale
authored
Merge branch 'development' into joss_paper
2 parents beac53d + b0839d1 commit 53de453

File tree

254 files changed

+20242
-4409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+20242
-4409
lines changed

‎.codespell-ignore-words

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
aprox
12
blocs
23
bloc
34
inout
@@ -13,3 +14,5 @@ coul
1314
dum
1415
crate
1516
vie
17+
hep
18+
ine

‎.github/workflows/cuda.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ jobs:
4141
make realclean
4242
make NETWORK_DIR=ignition_reaclib/URCA-simple USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4
4343
44-
- name: compile test_nse_net (ase)
44+
- name: compile nse_net_cell (ase)
4545
run: |
4646
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
47-
cd unit_test/test_nse_net
47+
cd unit_test/nse_net_cell
4848
make USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4

‎.github/workflows/nse_net.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,42 @@ jobs:
2626
sudo apt-get update -y -qq
2727
sudo apt-get -qq -y install curl cmake jq clang g++>=9.3.0
2828
29-
- name: Compile, test_nse_net (NSE_NET, ase)
29+
- name: Compile, nse_net_cell (NSE_NET, ase)
3030
run: |
31-
cd unit_test/test_nse_net
31+
cd unit_test/nse_net_cell
3232
make realclean
3333
make -j 4
3434
35-
- name: Run test_nse_net (NSE_NET, ase)
35+
- name: Run nse_net_cell (NSE_NET, ase)
3636
run: |
37-
cd unit_test/test_nse_net
37+
cd unit_test/nse_net_cell
3838
./main3d.gnu.ex inputs_ase amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out
3939
4040
- name: Print backtrace
41-
if: ${{ failure() && hashFiles('unit_test/test_nse_net/Backtrace.0') != '' }}
42-
run: cat unit_test/test_nse_net/Backtrace.0
41+
if: ${{ failure() && hashFiles('unit_test/nse_net_cell/Backtrace.0') != '' }}
42+
run: cat unit_test/nse_net_cell/Backtrace.0
4343

4444
- name: Compare to stored output (NSE_NET, ase)
4545
run: |
46-
cd unit_test/test_nse_net
46+
cd unit_test/nse_net_cell
4747
diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_unit_test.out
4848
49-
- name: Compile, test_nse_net/make_table (NSE_NET, ase, make_table)
49+
- name: Compile, nse_net_cell/make_table (NSE_NET, ase, make_table)
5050
run: |
51-
cd unit_test/test_nse_net/make_table
51+
cd unit_test/nse_net_cell/make_table
5252
make realclean
5353
make -j 4
5454
55-
- name: Run, test_nse_net/make_table (NSE_NET, ase, make_table)
55+
- name: Run, nse_net_cell/make_table (NSE_NET, ase, make_table)
5656
run: |
57-
cd unit_test/test_nse_net/make_table
57+
cd unit_test/nse_net_cell/make_table
5858
./main3d.gnu.ex amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out
5959
6060
- name: Print backtrace
61-
if: ${{ failure() && hashFiles('unit_test/test_nse_net/make_table/Backtrace.0') != '' }}
62-
run: cat unit_test/test_nse_net/make_table/Backtrace.0
61+
if: ${{ failure() && hashFiles('unit_test/nse_net_cell/make_table/Backtrace.0') != '' }}
62+
run: cat unit_test/nse_net_cell/make_table/Backtrace.0
6363

6464
- name: Compare to stored output (NSE_NET, ase, make_table)
6565
run: |
66-
cd unit_test/test_nse_net/make_table
66+
cd unit_test/nse_net_cell/make_table
6767
diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_make_table_unit_test.out

‎.github/workflows/test_partition_functions.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ jobs:
2828
2929
- name: Compile
3030
run: |
31-
cd unit_test/test_part_func
31+
cd unit_test/part_func_cell
3232
make clean
3333
make -j 4
3434
35-
- name: Run test_part_func
35+
- name: Run part_func_cell
3636
run: |
37-
cd unit_test/test_part_func
37+
cd unit_test/part_func_cell
3838
./main3d.gnu.ex > test.out
3939
4040
- name: Compare to stored output
4141
run: |
42-
cd unit_test/test_part_func
42+
cd unit_test/part_func_cell
4343
diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/part_func.out
4444

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*.ind
1313
Docs/*/*.pdf
1414
Docs/*/*.ps
15+
Docs/source/runtime_parameters.rst
1516
MaestroUsersGuide.out
1617
MaestroUsersGuide.old
1718

@@ -79,7 +80,7 @@ extern.f90
7980
build/
8081
doxy_files
8182
Docs/source/runtime_parameters.rst
82-
83+
Docs/source/changelog.md
8384

8485
# C++ parameters
8586
extern_parameters.H

‎.mailmap

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@ Abigail Bishop <[email protected]> abigailbishop <ms.abigailbishop@gmai
99
Sydney Andrews <[email protected]> sandshrews <[email protected]>
1010
Xinlong Li <[email protected]> Xinlong <[email protected]>
1111
Xinlong Li <[email protected]> sailoridy <[email protected]>
12-
Xinlong Li <[email protected]> sailor <[email protected]>
12+
Xinlong Li <[email protected]> sailor <[email protected]>
13+
Xinlong Li <[email protected]>
14+
Eric T. Johnson <[email protected]>
15+
Zhi Chen <[email protected]>
16+
Zhi Chen <[email protected]>
17+
Doreen Fan <[email protected]>

0 commit comments

Comments
 (0)