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

fixed bug and memory leak

Browse Source
This commit is contained in:
ulrikey 2012-05-25 17:19:52 +00:00
parent 163a13bbb0
commit a1398aa709
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parcsr_ls/gen_redcs_mat.c
View File

@ -377,8 +377,8 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
MPI_Comm new_comm;
hypre_MPI_Group orig_group, new_group;
hypre_MPI_Op hypre_MPI_MERGE;
HYPRE_Int *ranks, *info, new_num_procs, my_info, my_id, num_procs;
hypre_int *list_len;
HYPRE_Int *info, *ranks, new_num_procs, my_info, my_id, num_procs;
HYPRE_Int *list_len;
hypre_MPI_Comm_rank(comm,&my_id);
@ -389,11 +389,17 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
hypre_MPI_Allreduce(&my_info, &new_num_procs, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
if (new_num_procs == 0)
{
new_comm = hypre_MPI_COMM_NULL;
*new_comm_ptr = new_comm;
return 0;
}
ranks = hypre_CTAlloc(HYPRE_Int, new_num_procs+2);
if (new_num_procs == 1)
{
if (participate) ranks[2] = my_id;
hypre_MPI_Bcast ( ranks, 1, HYPRE_MPI_INT, my_id, comm);
if (participate) my_info = my_id;
hypre_MPI_Allreduce(&my_info, &ranks[2], 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
}
else
{
@ -409,7 +415,7 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
else
info[0] = 0;
list_len[0] = (hypre_int)new_num_procs + 2;
list_len[0] = new_num_procs + 2;
hypre_MPI_Op_create((hypre_MPI_User_function *)merge_lists, 0, &hypre_MPI_MERGE);

3
parcsr_ls/par_relax.c
View File

@ -3238,7 +3238,6 @@ HYPRE_Int hypre_GaussElimSetup (hypre_ParAMGData *amg_data, HYPRE_Int level, HYP
/* Generate sub communicator */
hypre_GenerateSubComm(comm, num_rows, &new_comm);
hypre_ParAMGDataNewComm(amg_data) = new_comm;
if (num_rows)
{
@ -3306,10 +3305,12 @@ HYPRE_Int hypre_GaussElimSetup (hypre_ParAMGData *amg_data, HYPRE_Int level, HYP
else
hypre_ParAMGDataAMat(amg_data) = A_mat;
hypre_ParAMGDataCommInfo(amg_data) = comm_info;
hypre_ParAMGDataNewComm(amg_data) = new_comm;
hypre_TFree(mat_info);
hypre_TFree(mat_displs);
hypre_TFree(A_mat_local);
}
return hypre_error_flag;
}