Update grid.cc

artis-mcrt · Mar 7, 2025 · 3adc4dd · 3adc4dd
1 parent f7ea42f
commit 3adc4dd
Showing 1 changed file with 9 additions and 11 deletions.
diff --git 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 {