Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/celeritas/optical/Transporter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ void Transporter::transport_impl(CoreState<M>& state) const
action->step(*params_, state);
}

CELER_LOG(info) << " step_iter " << num_step_iters << ": "
<< counters.num_active << " active tracks";

num_steps += counters.num_active;
if (CELER_UNLIKELY(++num_step_iters == max_step_iters_))
{
Expand Down
17 changes: 17 additions & 0 deletions src/celeritas/optical/surface/detail/InitBoundaryExecutor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,22 @@ CELER_FUNCTION void InitBoundaryExecutor::operator()(CoreTrackView& track) const
auto geo = track.geometry();
CELER_EXPECT(geo.is_on_boundary());

// Move the particle across the boundary
geo.cross_boundary();
if (CELER_UNLIKELY(geo.failed()))
{
track.apply_errored();
return;
}

// If post volume is not an optical material, kill the track.
if (!track.material_record().material_id())
{
track.sim().status(TrackStatus::killed);
return;
}

/*
// Surface selector must be created before crossing boundary to store
// pre-volume information
VolumeSurfaceSelector select_surface{track.surface(),
Expand Down Expand Up @@ -111,6 +127,7 @@ CELER_FUNCTION void InitBoundaryExecutor::operator()(CoreTrackView& track) const

track.sim().post_step_action(
surface_physics.scalars().surface_stepping_action);
*/
}

//---------------------------------------------------------------------------//
Expand Down
5 changes: 3 additions & 2 deletions src/geocel/vg/VecgeomTrackView.hh
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,9 @@ CELER_FUNCTION bool VecgeomTrackView::is_on_boundary() const
*/
CELER_FUNCTION Real3 VecgeomTrackView::normal() const
{
// FIXME: temporarily return a bogus but valid surface normal
return this->dir();
// // FIXME: temporarily return a bogus but valid surface normal
// return this->dir();
CELER_NOT_IMPLEMENTED("VecGeom Normals");
}

//---------------------------------------------------------------------------//
Expand Down
3 changes: 2 additions & 1 deletion test/celeritas/ImportedDataTestBase.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ auto ImportedDataTestBase::build_physics_options() const -> PhysicsOptions
//---------------------------------------------------------------------------//
auto ImportedDataTestBase::select_optical_models() const -> std::vector<IMC>
{
return {IMC::absorption, IMC::rayleigh, IMC::wls};
return {};
// return {IMC::absorption, IMC::rayleigh, IMC::wls};
}

//---------------------------------------------------------------------------//
Expand Down
Loading