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

Merge branch 'boxvalues' of ssh://mybitbucket.llnl.gov:7999/hypre/hypre into boxvalues

Browse Source
This commit is contained in:
Ruipeng Li 2018-09-04 15:51:38 -07:00
commit 2077c3219c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/IJ_mv/HYPRE_IJMatrix.c
View File

@ -57,6 +57,7 @@ HYPRE_IJMatrixCreate( MPI_Comm comm,
hypre_IJMatrixObjectType(ijmatrix) = HYPRE_UNITIALIZED;
hypre_IJMatrixAssembleFlag(ijmatrix) = 0;
hypre_IJMatrixPrintLevel(ijmatrix) = 0;
hypre_IJMatrixOMPFlag(ijmatrix) = 0;
hypre_MPI_Comm_size(comm,&num_procs);
hypre_MPI_Comm_rank(comm, &myid);

2
src/examples/ex5f.f
View File

@ -398,7 +398,7 @@ c Now set up the Parasails preconditioner and specify any parameters
call HYPRE_ParaSailsCreate(MPI_COMM_WORLD, precond,ierr)
call HYPRE_ParaSailsSetParams(precond, 0.1d0, 1, ierr)
call HYPRE_ParaSailsSetFilter(precond, 0.05d0, ierr)
call HYPRE_ParaSailsSetSym(precond, 1)
call HYPRE_ParaSailsSetSym(precond, 1, ierr)
call HYPRE_ParaSailsSetLogging(precond, 3, ierr)
c set parsails as the pcg preconditioner

6
src/utilities/hypre_memory.c
View File

@ -58,9 +58,9 @@ size_t hypre__target_dtoh_bytes = 0;
/* if true, DeviceMalloc is always device-only malloc no matter what UM is
* if false, DeviceMalloc becomes UM malloc when with UM */
#if defined(HYPRE_USE_MANAGED) && !defined(HYPRE_USE_CUDA) && !defined(HYPRE_USE_OMP45)
#define DEVICE_ALWARYS_DEVICE 0
#define DEVICE_ALWAYS_DEVICE 0
#else
#define DEVICE_ALWARYS_DEVICE 1
#define DEVICE_ALWAYS_DEVICE 1
#endif
/******************************************************************************
@ -83,7 +83,7 @@ static inline HYPRE_Int hypre_RedefMemLocation(HYPRE_Int location)
if (location == HYPRE_MEMORY_DEVICE)
{
#if !DEVICE_ALWARYS_DEVICE && HYPRE_MEMORY_ENV == DEVC_MEM_WTUM
#if !DEVICE_ALWAYS_DEVICE && HYPRE_MEMORY_ENV == DEVC_MEM_WTUM
return HYPRE_MEMORY_SHARED;
#else
return HYPRE_MEMORY_DEVICE;