Skip to content

Commit 8d957d1

Browse files
authored
Merge branch 'development' into diffusion_analytic
2 parents 5e2e41a + 8022f18 commit 8d957d1

Some content is hidden

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

48 files changed

+16825
-20744
lines changed

.github/workflows/dependencies/dependencies_hip.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ sudo apt-key add rocm.gpg.key
3333

3434
source /etc/os-release # set UBUNTU_CODENAME: focal or jammy or ...
3535

36-
echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${1-latest} ${UBUNTU_CODENAME} main" \
36+
VERSION=${1-6.3.2}
37+
38+
echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${VERSION} ${UBUNTU_CODENAME} main" \
3739
| sudo tee /etc/apt/sources.list.d/rocm.list
3840
echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \
3941
| sudo tee -a /etc/profile.d/rocm.sh
@@ -53,16 +55,16 @@ sudo apt-get install -y --no-install-recommends \
5355
libnuma-dev \
5456
libopenmpi-dev \
5557
openmpi-bin \
56-
rocm-dev \
57-
roctracer-dev \
58-
rocprofiler-dev \
59-
rocrand-dev \
60-
rocfft-dev \
61-
rocprim-dev \
62-
rocsparse-dev
58+
rocm-dev${VERSION} \
59+
roctracer-dev${VERSION} \
60+
rocprofiler-dev${VERSION} \
61+
rocrand-dev${VERSION} \
62+
rocfft-dev${VERSION} \
63+
rocprim-dev${VERSION} \
64+
rocsparse-dev${VERSION}
6365

6466
# hiprand-dev is a new package that does not exist in old versions
65-
sudo apt-get install -y --no-install-recommends hiprand-dev || true
67+
sudo apt-get install -y --no-install-recommends hiprand-dev${VERSION} || true
6668

6769
# activate
6870
#

.github/workflows/hip.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
jobs:
1010
hip-compile:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:
@@ -24,7 +24,7 @@ jobs:
2424
cd ../..
2525
2626
- name: Dependencies
27-
run: .github/workflows/dependencies/dependencies_hip.sh
27+
run: .github/workflows/dependencies/dependencies_hip.sh 6.3.2
2828

2929
- name: compile flame_wave
3030
run: |

CHANGES.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
# 25.03
2+
3+
* nova problem: update the inputs to match Smith Clark & Zingale
4+
(2025) and support 3D (#3031, #3040)
5+
6+
* docs updates (#3039)
7+
8+
* update the network names for the subchandra and subch_base
9+
problems (#3033)
10+
11+
* update the HIP CI action to support a later runner (#3034)
12+
13+
* add support for printing from `check_for_name` from GPUs (#3036)
14+
15+
* remove some old sparse Jacobian stuff from the build system
16+
(#3035)
17+
18+
# 25.02
19+
20+
* docs updates (#3027)
21+
22+
* add the `simple_convection` problem (#3016)
23+
24+
* codespell CI updates (#3025)
25+
26+
* only print mid-timestep `estTimeStep` outputs if relevant (#3023)
27+
28+
* CI updates to match Microphysics changes (#3021, #3024)
29+
30+
* remove some old comments related to Fortran (#3022)
31+
32+
* fix a tiling issue with shock detection on CPUs (#3019)
33+
34+
* remove unneeded files from problem setups (#3018) and fix comments
35+
in problem setup `GNUmakefile`s
36+
137
# 25.01
238

339
* address rotation source in spherical 2d coordinate (#2967)

Docs/source/Introduction.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Castro's major capabilities:
2424
* adaptive mesh refinement with subcycling; jumps of 2x and 4x
2525
between levels (see :ref:`ch:amr`)
2626

27-
* arbitrary equation of state (provided by the companion StarKiller
28-
Microphysics project)
27+
* arbitrary equation of state (provided by the companion `AMReX-Astro
28+
Microphysics <https://github.com/amrex-astro/Microphysics>`_ project)
2929

3030
* general nuclear reaction networks
3131

@@ -110,5 +110,3 @@ throughout the code documentation and papers.
110110

111111
Physical constants, again using the CGS system are available
112112
in ``Microphysics/constants/``.
113-
114-

Docs/source/build_system.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,8 @@ Microphysics Parameters
135135

136136
.. index:: USE_REACT, general_null, GENERAL_NET_INPUTS, NETWORK_DIR, INTEGRATOR_DIR
137137

138-
* ``USE_REACT_SPARSE_JACOBIAN``
139-
140-
* ``USE_SPARSE_STOP_ON_OOB``
141-
142-
* ``EOS_DIR``: the equation of state to use. This will be a subdirectory under the
143-
Microphysics repo.
138+
* ``EOS_DIR``: the equation of state to use. This will be a subdirectory under the
139+
Microphysics repo.
144140

145141
.. index:: EOS_DIR
146142

@@ -275,5 +271,3 @@ This is the current build system process.
275271

276272
For all of this to work, we need the ``tmp_build_dir/s`` directory to
277273
be first in the vpath, so our modified sources are found and used.
278-
279-

Docs/source/creating_a_problem.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ plane-parallel hydrostatic atmosphere, using the hydrostatic boundary
152152
conditions instead of a simple symmetry boundary is essential when
153153
using the standard CTU PPM solver.
154154

155+
.. index:: castro.fill_ambient_bc, castro.ambient_fill_dir, castro.ambient_outflow_vel
156+
155157
A different special boundary condition, based on outflow, is available at
156158
the upper boundary. This works together with the ``model_parser``
157159
module to fill the ghost cells at the upper boundary with the initial
@@ -232,6 +234,8 @@ each of these in the main source tree.
232234
Model Parser
233235
------------
234236

237+
.. index:: USE_MODEL_PARSER, MAX_NPTS_MODEL
238+
235239
Many problem setups begin with a 1-d initial model that is mapped onto
236240
the grid. The ``model_parser.H`` provides the functions that read in
237241
the initial model and map it on the Castro grid. To enable this, add::
@@ -282,5 +286,3 @@ This fills ``dens`` with the density at the position ``height``. In
282286
addition to density, you can specify temperature (``model::itemp``),
283287
pressure (``model::ipres``), species (indexed from ``model::ispec``),
284288
or an auxiliary quantity (indexed from ``model::iaux``).
285-
286-

Docs/source/getting_started.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ general requirements to build Castro are:
1616

1717
* A C++17 (or later) compiler (for GCC, we need >= 9.0 for CUDA compilation)
1818

19-
* python (>= 3.7)
19+
* python (>= 3.10)
2020

2121
* GNU make (>= 3.82)
2222

@@ -26,7 +26,7 @@ For running in parallel, an MPI library is required. For running on GPUs:
2626

2727
* CUDA 11 or later is required for NVIDIA GPUs
2828

29-
* ROCM 4.5 or later is required for AMD GPUs
29+
* ROCM 6.3.1 or later is required for AMD GPUs (earlier versions have a register allocation bug)
3030

3131
More information on parallel builds is given in section
3232
:ref:`ch:mpiplusx`.

Exec/Make.Castro

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -201,17 +201,6 @@ ifeq ($(USE_REACT), TRUE)
201201
DEFINES += -DREACTIONS
202202
endif
203203

204-
ifeq ($(USE_REACT_SPARSE_JACOBIAN), TRUE)
205-
DEFINES += -DREACT_SPARSE_JACOBIAN
206-
207-
# The following is sometimes useful to turn on for debugging sparse J indices
208-
# (if a get/set/scale is called with (row, col) not in the sparse J, stop)
209-
# Otherwise, set/scale do nothing, and get returns 0.
210-
ifeq ($(USE_SPARSE_STOP_ON_OOB), TRUE)
211-
DEFINES += -DSPARSE_STOP_ON_OOB
212-
endif
213-
endif
214-
215204
ifeq ($(USE_SIMPLIFIED_SDC), TRUE)
216205
DEFINES += -DSDC_EVOLVE_ENERGY
217206
endif

Exec/science/Detonation/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ EOS_DIR := helmholtz
1818

1919
# This sets the network directory in $(MICROPHYSICS_HOME)/networks
2020
ifeq ($(USE_NSE_NET), TRUE)
21-
NETWORK_DIR := subch_base
21+
NETWORK_DIR := he-burn/he-burn-18a
2222
SCREEN_METHOD := chabrier1998
2323
else
2424
NETWORK_DIR := aprox19

Exec/science/nova/GNUmakefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PRECISION = DOUBLE
22
PROFILE = FALSE
33
DEBUG = FALSE
4-
DIM = 2
4+
DIM = 3
55

66
COMP = gnu
77

@@ -10,7 +10,7 @@ USE_OMP = FALSE
1010
USE_CUDA = FALSE
1111

1212
USE_REACT = TRUE
13-
USE_DIFFUSION = TRUE
13+
USE_DIFFUSION = FALSE
1414
USE_GRAV = TRUE
1515

1616
CASTRO_HOME := ../../..
@@ -22,7 +22,7 @@ MAX_NPTS_MODEL = 20000
2222
EOS_DIR := helmholtz
2323

2424
# This sets the network directory in $(MICROPHYSICS_HOME)/networks
25-
NETWORK_DIR := nova2
25+
NETWORK_DIR := nova
2626

2727
# Thi sets the conductivity EOS directory in $(MICROPHYSICS_HOME)/conductivity
2828
CONDUCTIVITY_DIR := stellar

0 commit comments

Comments
 (0)