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

bug fix

Browse Source
This commit is contained in:
Ruipeng Li 2020-02-06 15:39:17 -08:00
parent 60101610dc
commit 2b8fd590b1
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTOTEST/check-license.filters
View File

@ -14,4 +14,5 @@
./src/zerr
./src/config.log
./src/config.status
TVD.v3breakpoints
./src/utilities/cub
TVD.v3breakpoints

10
src/parcsr_ls/ams.c
View File

@ -589,7 +589,7 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix *A,
HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
HYPRE_Int memory_location_l1 = hypre_VectorMemoryLocation(l1_norm_vec);
HYPRE_Complex *l1_norm = hypre_VectorData(l1_norm_vec);
HYPRE_Real *l1_norm = hypre_VectorData(l1_norm_vec);
HYPRE_Int exec = hypre_GetExecPolicy1( memory_location_l1 );
hypre_assert(exec != HYPRE_EXEC_UNSET);
@ -680,8 +680,8 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix *A,
/* Set the abs(diag) element */
hypre_CSRMatrixExtractDiagonal(A_diag, l1_norm, 1);
diag_tmp = hypre_TAlloc(HYPRE_Complex, num_rows, memory_location_tmp);
hypre_TMemcpy(diag_tmp, l1_norm, HYPRE_Complex, num_rows, memory_location_tmp, memory_location_l1);
diag_tmp = hypre_TAlloc(HYPRE_Real, num_rows, memory_location_tmp);
hypre_TMemcpy(diag_tmp, l1_norm, HYPRE_Real, num_rows, memory_location_tmp, memory_location_l1);
/* Add the scaled l1 norm of the offd part */
if (num_cols_offd)
@ -737,7 +737,7 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix *A,
/* Handle negative definite matrices */
if (!diag_tmp)
{
diag_tmp = hypre_TAlloc(HYPRE_Complex, num_rows, memory_location_tmp);
diag_tmp = hypre_TAlloc(HYPRE_Real, num_rows, memory_location_tmp);
}
/* Set the diag element */
@ -3404,7 +3404,7 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
HYPRE_Real diag;
HYPRE_Complex *l1_norm = hypre_VectorData(l1_norm_vec);
HYPRE_Real *l1_norm = hypre_VectorData(l1_norm_vec);
HYPRE_Int ii, ns, ne, rest, size;
HYPRE_Int *cf_marker_offd = NULL;

2
src/parcsr_ls/par_relax.c
View File

@ -55,7 +55,7 @@ HYPRE_Int hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
hypre_Vector *f_local = hypre_ParVectorLocalVector(f);
HYPRE_Real *f_data = hypre_VectorData(f_local);
HYPRE_Complex *l1_norms = hypre_VectorData(l1_norms_vec);
HYPRE_Complex *l1_norms = l1_norms_vec ? hypre_VectorData(l1_norms_vec) : NULL;
hypre_Vector *Vtemp_local;
HYPRE_Real *Vtemp_data;

2
src/utilities/hypre_memory.c
View File

@ -685,7 +685,7 @@ hypre_PrintMemoryTracker()
char filename[256];
FILE *file;
hypre_MPI_Comm_rank(MPI_COMM_WORLD, &myid);
hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid);
hypre_sprintf(filename,"HypreMemoryTrack.log.%05d", myid);
if ((file = fopen(filename, "w")) == NULL)
{