Skip to content

Commit 24a815f

Browse files
authored
Merge branch 'development' into update_xrb_spherical
2 parents a1234cb + 9fdc8cb commit 24a815f

File tree

91 files changed

+847
-288
lines changed

Some content is hidden

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

91 files changed

+847
-288
lines changed

.codespell-ignore-words

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ nd
1212
ue
1313
bion
1414
aas
15-
checkin
15+
checkin
16+
indx

.github/workflows/gpu_action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
jobs:
1010
gpu-compilation:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:

CHANGES.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# 25.01
2+
3+
* address rotation source in spherical 2d coordinate (#2967)
4+
5+
* update scripts and input files for diffusion test (#3012)
6+
7+
* update pressure via eos when transverse_use_eos=1 (#3004)
8+
9+
* update thermal diffusion documentation (#3011)
10+
11+
* rename `Opacity_dir` -> `OPACITY_DIR` (#3006)
12+
13+
* sync GPU CI dependencies with AMReX (#3010)
14+
15+
* wdmerger: update inputs for He mergers to include burn retry
16+
and adjust I/O (#3008)
17+
18+
* fix area/vol factors for spherical when theta is close to 0 or pi
19+
(#3007)
20+
121
# 24.12
222

323
* update clang-tidy CI (#2992, #3002)
@@ -908,7 +928,7 @@
908928
the conversion of primitive to conserved variables (#804)
909929
910930
* We've changed how the backup for retries is done. Presently if
911-
use_retry is enabled we make a pre-emptive copy of the StateData
931+
use_retry is enabled we make a preemptive copy of the StateData
912932
right at the beginning of the timestep. Now we only backup when
913933
we detect that a retry is needed (#812)
914934

Exec/gravity_tests/DustCollapse/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CASTRO_HOME ?= ../../..
2222
# This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
2323
EOS_DIR := gamma_law
2424

25-
# This sets the network directory in $(MICROPHYSICS_HOME)/Networks
25+
# This sets the network directory in $(MICROPHYSICS_HOME)/networks
2626
NETWORK_DIR := general_null
2727
NETWORK_INPUTS = ignition.net
2828

Exec/gravity_tests/StarGrav/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ USE_REACT = FALSE
1616

1717
USE_MODEL_PARSER = TRUE
1818

19-
# This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
19+
# This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
2020
EOS_DIR := helmholtz
2121

2222
# This sets the network directory in $(MICROPHYSICS_HOME)/networks

Exec/gravity_tests/evrard_collapse/GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ USE_OMP = FALSE
1818
USE_GRAV = TRUE
1919

2020

21-
# This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
21+
# This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
2222
EOS_DIR := gamma_law
2323

24-
# This sets the network directory in $(MICROPHYSICS_HOME)/Networks
24+
# This sets the network directory in $(MICROPHYSICS_HOME)/networks
2525
NETWORK_DIR := general_null
2626
NETWORK_INPUTS = gammalaw.net
2727

Exec/gravity_tests/hse_convergence/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ USE_MAESTRO_INIT = FALSE
1515

1616
CASTRO_HOME ?= ../../..
1717

18-
# This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
18+
# This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
1919
EOS_DIR := helmholtz
2020

2121
# This sets the network directory in $(MICROPHYSICS_HOME)/networks

Exec/gravity_tests/hse_convergence_general/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ USE_MODEL_PARSER = TRUE
2020
# define the location of the CASTRO top directory
2121
CASTRO_HOME ?= ../../..
2222

23-
# This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
23+
# This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
2424
EOS_DIR := helmholtz
2525

2626
# This sets the network directory in $(MICROPHYSICS_HOME)/networks

Exec/gravity_tests/hydrostatic_adjust/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ USE_MODEL_PARSER = TRUE
1515

1616
CASTRO_HOME ?= ../../..
1717

18-
# This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
18+
# This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
1919
EOS_DIR := helmholtz
2020

2121
# This sets the network directory in $(MICROPHYSICS_HOME)/networks

Exec/gravity_tests/uniform_cube/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ USE_GRAV ?= TRUE
2020
# This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
2121
EOS_DIR := gamma_law
2222

23-
# This sets the network directory in $(MICROPHSICS_HOME)/Networks
23+
# This sets the network directory in $(MICROPHSICS_HOME)/networks
2424
NETWORK_DIR ?= general_null
2525
NETWORK_INPUTS = gammalaw.net
2626

0 commit comments

Comments
 (0)