Merge pull request CEMeNT-PSAAP#154 from ilhamv/main

Keep collision-inducing neutron alive when applicable. Update on tests.

.github/workflows/mpi_numba_reg.yml

@@ -1,4 +1,4 @@
-name: Regression Test - Numba and MPI (2 threads)
+name: Regression Test - Numba and MPI
 
 on: [push, pull_request]
 
@@ -32,4 +32,4 @@ jobs:
     - name: Regression Test - Numba and MPI
       run: |
           cd test/regression
-          python run.py --mode=numba --mpiexec=2
+          python run.py --mode=numba --mpiexec=4

.github/workflows/mpi_reg.yml

@@ -33,4 +33,3 @@ jobs:
       run: |
         cd test/regression
         python run.py --mpiexec=4
-        python run.py --mpiexec=2

mcdc/kernel.py

@@ -2020,8 +2020,17 @@ def scattering(P, mcdc):
         # Sample scattering phase space
         sample_phasespace_scattering(P, material, P_new, mcdc)
 
-        # Bank
-        add_particle(P_new, mcdc["bank_active"])
+        # Bank, but keep it if it is the last particle
+        if n == N - 1:
+            P["alive"] = True
+            P["ux"] = P_new["ux"]
+            P["uy"] = P_new["uy"]
+            P["uz"] = P_new["uz"]
+            P["g"] = P_new["g"]
+            P["E"] = P_new["E"]
+            P["w"] = P_new["w"]
+        else:
+            add_particle(P_new, mcdc["bank_active"])
 
 
 @njit
@@ -2289,7 +2298,18 @@ def fission(P, mcdc):
         elif mcdc["setting"]["mode_eigenvalue"]:
             add_particle(P_new, mcdc["bank_census"])
         else:
-            add_particle(P_new, mcdc["bank_active"])
+            # Keep it if it is the last particle
+            if n == N - 1:
+                P["alive"] = True
+                P["ux"] = P_new["ux"]
+                P["uy"] = P_new["uy"]
+                P["uz"] = P_new["uz"]
+                P["t"] = P_new["t"]
+                P["g"] = P_new["g"]
+                P["E"] = P_new["E"]
+                P["w"] = P_new["w"]
+            else:
+                add_particle(P_new, mcdc["bank_active"])
 
 
 @njit