Skip to content

initialize safety in InitTracks #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeverinDiederichs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

initialize safety in InitTracks #682

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions include/AdePT/transport/AdePTTransport.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include <AdePT/transport/tracks/TrackDebug.cuh>

#include <AdePT/transport/navigation/BVHNavigator.h>
#include <AdePT/transport/navigation/AdePTNavigator.h>

#include <AdePT/transport/kernels/AdePTSteppingActionSelector.cuh>
using SelectedSteppingAction = adept::SteppingAction::Action;
Expand Down Expand Up @@ -173,7 +173,7 @@ __device__ inline uint64_t GenerateSeedFromTrackInfo(const adeptint::TrackData &
return fnv1a_hash64(input, 12);
}

template <typename SpeciesManagerT>
template <bool InitializeSafety = false, typename SpeciesManagerT>
__device__ inline void InitTrackToQueue(SpeciesManagerT &speciesTM, const adeptint::TrackData &trackInfo,
short queueIndex, adept::MParrayT<QueueIndexPair> *toBeEnqueued,
uint64_t initialSeed)
Expand All @@ -183,10 +183,18 @@ __device__ inline void InitTrackToQueue(SpeciesManagerT &speciesTM, const adepti
// Scramble the initial seed with track data so a particle returning from the
// device and being injected again does not collide with its old RNG stream.
auto seed = GenerateSeedFromTrackInfo(trackInfo, initialSeed);
speciesTM.InitTrack(slot, seed, trackInfo.eKin, trackInfo.globalTime, static_cast<float>(trackInfo.localTime),
static_cast<float>(trackInfo.properTime), trackInfo.weight, trackInfo.position,
trackInfo.direction, trackInfo.navState, trackInfo.eventId, trackInfo.trackId, trackInfo.parentId,
trackInfo.threadId, trackInfo.stepCounter, trackInfo.hasHostData);
auto &track =
speciesTM.InitTrack(slot, seed, trackInfo.eKin, trackInfo.globalTime, static_cast<float>(trackInfo.localTime),
static_cast<float>(trackInfo.properTime), trackInfo.weight, trackInfo.position,
trackInfo.direction, trackInfo.navState, trackInfo.eventId, trackInfo.trackId,
trackInfo.parentId, trackInfo.threadId, trackInfo.stepCounter, trackInfo.hasHostData);
if constexpr (InitializeSafety) {
double safety = 0.;
if (!track.navState.IsOnBoundary()) {
safety = AdePTNavigator::ComputeSafety(track.pos, track.navState);
}
track.SetSafety(track.pos, safety);
}
toBeEnqueued->push_back(QueueIndexPair{slot, queueIndex});
}

Expand All @@ -200,10 +208,10 @@ __global__ void InitTracks(adeptint::TrackData *trackinfo, int ntracks, Particle

switch (trackInfo.pdg) {
case 11:
InitTrackToQueue(particleManager.electrons, trackInfo, GPUQueueIndex::Electron, toBeEnqueued, initialSeed);
InitTrackToQueue<true>(particleManager.electrons, trackInfo, GPUQueueIndex::Electron, toBeEnqueued, initialSeed);
break;
case -11:
InitTrackToQueue(particleManager.positrons, trackInfo, GPUQueueIndex::Positron, toBeEnqueued, initialSeed);
InitTrackToQueue<true>(particleManager.positrons, trackInfo, GPUQueueIndex::Positron, toBeEnqueued, initialSeed);
break;
case 22:
// check for Woodcock tracking
Expand Down
Loading