luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deleted old parameters due to the New Binding Method

This commit is contained in:
Francesco Lannutti 2013-04-03 09:34:41 +02:00
parent e27b9e4abc
commit bfe7a5444c
6 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/include/ngspice/smpdefs.h
View File

@ -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 );

3
src/maths/KLU/klusmp.c
View File

@ -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) ;

2
src/maths/SuperLU/superlusmp.c
View File

@ -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 ;
}

2
src/maths/UMFPACK/umfpacksmp.c
View File

@ -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 ;
}

11
src/maths/ni/niinit.c
View File

@ -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 ;

6
src/spicelib/analysis/cktsetup.c
View File

@ -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) ;