From 3adc4dde74a1a70c8a4340d49a87508f621aa478 Mon Sep 17 00:00:00 2001 From: Luke Shingles Date: Fri, 7 Mar 2025 21:33:26 +0000 Subject: [PATCH] Update grid.cc --- grid.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/grid.cc b/grid.cc index da8df56bf..d6d678d79 100644 --- a/grid.cc +++ b/grid.cc @@ -2534,23 +2534,21 @@ auto get_totmassradionuclide(const int z, const int a) -> double { // boundary, regardless of direction. for (int d = 0; d < 3; d++) { - const double t_coordminboundary = - ((pktposgridcoord[d] - (pktvelgridcoord[d] * tstart)) / - (grid::get_cellcoordmin(cellindex, d) - (pktvelgridcoord[d] * globals::tmin)) * globals::tmin) - - tstart; - d_coordminboundary[d] = CLIGHT_PROP * t_coordminboundary; - if (last_cross == posdirections[d]) { + if (pktvelgridcoord[d] > (pktposgridcoord[d] / tstart)) { d_coordminboundary[d] = -1; - } - - if (pktvelgridcoord[d] < (pktposgridcoord[d] / tstart)) { - d_coordmaxboundary[d] = -1; - } else { const double t_coordmaxboundary = ((pktposgridcoord[d] - (pktvelgridcoord[d] * tstart)) / (cellcoordmax[d] - (pktvelgridcoord[d] * globals::tmin)) * globals::tmin) - tstart; d_coordmaxboundary[d] = CLIGHT_PROP * t_coordmaxboundary; + } else { + d_coordmaxboundary[d] = -1; + + const double t_coordminboundary = + ((pktposgridcoord[d] - (pktvelgridcoord[d] * tstart)) / + (grid::get_cellcoordmin(cellindex, d) - (pktvelgridcoord[d] * globals::tmin)) * globals::tmin) - + tstart; + d_coordminboundary[d] = CLIGHT_PROP * t_coordminboundary; } } } else {