From bfe7a5444c0bdca94abdd0a10168c4146217e888 Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Wed, 3 Apr 2013 09:34:41 +0200 Subject: [PATCH] Deleted old parameters due to the New Binding Method --- src/include/ngspice/smpdefs.h | 23 ++++++++--------------- src/maths/KLU/klusmp.c | 3 --- src/maths/SuperLU/superlusmp.c | 2 +- src/maths/UMFPACK/umfpacksmp.c | 2 +- src/maths/ni/niinit.c | 11 ++--------- src/spicelib/analysis/cktsetup.c | 6 ------ 6 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/include/ngspice/smpdefs.h b/src/include/ngspice/smpdefs.h index 4646d3a19..6c5d52eba 100644 --- a/src/include/ngspice/smpdefs.h +++ b/src/include/ngspice/smpdefs.h @@ -44,9 +44,6 @@ typedef struct sSMPmatrix { #define CKTkluMatrixComplex 1 /* KLU Matrix Complex definition */ double *CKTkluIntermediate ; /* KLU RHS Intermediate for Solve Real Step */ double *CKTkluIntermediate_Complex ; /* KLU iRHS Intermediate for Solve Complex Step */ - double **CKTbind_Sparse ; /* KLU Sparse original element position */ - double **CKTbind_CSC ; /* KLU new element position */ - double **CKTbind_CSC_Complex ; /* KLU new element position in Complex analysis */ BindElement *CKTbindStruct ; /* KLU - Sparse Binding Structure */ double **CKTdiag_CSC ; /* KLU pointer to diagonal element to perform Gmin */ int CKTkluN ; /* KLU N, copied */ @@ -70,15 +67,13 @@ typedef struct sSMPmatrix { superlu_options_t CKTsuperluOptions ; SuperLUStat_t CKTsuperluStat ; double *CKTsuperluIntermediate ; - double **CKTbind_Sparse ; - double **CKTbind_CSC ; - double **CKTbind_CSC_Complex ; + BindElement *CKTbindStruct ; /* SuperLU - Sparse Binding Structure */ double **CKTdiag_CSC ; int CKTsuperluN ; int CKTsuperlunz ; int CKTsuperluMODE ; - #define CKTsuperluON 1 /* SuperLU MODE ON definition */ - #define CKTsuperluOFF 0 /* SuperLU MODE OFF definition */ + #define CKTsuperluON 1 /* SuperLU MODE ON definition */ + #define CKTsuperluOFF 0 /* SuperLU MODE OFF definition */ #elif defined(UMFPACK) int *CKTumfpackAp ; int *CKTumfpackAi ; @@ -89,23 +84,21 @@ typedef struct sSMPmatrix { double *CKTumfpackInfo ; double *CKTumfpackIntermediate ; double *CKTumfpackX ; - double **CKTbind_Sparse ; - double **CKTbind_CSC ; - double **CKTbind_CSC_Complex ; + BindElement *CKTbindStruct ; /* UMFPACK - Sparse Binding Structure */ double **CKTdiag_CSC ; int CKTumfpackN ; int CKTumfpacknz ; int CKTumfpackMODE ; - #define CKTumfpackON 1 /* UMFPACK MODE ON definition */ - #define CKTumfpackOFF 0 /* UMFPACK MODE OFF definition */ + #define CKTumfpackON 1 /* UMFPACK MODE ON definition */ + #define CKTumfpackOFF 0 /* UMFPACK MODE OFF definition */ #endif } SMPmatrix ; #if defined(KLU) || defined(SuperLU) || defined(UMFPACK) -void SMPmatrix_CSC ( SMPmatrix * ) ; -void SMPnnz ( SMPmatrix * ) ; +void SMPmatrix_CSC (SMPmatrix *) ; +void SMPnnz (SMPmatrix *) ; #endif int SMPaddElt( SMPmatrix *, int , int , double ); double * SMPmakeElt( SMPmatrix * , int , int ); diff --git a/src/maths/KLU/klusmp.c b/src/maths/KLU/klusmp.c index 18f51bc62..228902f00 100644 --- a/src/maths/KLU/klusmp.c +++ b/src/maths/KLU/klusmp.c @@ -421,9 +421,6 @@ SMPdestroy (SMPmatrix *Matrix) free (Matrix->CKTkluAp) ; free (Matrix->CKTkluAi) ; free (Matrix->CKTkluAx) ; - free (Matrix->CKTbind_Sparse) ; - free (Matrix->CKTbind_CSC) ; - free (Matrix->CKTbind_CSC_Complex) ; free (Matrix->CKTdiag_CSC) ; free (Matrix->CKTkluIntermediate) ; free (Matrix->CKTkluIntermediate_Complex) ; diff --git a/src/maths/SuperLU/superlusmp.c b/src/maths/SuperLU/superlusmp.c index 79dffa2f4..408c7ce28 100644 --- a/src/maths/SuperLU/superlusmp.c +++ b/src/maths/SuperLU/superlusmp.c @@ -115,7 +115,7 @@ void SMPmatrix_CSC (SMPmatrix *Matrix) { spMatrix_CSC (Matrix->SPmatrix, Matrix->CKTsuperluAp, Matrix->CKTsuperluAi, Matrix->CKTsuperluAx, - Matrix->CKTsuperluN, Matrix->CKTbind_Sparse, Matrix->CKTbind_CSC, Matrix->CKTdiag_CSC) ; + Matrix->CKTsuperluN, Matrix->CKTbindStruct, Matrix->CKTdiag_CSC) ; return ; } diff --git a/src/maths/UMFPACK/umfpacksmp.c b/src/maths/UMFPACK/umfpacksmp.c index 1c74000cf..7a1c643b8 100644 --- a/src/maths/UMFPACK/umfpacksmp.c +++ b/src/maths/UMFPACK/umfpacksmp.c @@ -115,7 +115,7 @@ void SMPmatrix_CSC (SMPmatrix *Matrix) { spMatrix_CSC (Matrix->SPmatrix, Matrix->CKTumfpackAp, Matrix->CKTumfpackAi, Matrix->CKTumfpackAx, - Matrix->CKTumfpackN, Matrix->CKTbind_Sparse, Matrix->CKTbind_CSC, Matrix->CKTdiag_CSC) ; + Matrix->CKTumfpackN, Matrix->CKTbindStruct, Matrix->CKTdiag_CSC) ; return ; } diff --git a/src/maths/ni/niinit.c b/src/maths/ni/niinit.c index 2433c545e..8169de1e8 100644 --- a/src/maths/ni/niinit.c +++ b/src/maths/ni/niinit.c @@ -41,9 +41,6 @@ NIinit(CKTcircuit *ckt) ckt->CKTmatrix->CKTkluMatrixIsComplex = CKTkluMatrixReal ; ckt->CKTmatrix->CKTkluIntermediate = NULL ; ckt->CKTmatrix->CKTkluIntermediate_Complex = NULL ; - ckt->CKTmatrix->CKTbind_Sparse = NULL ; - ckt->CKTmatrix->CKTbind_CSC = NULL ; - ckt->CKTmatrix->CKTbind_CSC_Complex = NULL ; ckt->CKTmatrix->CKTbindStruct = NULL ; ckt->CKTmatrix->CKTdiag_CSC = NULL ; ckt->CKTmatrix->CKTkluN = 0 ; @@ -61,9 +58,7 @@ NIinit(CKTcircuit *ckt) ckt->CKTmatrix->CKTsuperluInfo = 0 ; ckt->CKTmatrix->CKTsuperluEtree = NULL ; ckt->CKTmatrix->CKTsuperluIntermediate = NULL ; - ckt->CKTmatrix->CKTbind_Sparse = NULL ; - ckt->CKTmatrix->CKTbind_CSC = NULL ; - ckt->CKTmatrix->CKTbind_CSC_Complex = NULL ; + ckt->CKTmatrix->CKTbindStruct = NULL ; ckt->CKTmatrix->CKTdiag_CSC = NULL ; ckt->CKTmatrix->CKTsuperluN = 0 ; ckt->CKTmatrix->CKTsuperlunz = 0 ; @@ -79,9 +74,7 @@ NIinit(CKTcircuit *ckt) ckt->CKTmatrix->CKTumfpackInfo = NULL ; ckt->CKTmatrix->CKTumfpackIntermediate = NULL ; ckt->CKTmatrix->CKTumfpackX = NULL ; - ckt->CKTmatrix->CKTbind_Sparse = NULL ; - ckt->CKTmatrix->CKTbind_CSC = NULL ; - ckt->CKTmatrix->CKTbind_CSC_Complex = NULL ; + ckt->CKTmatrix->CKTbindStruct = NULL ; ckt->CKTmatrix->CKTdiag_CSC = NULL ; ckt->CKTmatrix->CKTumfpackN = 0 ; ckt->CKTmatrix->CKTumfpacknz = 0 ; diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c index 8a1e3bf1d..4f214f5ea 100644 --- a/src/spicelib/analysis/cktsetup.c +++ b/src/spicelib/analysis/cktsetup.c @@ -121,8 +121,6 @@ CKTsetup(CKTcircuit *ckt) ckt->CKTmatrix->CKTkluAx = TMALLOC (double, nz) ; ckt->CKTmatrix->CKTkluIntermediate = TMALLOC (double, n) ; -// ckt->CKTmatrix->CKTbind_Sparse = TMALLOC (double *, nz) ; -// ckt->CKTmatrix->CKTbind_CSC = TMALLOC (double *, nz) ; ckt->CKTmatrix->CKTbindStruct = TMALLOC (BindElement, nz) ; ckt->CKTmatrix->CKTdiag_CSC = TMALLOC (double *, n) ; @@ -162,8 +160,6 @@ CKTsetup(CKTcircuit *ckt) ckt->CKTmatrix->CKTsuperluIntermediate = TMALLOC (double, n) ; -// ckt->CKTmatrix->CKTbind_Sparse = TMALLOC (double *, nz) ; -// ckt->CKTmatrix->CKTbind_CSC = TMALLOC (double *, nz) ; ckt->CKTmatrix->CKTbindStruct = TMALLOC (BindElement, nz) ; ckt->CKTmatrix->CKTdiag_CSC = TMALLOC (double *, n) ; @@ -204,8 +200,6 @@ CKTsetup(CKTcircuit *ckt) ckt->CKTmatrix->CKTumfpackX = TMALLOC (double, n) ; -// ckt->CKTmatrix->CKTbind_Sparse = TMALLOC (double *, nz) ; -// ckt->CKTmatrix->CKTbind_CSC = TMALLOC (double *, nz) ; ckt->CKTmatrix->CKTbindStruct = TMALLOC (BindElement, nz) ; ckt->CKTmatrix->CKTdiag_CSC = TMALLOC (double *, n) ;