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

Fixed some strict checking errors associated with type hypre_MPI_User_function.

Browse Source 
Updated the check-mpi autotest script to catch MPI_Comm_size, etc.
This commit is contained in:
falgout 2012-05-25 21:00:52 +00:00
parent a1398aa709
commit b335ec98aa
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTOTEST/check-mpi.filters
View File

@ -1,3 +1,4 @@
/HYPRE_config.h:
/_hypre_utilities.h:
/HYPRE_utilities.h:
/mpistubs.c:

2
AUTOTEST/check-mpi.sh
View File

@ -48,6 +48,6 @@ find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
egrep -v '/hypre/include' > check-mpi.files
egrep '(^|[^[:alnum:]_]+)MPI_' `cat check-mpi.files` |
egrep -v 'MPI_Comm' >&2
egrep -v 'MPI_Comm([^_]|$)' >&2
rm -f check-mpi.files

2
parcsr_ls/_hypre_parcsr_ls.h
View File

@ -588,7 +588,7 @@ HYPRE_Int BuildParLaplacian27pt ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_
HYPRE_Int hypre_seqAMGSetup ( hypre_ParAMGData *amg_data , HYPRE_Int p_level , HYPRE_Int coarse_threshold );
HYPRE_Int hypre_seqAMGCycle ( hypre_ParAMGData *amg_data , HYPRE_Int p_level , hypre_ParVector **Par_F_array , hypre_ParVector **Par_U_array );
HYPRE_Int hypre_GenerateSubComm ( MPI_Comm comm , HYPRE_Int participate , MPI_Comm *new_comm_ptr );
void merge_lists ( HYPRE_Int *list1 , HYPRE_Int *list2 , hypre_int *np1 , hypre_MPI_Datatype *dptr );
void hypre_merge_lists ( HYPRE_Int *list1 , HYPRE_Int *list2 , hypre_int *np1 , hypre_MPI_Datatype *dptr );
/* HYPRE_ads.c */
HYPRE_Int HYPRE_ADSCreate ( HYPRE_Solver *solver );

4
parcsr_ls/gen_redcs_mat.c
View File

@ -417,7 +417,7 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
list_len[0] = new_num_procs + 2;
hypre_MPI_Op_create((hypre_MPI_User_function *)merge_lists, 0, &hypre_MPI_MERGE);
hypre_MPI_Op_create((hypre_MPI_User_function *)hypre_merge_lists, 0, &hypre_MPI_MERGE);
hypre_MPI_Allreduce(info, ranks, list_len[0], HYPRE_MPI_INT, hypre_MPI_MERGE, comm);
@ -440,7 +440,7 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
}
void merge_lists (HYPRE_Int *list1, HYPRE_Int* list2, hypre_int *np1, hypre_MPI_Datatype *dptr)
void hypre_merge_lists (HYPRE_Int *list1, HYPRE_Int* list2, hypre_int *np1, hypre_MPI_Datatype *dptr)
{
HYPRE_Int i, len1, len2, indx1, indx2;

2
parcsr_ls/par_amg.c
View File

@ -571,7 +571,7 @@ hypre_BoomerAMGDestroy( void *data )
if (new_comm != hypre_MPI_COMM_NULL)
{
MPI_Comm_free (&new_comm);
hypre_MPI_Comm_free (&new_comm);
}
hypre_TFree(amg_data);
return hypre_error_flag;

2
parcsr_ls/par_sv_interp_lsfit.c
View File

@ -247,7 +247,7 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
comm = hypre_ParCSRCommPkgComm(comm_pkg);
MPI_Comm_size(comm, &num_procs);
hypre_MPI_Comm_size(comm, &num_procs);
num_nonzeros = hypre_CSRMatrixNumNonzeros(P_diag)
+ hypre_CSRMatrixNumNonzeros(P_offd);

4
utilities/_hypre_utilities.h
View File

@ -203,7 +203,7 @@ typedef HYPRE_Int hypre_MPI_Comm;
typedef HYPRE_Int hypre_MPI_Group;
typedef HYPRE_Int hypre_MPI_Request;
typedef HYPRE_Int hypre_MPI_Datatype;
typedef HYPRE_Int hypre_MPI_User_function;
typedef void (hypre_MPI_User_function) ();
typedef struct
{
@ -248,7 +248,7 @@ typedef MPI_Datatype hypre_MPI_Datatype;
typedef MPI_Status hypre_MPI_Status;
typedef MPI_Op hypre_MPI_Op;
typedef MPI_Aint hypre_MPI_Aint;
typedef MPI_User_function hypre_MPI_User_function;
typedef MPI_User_function hypre_MPI_User_function;
#define hypre_MPI_COMM_WORLD MPI_COMM_WORLD
#define hypre_MPI_COMM_NULL MPI_COMM_NULL