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

fixed CMake issues and some other issues

Browse Source
This commit is contained in:
Ulrike Yang 2018-09-05 13:59:55 -07:00
parent 7293bf4954
commit 9ba0aab0ac
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -240,12 +240,14 @@ list (APPEND HYPRE_HEADERS
list (APPEND HYPRE_SOURCES
krylov/bicgstab.c
krylov/cgnr.c
krylov/cogmres.c
krylov/gmres.c
krylov/flexgmres.c
krylov/lgmres.c
krylov/HYPRE_bicgstab.c
krylov/HYPRE_cgnr.c
krylov/HYPRE_gmres.c
krylov/HYPRE_cogmres.c
krylov/HYPRE_lgmres.c
krylov/HYPRE_flexgmres.c
krylov/HYPRE_pcg.c
@ -445,6 +447,7 @@ list (APPEND HYPRE_SOURCES
parcsr_ls/F90_HYPRE_parcsr_cgnr.c
parcsr_ls/F90_HYPRE_parcsr_Euclid.c
parcsr_ls/F90_HYPRE_parcsr_gmres.c
parcsr_ls/F90_HYPRE_parcsr_cogmres.c
parcsr_ls/F90_HYPRE_parcsr_flexgmres.c
parcsr_ls/F90_HYPRE_parcsr_lgmres.c
parcsr_ls/F90_HYPRE_parcsr_hybrid.c

14
src/parcsr_mv/_hypre_parcsr_mv.h
View File

@ -692,20 +692,6 @@ HYPRE_ParVector HYPRE_ParVectorCloneShallow ( HYPRE_ParVector x );
HYPRE_Int HYPRE_ParVectorScale ( HYPRE_Complex value , HYPRE_ParVector x );
HYPRE_Int HYPRE_ParVectorAxpy ( HYPRE_Complex alpha , HYPRE_ParVector x , HYPRE_ParVector y );
HYPRE_Int HYPRE_ParVectorInnerProd ( HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_Real *prod );
// added by KS
// mass inner product with x being multiple vectors.
/*
*void hypre_ParKrylovMassInnerProd ( void *x , void **y, int k, void *result );
void hypre_ParKrylovMassAxpy( HYPRE_Real *alpha, void **x, void *y, HYPRE_Int k);
hypre_ParVectorMassInnerProd( hypre_ParVector *x,
hypre_ParVector **y, int k, HYPRE_Real *result ){
* */
//HYPRE_Int HYPRE_ParVectorMassInnerProd ( HYPRE_ParVector x , HYPRE_ParVector *y , HYPRE_Int k, HYPRE_Real *prod );
//HYPRE_Int HYPRE_ParVectorMassAxpy ( HYPRE_Real *alpha, HYPRE_ParVector *x, HYPRE_ParVector y, HYPRE_Int k);
// end of KS code
HYPRE_Int HYPRE_VectorToParVector ( MPI_Comm comm , HYPRE_Vector b , HYPRE_Int *partitioning , HYPRE_ParVector *vector );
/* new_commpkg.c */

8
src/test/ij.c
View File

@ -6628,8 +6628,8 @@ BuildParLaplacian( HYPRE_Int argc,
ny = 10;
nz = 10;
P = num_procs;
Q = 1;
P = 1;
Q = num_procs;
R = 1;
cx = 1.;
@ -7116,8 +7116,8 @@ BuildParDifConv( HYPRE_Int argc,
ny = 10;
nz = 10;
P = num_procs;;
Q = 1;
P = 1;
Q = num_procs;
R = 1;
cx = 1.;