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

Reviewed a bit the way to measure 

the size of the Matrix and the
 size of the Number of Non-Zeroes
This commit is contained in:
Francesco Lannutti 2012-08-25 11:30:22 -07:00 committed by Francesco Lannutti
parent 88ef8f71fb
commit 9e29756a98
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -5423,6 +5423,13 @@
Removed the PARALLEL_ARCH macro
Removed the Combine algorithm from Sparse and Analyses
2012-08-25 Francesco Lannutti
* src/maths/KLU/klusmp.c
* src/spicelib/analysis/cktsetup.c
Reviewed a bit the way to measure
the size of the Matrix and the
size of the Number of Non-Zeroes
2012-08-11 Francesco Lannutti
* src/include/ngspice/devdefs.h
* src/include/ngspice/smpdefs.h

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

@ -122,7 +122,6 @@ SMPmatrix_CSC (SMPmatrix *Matrix)
void
SMPnnz (SMPmatrix *Matrix)
{
Matrix->CKTkluN = spGetSize (Matrix->SPmatrix, 1) ;
Matrix->CKTklunz = Matrix->SPmatrix->Elements ;
return ;

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

@ -93,23 +93,26 @@ CKTsetup(CKTcircuit *ckt)
if (ckt->CKTmatrix->CKTkluMODE)
{
int i ;
int n = ckt->CKTmatrix->CKTkluN ;
int n = SMPmatSize (ckt->CKTmatrix) ;
ckt->CKTmatrix->CKTkluN = n ;
int nz = ckt->CKTmatrix->CKTklunz ;
ckt->CKTmatrix->CKTkluAp = TMALLOC (int, n + 1) ;
ckt->CKTmatrix->CKTkluAi = TMALLOC (int, nz) ;
ckt->CKTmatrix->CKTkluAx = TMALLOC (double, nz) ;
ckt->CKTmatrix->CKTkluIntermediate = TMALLOC (double, n ) ;
ckt->CKTmatrix->CKTkluIntermediate = TMALLOC (double, n) ;
ckt->CKTmatrix->CKTbind_Sparse = TMALLOC (double *, nz) ;
ckt->CKTmatrix->CKTbind_CSC = TMALLOC (double *, nz) ;
ckt->CKTmatrix->CKTdiag_CSC = TMALLOC (double *, n) ;
/* Binding Table Sparse-KLU creation */
SMPmatrix_CSC (ckt->CKTmatrix) ;
for (i = 0 ; i < DEVmaxnum ; i++)
if (DEVices [i] && DEVices [i]->DEVbindCSC)
if (DEVices [i] && DEVices [i]->DEVbindCSC && ckt->CKThead [i])
DEVices [i]->DEVbindCSC (ckt->CKThead [i], ckt) ;
ckt->CKTmatrix->CKTkluMatrixIsComplex = CKTkluMatrixReal ;
@ -118,7 +121,9 @@ CKTsetup(CKTcircuit *ckt)
if (ckt->CKTmatrix->CKTsuperluMODE)
{
int i ;
int n = ckt->CKTmatrix->CKTsuperluN ;
int n = SMPmatSize (ckt->CKTmatrix) ;
ckt->CKTmatrix->CKTsuperluN = n ;
int nz = ckt->CKTmatrix->CKTsuperlunz ;
ckt->CKTmatrix->CKTsuperluAp = TMALLOC (int, n + 1) ;
@ -126,15 +131,16 @@ CKTsetup(CKTcircuit *ckt)
ckt->CKTmatrix->CKTsuperluAx = TMALLOC (double, nz) ;
ckt->CKTmatrix->CKTsuperluPerm_c = TMALLOC (int, n) ;
ckt->CKTmatrix->CKTsuperluPerm_r = TMALLOC (int, n) ;
ckt->CKTmatrix->CKTsuperluEtree = TMALLOC (int, n) ;
ckt->CKTmatrix->CKTsuperluEtree = TMALLOC (int, n) ;
ckt->CKTmatrix->CKTsuperluIntermediate = TMALLOC (double, n) ;
ckt->CKTmatrix->CKTsuperluIntermediate = TMALLOC (double, n) ;
ckt->CKTmatrix->CKTbind_Sparse = TMALLOC (double *, nz) ;
ckt->CKTmatrix->CKTbind_CSC = TMALLOC (double *, nz) ;
ckt->CKTmatrix->CKTdiag_CSC = TMALLOC (double *, n) ;
/* Binding Table Sparse-KLU creation */
SMPmatrix_CSC (ckt->CKTmatrix) ;
dCreate_CompCol_Matrix (&(ckt->CKTmatrix->CKTsuperluA), n, n, nz, ckt->CKTmatrix->CKTsuperluAx,
@ -144,15 +150,18 @@ CKTsetup(CKTcircuit *ckt)
StatInit (&(ckt->CKTmatrix->CKTsuperluStat)) ;
for (i = 0 ; i < DEVmaxnum ; i++)
if (DEVices [i] && DEVices [i]->DEVbindCSC)
if (DEVices [i] && DEVices [i]->DEVbindCSC && ckt->CKThead [i])
DEVices [i]->DEVbindCSC (ckt->CKThead [i], ckt) ;
}
#elif defined(UMFPACK)
if (ckt->CKTmatrix->CKTumfpackMODE)
{
int i ;
int n = ckt->CKTmatrix->CKTumfpackN ;
int nz = ckt->CKTmatrix->CKTumfpacknz ;
int n = SMPmatSize (ckt->CKTmatrix) ;
ckt->CKTmatrix->CKTumfpackN = n ;
int nz = ckt->CKTmatrix->CKTumfpacknz ;
ckt->CKTmatrix->CKTumfpackAp = TMALLOC (int, n + 1) ;
ckt->CKTmatrix->CKTumfpackAi = TMALLOC (int, nz) ;
ckt->CKTmatrix->CKTumfpackAx = TMALLOC (double, nz) ;
@ -168,10 +177,11 @@ CKTsetup(CKTcircuit *ckt)
ckt->CKTmatrix->CKTdiag_CSC = TMALLOC (double *, n) ;
/* Binding Table Sparse-KLU creation */
SMPmatrix_CSC (ckt->CKTmatrix) ;
for (i = 0 ; i < DEVmaxnum ; i++)
if (DEVices [i] && DEVices [i]->DEVbindCSC)
if (DEVices [i] && DEVices [i]->DEVbindCSC && ckt->CKThead [i])
DEVices [i]->DEVbindCSC (ckt->CKThead [i], ckt) ;
}
#endif