From f48a5ce0e397afdac2c853d14d1238c68d2960d6 Mon Sep 17 00:00:00 2001
From: Ruipeng Li <li50@llnl.gov>
Date: Mon, 29 Aug 2022 09:53:06 -0700
Subject: [PATCH] Fixing bugs in hypre_BoomerAMGBuildModMultipassDevice (#724)

Fixing bugs in hypre_BoomerAMGBuildModMultipassDevice
---
 src/parcsr_ls/par_mod_multi_interp_device.c | 1 +
 src/test/TEST_ij/agg_interp.jobs            | 4 ++++
 src/test/TEST_ij/agg_interp.saved           | 6 ++++++
 src/test/TEST_ij/agg_interp.saved.lassen    | 6 ++++++
 src/test/TEST_ij/agg_interp.sh              | 1 +
 5 files changed, 18 insertions(+)

diff --git a/src/parcsr_ls/par_mod_multi_interp_device.c b/src/parcsr_ls/par_mod_multi_interp_device.c
index 7401661a6..ceda73048 100644
--- a/src/parcsr_ls/par_mod_multi_interp_device.c
+++ b/src/parcsr_ls/par_mod_multi_interp_device.c
@@ -677,6 +677,7 @@ hypre_BoomerAMGBuildModMultipassDevice( hypre_ParCSRMatrix  *A,
       P_offd_data = hypre_CSRMatrixData(P_offd);
       P_offd_i = hypre_CSRMatrixI(P_offd);
       P_offd_j = hypre_CSRMatrixJ(P_offd);
+      P_offd_size = hypre_CSRMatrixNumNonzeros(P_offd);
    }
 
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
diff --git a/src/test/TEST_ij/agg_interp.jobs b/src/test/TEST_ij/agg_interp.jobs
index 97cca4e97..c57b114e2 100755
--- a/src/test/TEST_ij/agg_interp.jobs
+++ b/src/test/TEST_ij/agg_interp.jobs
@@ -26,6 +26,7 @@
 #    18: 2s-mod-ext interpolation all levels for systems problem hybrid approach
 #    19: 2s-mod-ee interpolation 1 levels (agg_tr 0.3)
 #    20: 2s-mod-ee interpolation all levels (agg_Pmx 4 agg_P12_mx 4)
+#    22: multipass interpolation all levels (agg_Pmx 4 agg_P12_mx 4)
 #=============================================================================
 
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 1 -agg_Pmx 4 -solver 1 -rlx 6 \
@@ -114,3 +115,6 @@ mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 7 -agg
 
 mpirun -np 2 ./ij -fromfile tst -agg_nl 1 -agg_interp 8 \
  >> agg_interp.out.21
+
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 8 -agg_Pmx 4 -agg_P12_mx 4 -solver 1 -rlx 6 \
+ >> agg_interp.out.22
diff --git a/src/test/TEST_ij/agg_interp.saved b/src/test/TEST_ij/agg_interp.saved
index 8626cf5ac..15b60a9b6 100644
--- a/src/test/TEST_ij/agg_interp.saved
+++ b/src/test/TEST_ij/agg_interp.saved
@@ -172,3 +172,9 @@ Final Relative Residual Norm = 1.654514e-09
 BoomerAMG Iterations = 1
 Final Relative Residual Norm = 0.000000e+00
 
+# Output file: agg_interp.out.22
+
+
+Iterations = 15
+Final Relative Residual Norm = 6.535343e-09
+
diff --git a/src/test/TEST_ij/agg_interp.saved.lassen b/src/test/TEST_ij/agg_interp.saved.lassen
index 71657b3f2..b87c69ca5 100644
--- a/src/test/TEST_ij/agg_interp.saved.lassen
+++ b/src/test/TEST_ij/agg_interp.saved.lassen
@@ -172,3 +172,9 @@ Final Relative Residual Norm = 7.981237e-09
 BoomerAMG Iterations = 9
 Final Relative Residual Norm = 2.176372e-09
 
+# Output file: agg_interp.out.22
+
+
+Iterations = 16
+Final Relative Residual Norm = 7.077723e-09
+
diff --git a/src/test/TEST_ij/agg_interp.sh b/src/test/TEST_ij/agg_interp.sh
index 38f9531dc..984150d07 100755
--- a/src/test/TEST_ij/agg_interp.sh
+++ b/src/test/TEST_ij/agg_interp.sh
@@ -42,6 +42,7 @@ FILES="\
  ${TNAME}.out.19\
  ${TNAME}.out.20\
  ${TNAME}.out.21\
+ ${TNAME}.out.22\
 "
 
 for i in $FILES