CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix! Still need to clean up some further debugging code.

Browse Source
This commit is contained in:
Wayne Mitchell 2022-03-25 00:56:39 +00:00
parent 511c0ec77e
commit 6b5a13cedf
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/parcsr_ls/par_amg_setup.c
View File

@ -1555,6 +1555,7 @@ hypre_BoomerAMGSetup( void *amg_vdata,
HYPRE_ANNOTATE_REGION_END("%s", "Coarsening");
HYPRE_ANNOTATE_REGION_BEGIN("%s", "Interpolation");
hypre_printf("WM: debug - agg_num_levels = %d, nodal = %d\n", agg_num_levels, nodal);
if (level < agg_num_levels)
{
if (nodal == 0)

5
src/parcsr_ls/par_amg_solveT.c
View File

@ -703,10 +703,11 @@ HYPRE_Int hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
* Generate CSR matrix from ParCSRMatrix A
*-----------------------------------------------------------------*/
A_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
f_vector = hypre_ParVectorToVectorAll(f);
/* WM: If statement was in the wrong place? Need all procs to participate in comm above */
if (n)
{
A_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
f_vector = hypre_ParVectorToVectorAll(f);
A_CSR_i = hypre_CSRMatrixI(A_CSR);
A_CSR_j = hypre_CSRMatrixJ(A_CSR);
A_CSR_data = hypre_CSRMatrixData(A_CSR);

16
src/parcsr_mv/par_csr_triplemat_device.c
View File

@ -553,6 +553,10 @@ hypre_ParCSRMatrix*
hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix *A,
hypre_ParCSRMatrix *B )
{
/* WM: debug */
hypre_printf("WM: debug - print P's\n");
/* hypre_ParCSRMatrixPrint(A, "P1"); */
/* hypre_ParCSRMatrixPrint(B, "P2"); */
HYPRE_Int my_id;
hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &my_id);
hypre_printf("WM: debug - rank %d, inside hypre_ParCSRMatMatDevice()\n", my_id);
@ -742,6 +746,7 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix *A,
}
hypre_printf("WM: debug - rank %d, finished hypre_ParCSRMatMatDevice()\n", my_id);
/* hypre_ParCSRMatrixPrint(C, "P"); */
return C;
}
@ -1147,6 +1152,8 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
hypre_ParCSRMatrix *P,
HYPRE_Int keep_transpose )
{
/* hypre_ParCSRMatrixPrint(P, "P"); */
/* hypre_ParCSRMatrixPrint(A, "A"); */
hypre_CSRMatrix *R_diag = hypre_ParCSRMatrixDiag(R);
hypre_CSRMatrix *R_offd = hypre_ParCSRMatrixOffd(R);
@ -1548,7 +1555,14 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
hypre_SyncComputeStream(hypre_handle());
hypre_printf("WM: debug - rank %d, finished hypre_ParCSRMatrixRAPKTDevice()\n", my_id);
/* hypre_printf("WM: debug - rank %d, finished hypre_ParCSRMatrixRAPKTDevice()\n", my_id); */
/* hypre_MatvecCommPkgCreate(C); */
/* hypre_ParCSRMatrixPrint(C, "C"); */
/* char my_filename[256]; */
/* hypre_sprintf(my_filename, "commPkg%d", my_id); */
/* hypre_ParCSRCommPkgPrint(hypre_ParCSRMatrixCommPkg(C), my_filename); */
/* hypre_MPI_Finalize(); */
/* exit(0); */
return C;
}

6
src/seq_mv/csr_matop_device.c
View File

@ -563,9 +563,9 @@ hypre_CSRMatrixSplitDevice_core( HYPRE_Int
col_map_offd_C,
col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
HYPRE_BigInt *new_end = HYPRE_ONEDPL_CALL( std::unique,
col_map_offd_C,
col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
new_end = HYPRE_ONEDPL_CALL( std::unique,
col_map_offd_C,
col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
}
#else
HYPRE_THRUST_CALL( sort,