From 56befbc7d4927ba31674480d45f51cb8dcd40ca2 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge <mathieu.faverge@inria.fr> Date: Fri, 11 Nov 2016 22:52:33 +0100 Subject: [PATCH] Add file to the print function --- z_spm.h | 4 ++-- z_spm_2dense.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/z_spm.h b/z_spm.h index fc8321dd..af179942 100644 --- a/z_spm.h +++ b/z_spm.h @@ -61,8 +61,8 @@ int z_spmCheckAxb( int nrhs, const pastix_spm_t *spm, void *x0, int ldx0, void * /** * Output routines */ -void z_spmDensePrint( pastix_int_t m, pastix_int_t n, pastix_complex64_t *A, pastix_int_t lda ); -void z_spmPrint( const pastix_spm_t *spm ); +void z_spmDensePrint( FILE *f, pastix_int_t m, pastix_int_t n, pastix_complex64_t *A, pastix_int_t lda ); +void z_spmPrint( FILE *f, const pastix_spm_t *spm ); pastix_spm_t *z_spmExpand(const pastix_spm_t *spm); diff --git a/z_spm_2dense.c b/z_spm_2dense.c index 16bc3374..fb8b5ddd 100644 --- a/z_spm_2dense.c +++ b/z_spm_2dense.c @@ -279,13 +279,13 @@ z_spmCSR2dense( const pastix_spm_t *spm ) case PastixSymmetric: for(i=0; i<spm->n; i++, rowptr++) { - dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; + dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i]; for(k=rowptr[0]; k<rowptr[1]; k++, colptr++) { j = (*colptr - baseval); - dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; + dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j]; for(jj=0; jj<dofj; jj++) @@ -303,13 +303,13 @@ z_spmCSR2dense( const pastix_spm_t *spm ) default: for(i=0; i<spm->n; i++, rowptr++) { - dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; + dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i]; for(k=rowptr[0]; k<rowptr[1]; k++, colptr++) { j = (*colptr - baseval); - dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; + dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j]; for(jj=0; jj<dofj; jj++) @@ -514,7 +514,7 @@ z_spm2dense( const pastix_spm_t *spm ) } void -z_spmDensePrint( pastix_int_t m, pastix_int_t n, pastix_complex64_t *A, pastix_int_t lda ) +z_spmDensePrint( FILE *f, pastix_int_t m, pastix_int_t n, pastix_complex64_t *A, pastix_int_t lda ) { pastix_int_t i, j; @@ -524,10 +524,10 @@ z_spmDensePrint( pastix_int_t m, pastix_int_t n, pastix_complex64_t *A, pastix_i { if ( cabs( A[ j * lda + i ] ) != 0. ) { #if defined(PRECISION_z) || defined(PRECISION_c) - fprintf( stderr, "%ld %ld (%e, %e)\n", + fprintf( f, "%ld %ld (%e, %e)\n", i, j, creal(A[lda * j + i]), cimag(A[lda * j + i]) ); #else - fprintf( stderr, "%ld %ld %e\n", + fprintf( f, "%ld %ld %e\n", i, j, A[lda * j + i] ); #endif } -- GitLab