Skip to content

Commit fbec6d8

Browse files
committed
Merge branch 'development'
2 parents dc52bc6 + 8a6df44 commit fbec6d8

File tree

178 files changed

+12297
-11320
lines changed

Some content is hidden

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

178 files changed

+12297
-11320
lines changed

.github/workflows/c-linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ jobs:
3434
cppcheck_options: '-U_OPENMP -UAMREX_USE_GPU -UAMREX_USE_CUDA -UAMREX_USE_HIP -U_MSC_VER'
3535

3636
- name: Archive clang tidy report
37-
uses: actions/upload-artifact@v5
37+
uses: actions/upload-artifact@v6
3838
with:
3939
name: clang-tidy-report
4040
path: clang-tidy-report.txt
4141

4242
- name: Archive cppcheck report
43-
uses: actions/upload-artifact@v5
43+
uses: actions/upload-artifact@v6
4444
with:
4545
name: cppcheck-report
4646
path: cppcheck-report.txt

.github/workflows/castro-development.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
.github/workflows/dependencies/dependencies.sh
3030
.github/workflows/dependencies/dependencies_ccache.sh
3131
- name: Set Up Cache
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: ~/.cache/ccache
3535
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -78,7 +78,7 @@ jobs:
7878
PR_NUMBER: ${{ github.event.number }}
7979
run: |
8080
echo $PR_NUMBER > pr_number.txt
81-
- uses: actions/upload-artifact@v5
81+
- uses: actions/upload-artifact@v6
8282
with:
8383
name: pr_number
8484
path: pr_number.txt

.github/workflows/castro.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
.github/workflows/dependencies/dependencies.sh
3434
.github/workflows/dependencies/dependencies_ccache.sh
3535
- name: Set Up Cache
36-
uses: actions/cache@v4
36+
uses: actions/cache@v5
3737
with:
3838
path: ~/.cache/ccache
3939
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -82,7 +82,7 @@ jobs:
8282
PR_NUMBER: ${{ github.event.number }}
8383
run: |
8484
echo $PR_NUMBER > pr_number.txt
85-
- uses: actions/upload-artifact@v5
85+
- uses: actions/upload-artifact@v6
8686
with:
8787
name: pr_number
8888
path: pr_number.txt

.github/workflows/draft-pdf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# This should be the path to the paper within your repo.
1818
paper-path: paper/paper.md
1919
- name: Upload
20-
uses: actions/upload-artifact@v5
20+
uses: actions/upload-artifact@v6
2121
with:
2222
name: paper
2323
# This is the output path where Pandoc will write the compiled

CHANGES.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# Changelog
22

3+
## 26.01
4+
5+
* eliminate an exp at the low end of screening (#1893)
6+
7+
* use `constexpr_for` in helmholtz to map into 3D arrays (#1904)
8+
9+
* clean up `apply_electrons` in the helmholtz EOS (#1903)
10+
11+
* remove `compute_Q` and `rate=` in the `DerivedRate` constructors
12+
for pynucastro nets (#1902)
13+
14+
* update networks with the latest pynucastro (#1886)
15+
16+
* update the github actions (#1900, #1901)
17+
18+
* some optimizations to helmholtz EOS (#1896)
19+
20+
* add `kerg` constant (#1895)
21+
22+
* allow `test_sdc` to build when NSE is not defined (#1894)
23+
and add support for self-consistent NSE (#1890)
24+
25+
* update python doc package requirements (#1892)
26+
327
## 25,12
428

529
* update CI actions (#1885)

Docs/source/networks.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,11 @@ are effectively accounted for in the approximate rates.
336336
There are 2 runtime parameters that can be used
337337
to disable rates:
338338

339-
* ``network.disable_p_c12__n13`` : if set to ``1``, then the rate
339+
* ``network.disable_p_C12_to_N13_reaclib`` : if set to ``1``, then the rate
340340
:math:`\isotm{C}{12}(p,\gamma)\isotm{N}{13}` and its inverse are
341341
disabled.
342342

343-
* ``network.disable_he4_n13__p_o16`` : if set to ``1``, then the rate
343+
* ``network.disable_He4_N13_to_p_O16_reaclib`` : if set to ``1``, then the rate
344344
:math:`\isotm{N}{13}(\alpha,p)\isotm{O}{16}` and its inverse are
345345
disabled.
346346

0 commit comments

Comments
 (0)