diff --git a/app/celer-sim/Transporter.cc b/app/celer-sim/Transporter.cc index c02cd2c9b7..9fa290c729 100644 --- a/app/celer-sim/Transporter.cc +++ b/app/celer-sim/Transporter.cc @@ -92,7 +92,6 @@ auto Transporter::operator()(SpanConstPrimary primaries) } ++result.num_step_iterations; result.num_steps += track_counts.active; - result.num_aborted = track_counts.alive + track_counts.queued; result.max_queued = std::max(result.max_queued, track_counts.queued); }; @@ -127,9 +126,8 @@ auto Transporter::operator()(SpanConstPrimary primaries) } if (CELER_UNLIKELY(interrupted())) { - CELER_LOG_LOCAL(error) - << "Caught interrupt signal: aborting transport " - "loop"; + CELER_LOG_LOCAL(error) << "Caught interrupt signal: aborting " + "transport loop"; interrupted = {}; break; } @@ -144,6 +142,7 @@ auto Transporter::operator()(SpanConstPrimary primaries) } } + result.num_aborted = track_counts.alive + track_counts.queued; result.num_track_slots = stepper_->state().size(); return result; } diff --git a/doc/appendix/release-history/v0.4.rst b/doc/appendix/release-history/v0.4.rst index a3f3b48e84..a7ca0dbf4c 100644 --- a/doc/appendix/release-history/v0.4.rst +++ b/doc/appendix/release-history/v0.4.rst @@ -3,6 +3,50 @@ .. SPDX-License-Identifier: CC-BY-4.0 +.. _release_v0.4.3: + +Version 0.4.3 +============= + +*Released 2024/05/01* + +Version 0.4.3 is a bugfix and minor feature update to Celeritas. + +- Adds diagnostic output for ``celer-sim`` even when not recording all steps +- Fixes a sampling error for keV electron ionization +- Builds with ROCm 5.7.1 +- Builds with Geant4 10.5–10.7, 11.1.0 + + +New features +------------ + +* Add JSON test comparator to improve testing reliability *(@sethrj, #1115)* +* Add spack-based workflow to add all supported Geant4 versions to CI *(@sethrj, #1149)* +* Add always-on basic diagnostics to celer-sim *(@amandalund, #1214)* + +Reviewers: @amandalund *(1)*, @drbenmorgan *(1)*, @sethrj *(1)* + +Bug fixes +--------- + +* Fix Moller-Bhahba energy distribution *(@amandalund, #1138)* +* Fix Geant4 build from 10.5–10.7 and example build for 11.1 onward *(@sethrj, #1152)* +* Fix missing Werror in build-fast workflow *(@sethrj, #1141)* +* Fix build error with Geant4@11.1.0 *(@amandalund, #1199)* + +Reviewers: @sethrj *(2)*, @whokion *(1)*, @drbenmorgan *(1)*, @amandalund *(1)* + +Documentation improvements +-------------------------- + +* Update Frontier installation *(@sethrj, #1208)* + +Reviewers: @esseivaju *(1)* + +**Full Changelog**: https://github.com/celeritas-project/celeritas/compare/v0.4.2...v0.4.3 + + .. _release_v0.4.2: Version 0.4.2 diff --git a/scripts/cmake-presets/frontier.json b/scripts/cmake-presets/frontier.json index f1b72dfa9f..2f4f5afa5b 100644 --- a/scripts/cmake-presets/frontier.json +++ b/scripts/cmake-presets/frontier.json @@ -63,7 +63,8 @@ "displayName": "Frontier release mode", "inherits": [".ndebug", ".base"], "cacheVariables": { - "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"} + "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"}, + "CMAKE_INSTALL_PREFIX": "/lustre/orion/world-shared/hep143/celeritas/develop" } }, { diff --git a/scripts/env/frontier.sh b/scripts/env/frontier.sh index 6108149b04..07e614fa0b 100755 --- a/scripts/env/frontier.sh +++ b/scripts/env/frontier.sh @@ -1,9 +1,8 @@ #!/bin/sh -e PROJID=hep143 -_celer_view=${PROJWORK}/${PROJID}/opt-view -_tool_view=/ccs/proj/${PROJID}/opt-view -_conda=/ccs/proj/${PROJID}/conda-frontier +_worldwork=${WORLDWORK}/${PROJID} +_ccsproj=/ccs/proj/${PROJID} module load PrgEnv-amd/8.5.0 cpe/23.12 amd/5.7.1 craype-x86-trento \ libfabric/1.15.2.0 miniforge3/23.11.0 @@ -27,10 +26,10 @@ export CC=${CRAYPE_DIR}/bin/cc # module load craype-accel-amd-gfx90a # Set up celeritas -export SPACK_ROOT=/ccs/proj/hep143/spack -export PATH=${_celer_view}/bin:${_tool_view}/bin:${_conda}/bin:$PATH -export CMAKE_PREFIX_PATH=${_celer_view}:${CMAKE_PREFIX_PATH} -export MODULEPATH=${PROJWORK}/${PROJID}/share/lmod/linux-sles15-x86_64/Core:${MODULEPATH} +export SPACK_ROOT=${_ccsproj}/spack +export PATH=${_worldwork}/opt-view/bin:${_ccsproj}/opt-view/bin:${_ccsproj}/conda-frontier/bin:$PATH +export CMAKE_PREFIX_PATH=${_worldwork}/opt-view:${CMAKE_PREFIX_PATH} +export MODULEPATH=${_worldwork}/share/lmod/linux-sles15-x86_64/Core:${MODULEPATH} # Set up Geant4 data module load geant4-data/11.0