From 5cce50f679f9570ac6b8b4c78d35fcae60dce734 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 25 Oct 2016 12:26:19 +0200
Subject: [PATCH] Cleanup the spmInit and make sure the reader finalize the
initialization
---
spm_read_driver.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/spm_read_driver.c b/spm_read_driver.c
index 20ee2526..84dc1a03 100644
--- a/spm_read_driver.c
+++ b/spm_read_driver.c
@@ -62,18 +62,7 @@ spmReadDriver( pastix_driver_t driver,
int mpirank = 0;
int mpiinit;
- spm->mtxtype = PastixGeneral;
- spm->flttype = PastixDouble;
- spm->fmttype = PastixCSC;
- spm->gN = 0;
- spm->n = 0;
- spm->gnnz = 0;
- spm->nnz = 0;
- spm->dof = 1;
- spm->colptr = NULL;
- spm->rowptr = NULL;
- spm->values = NULL;
- spm->loc2glob = NULL;
+ spmInit(spm);
MPI_Initialized( &mpiinit );
if (mpiinit) {
@@ -327,5 +316,10 @@ 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;
+
return PASTIX_SUCCESS;
}
--
GitLab