diff --git a/spm_read_driver.c b/spm_read_driver.c index c73eb159c89ec3cebab15aa7b2cbc732b7f68294..d010ce40adebea417b42614c11b4375e02dcc801 100644 --- a/spm_read_driver.c +++ b/spm_read_driver.c @@ -287,7 +287,7 @@ spmReadDriver( pastix_driver_t driver, pastix_int_t nnz; if (mpirank == 0) { - nnz = spm->colptr[spm->gN] - spm->colptr[0]; + nnz = spm->nnz; } MPI_Bcast( spm, 2*sizeof(int)+3*sizeof(pastix_int_t), MPI_CHAR, 0, comm ); diff --git a/z_spm_laplacian.c b/z_spm_laplacian.c index cc9cb89ccf0a96e1548590a549504020c93b3087..eeb5b21d9b8e6192a41cc2aa21bfe0281e98d4bb 100644 --- a/z_spm_laplacian.c +++ b/z_spm_laplacian.c @@ -146,7 +146,7 @@ z_spmLaplacian2D( pastix_spm_t *spm, pastix_int_t i, j, k; pastix_int_t nnz = (2*(dim1)-1)*dim2 + (dim2-1)*dim1; - spm->mtxtype = PastixSymmetric; + spm->mtxtype = PastixHermitian; spm->flttype = PastixComplex64; spm->fmttype = PastixCSC; spm->gnnz = nnz; @@ -262,7 +262,7 @@ z_spmLaplacian3D( pastix_spm_t *spm, pastix_int_t i, j, k, l; pastix_int_t nnz = (2*(dim1)-1)*dim2*dim3 + (dim2-1)*dim1*dim3 + dim2*dim1*(dim3-1); - spm->mtxtype = PastixSymmetric; + spm->mtxtype = PastixHermitian; spm->flttype = PastixComplex64; spm->fmttype = PastixCSC; spm->gnnz = nnz; diff --git a/z_spm_scal.c b/z_spm_scal.c index 2d253ebadf0a768a65fc9a732c0671a296af1ccb..c79b7857885ea8e359c983eb03f59cbe76fada58 100644 --- a/z_spm_scal.c +++ b/z_spm_scal.c @@ -41,15 +41,9 @@ z_spmScal( pastix_spm_t *spm ) nnz = spm->nnz; values = spm->values; - norm = z_spmNorm( PastixFrobeniusNorm, spm ); - printf("NORM IN %.3g\n", norm); for (i=0; i<nnz; i++){ values[i] /= norm; } - - norm = z_spmNorm( PastixFrobeniusNorm, spm ); - - printf("NORM OUT %.3g\n", norm); }