From e322749b869de4003bdfcf2c5e69bb6f01fe1307 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge <mathieu.faverge@inria.fr> Date: Wed, 14 Dec 2016 17:07:33 +0100 Subject: [PATCH] Rename spmUpdateFields --- spm.c | 2 +- spm.h | 2 +- spm_dofs.c | 2 +- spm_io.c | 2 +- spm_read_driver.c | 5 +---- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/spm.c b/spm.c index 78cb2da6..3c38a5a2 100644 --- a/spm.c +++ b/spm.c @@ -122,7 +122,7 @@ spmInit( pastix_spm_t *spm ) * *******************************************************************************/ void -spmUpdateFields( pastix_spm_t *spm ) +spmUpdateComputedFields( pastix_spm_t *spm ) { /** diff --git a/spm.h b/spm.h index c4dd0416..46d8c27b 100644 --- a/spm.h +++ b/spm.h @@ -145,7 +145,7 @@ void spmInit( pastix_spm_t *spm ); void spmExit( pastix_spm_t *spm ); pastix_spm_t *spmCopy( const pastix_spm_t *spm ); void spmBase( pastix_spm_t *spm, int baseval ); -void spmUpdateFields( pastix_spm_t *spm ); +void spmUpdateComputedFields( pastix_spm_t *spm ); int spmConvert( int ofmttype, pastix_spm_t *ospm ); void * spm2Dense( const pastix_spm_t *spm ); pastix_int_t spmFindBase( const pastix_spm_t *spm ); diff --git a/spm_dofs.c b/spm_dofs.c index 69b504ef..c94395bf 100644 --- a/spm_dofs.c +++ b/spm_dofs.c @@ -67,7 +67,7 @@ spmDofExtend( const int type, } } - spmUpdateFields( newspm ); + spmUpdateComputedFields( newspm ); switch (spm->flttype) { case PastixFloat: diff --git a/spm_io.c b/spm_io.c index 5d9cb703..3825cadb 100644 --- a/spm_io.c +++ b/spm_io.c @@ -380,7 +380,7 @@ spmLoad( pastix_spm_t *spm, spm->dof = dof; spm->layout = layout; - spmUpdateFields( spm ); + spmUpdateComputedFields( spm ); assert( nnzexp == spm->nnzexp ); assert( spm->gN == gN ); diff --git a/spm_read_driver.c b/spm_read_driver.c index d7fd190b..a6717392 100644 --- a/spm_read_driver.c +++ b/spm_read_driver.c @@ -314,10 +314,7 @@ spmReadDriver( pastix_driver_t driver, /* MPI_Bcast(*type, 4, MPI_CHAR, 0, comm); */ } - spm->gNexp = spm->gN; - spm->nexp = spm->n; - spm->gnnzexp = spm->gnnz; - spm->nnzexp = spm->nnz; + spmUpdateComputedFields( spm ); return PASTIX_SUCCESS; } -- GitLab