Skip to content

Commit 6c644cd

Browse files
authored
Merge branch 'development' into param_stuct
2 parents 4fdcab3 + ca9e532 commit 6c644cd

File tree

5 files changed

+23
-18
lines changed

5 files changed

+23
-18
lines changed

.github/workflows/check_powi.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- development
1111

1212
jobs:
13-
check-ifdefs:
13+
check-powi:
1414
runs-on: ubuntu-latest
1515

1616
steps:
@@ -21,16 +21,7 @@ jobs:
2121
- name: Setup Python
2222
uses: actions/setup-python@v5
2323
with:
24-
python-version: '3.10'
25-
26-
- name: Cache pip
27-
uses: actions/cache@v4
28-
with:
29-
# this path is specific to Ubuntu
30-
path: ~/.cache/pip
31-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
32-
restore-keys: |
33-
${{ runner.os }}-pip-
24+
python-version: '3.11'
3425

3526
- name: Run check_powi
3627
run: |

.github/workflows/docs-test.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
with:
23-
fetch-depth: 0
22+
2423
- name: Install pandoc and doxygen
2524
run: |
2625
sudo apt install pandoc doxygen
2726
2827
- name: Setup Python
2928
uses: actions/setup-python@v5
3029
with:
31-
python-version: '3.10'
30+
python-version: '3.11'
3231
cache: "pip"
3332

3433
- name: Install dependencies

CHANGES.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# 24.05
2+
3+
* Runtime parameters can now be type `bool` (#1536)
4+
5+
* more clang-tidy and compiler warning cleaning (#1527 #1530,
6+
#1532, #1533)
7+
8+
* Remove recursion in quicksort to avoid CUDA stack limits (#1531)
9+
10+
* Update the pynucastro networks to cache derived rate partition
11+
functions (#1529)
12+
113
# 24.04
214

315
* A new `test_screening_templated` unit test was added -- this

conductivity/stellar/actual_conductivity.H

+1-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ actual_conductivity (T& state)
8080
amrex::Real ytot1 = 0.0e0_rt;
8181

8282
// set the composition variables
83-
amrex::Real w[6];
84-
for (int i = 0; i < 6; i++) {
85-
w[i] = 0.0e0_rt;
86-
}
83+
amrex::Real w[6] = {0.0};
8784

8885
// the idea here is that w[0] is H, w[1] is He, and w[2] is metals
8986
for (int i = 0; i < NumSpec; i++) {

interfaces/eos_type.H

+6
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ struct eos_rep_t:eos_base_t {
116116
#endif
117117
};
118118

119+
struct eos_rh_t:eos_rep_t {
120+
amrex::Real dhdr{};
121+
amrex::Real dhdT{};
122+
amrex::Real h{};
123+
};
124+
119125
struct eos_extra_t:eos_t {
120126
amrex::Real dpdA{};
121127
amrex::Real dpdZ{};

0 commit comments

Comments
 (0)