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

Handled the SINGULAR matrix case in a more clever way!

This commit is contained in:
Francesco Lannutti 2020-06-22 19:23:03 +02:00 committed by Holger Vogt
parent 658f449c9b
commit 5513f6e5f6
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,6 +409,10 @@ SMPcLUfac (SMPmatrix *Matrix, double PivTol)
if (ret == 0) if (ret == 0)
{ {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (ReFactor): KLU Matrix is SINGULAR\n") ;
return E_SINGULAR ;
}
if (Matrix->CKTkluCommon == NULL) { if (Matrix->CKTkluCommon == NULL) {
fprintf (stderr, "Error (ReFactor): KLUcommon object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (ReFactor): KLUcommon object is NULL. A problem occurred\n") ;
} }
@ -421,10 +425,6 @@ SMPcLUfac (SMPmatrix *Matrix, double PivTol)
} }
return 1 ; return 1 ;
} else { } else {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (ReFactor): KLU Matrix is SINGULAR\n") ;
return E_SINGULAR ;
}
return 0 ; return 0 ;
} }
} else { } else {
@ -454,6 +454,10 @@ SMPluFac (SMPmatrix *Matrix, double PivTol, double Gmin)
if (ret == 0) if (ret == 0)
{ {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (ReFactor): KLU Matrix is SINGULAR\n") ;
return E_SINGULAR ;
}
if (Matrix->CKTkluCommon == NULL) { if (Matrix->CKTkluCommon == NULL) {
fprintf (stderr, "Error (ReFactor): KLUcommon object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (ReFactor): KLUcommon object is NULL. A problem occurred\n") ;
} }
@ -466,10 +470,6 @@ SMPluFac (SMPmatrix *Matrix, double PivTol, double Gmin)
} }
return 1 ; return 1 ;
} else { } else {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (ReFactor): KLU Matrix is SINGULAR\n") ;
return E_SINGULAR ;
}
return 0 ; return 0 ;
} }
} else { } else {
@ -511,6 +511,10 @@ SMPluFacKLUforCIDER (SMPmatrix *Matrix)
if (ret == 0) if (ret == 0)
{ {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (ReFactor) (CIDER): KLU Matrix is SINGULAR\n") ;
return E_SINGULAR ;
}
if (Matrix->CKTkluCommon == NULL) { if (Matrix->CKTkluCommon == NULL) {
fprintf (stderr, "Error (ReFactor) (CIDER): KLUcommon object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (ReFactor) (CIDER): KLUcommon object is NULL. A problem occurred\n") ;
} }
@ -523,10 +527,6 @@ SMPluFacKLUforCIDER (SMPmatrix *Matrix)
} }
return 1 ; return 1 ;
} else { } else {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (ReFactor) (CIDER): KLU Matrix is SINGULAR\n") ;
return E_SINGULAR ;
}
return 0 ; return 0 ;
} }
} else { } else {
@ -557,6 +557,10 @@ SMPcReorder (SMPmatrix *Matrix, double PivTol, double PivRel, int *NumSwaps)
if (Matrix->CKTkluNumeric == NULL) if (Matrix->CKTkluNumeric == NULL)
{ {
fprintf (stderr, "Error (Factor): KLUnumeric object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (Factor): KLUnumeric object is NULL. A problem occurred\n") ;
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (Factor): KLU Matrix is SINGULAR\n") ;
return 0 ;
}
if (Matrix->CKTkluCommon == NULL) { if (Matrix->CKTkluCommon == NULL) {
fprintf (stderr, "Error (Factor): KLUcommon object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (Factor): KLUcommon object is NULL. A problem occurred\n") ;
} }
@ -568,9 +572,6 @@ SMPcReorder (SMPmatrix *Matrix, double PivTol, double PivRel, int *NumSwaps)
} }
return 1 ; return 1 ;
} else { } else {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (Factor): KLU Matrix is SINGULAR\n") ;
}
return 0 ; return 0 ;
} }
} else { } else {
@ -602,6 +603,10 @@ SMPreorder (SMPmatrix *Matrix, double PivTol, double PivRel, double Gmin)
if (Matrix->CKTkluNumeric == NULL) if (Matrix->CKTkluNumeric == NULL)
{ {
fprintf (stderr, "Error (Factor): KLUnumeric object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (Factor): KLUnumeric object is NULL. A problem occurred\n") ;
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (Factor): KLU Matrix is SINGULAR\n") ;
return 0 ;
}
if (Matrix->CKTkluCommon == NULL) { if (Matrix->CKTkluCommon == NULL) {
fprintf (stderr, "Error (Factor): KLUcommon object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (Factor): KLUcommon object is NULL. A problem occurred\n") ;
} }
@ -613,9 +618,6 @@ SMPreorder (SMPmatrix *Matrix, double PivTol, double PivRel, double Gmin)
} }
return 1 ; return 1 ;
} else { } else {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (Factor): KLU Matrix is SINGULAR\n") ;
}
return 0 ; return 0 ;
} }
} else { } else {
@ -661,6 +663,10 @@ SMPreorderKLUforCIDER (SMPmatrix *Matrix)
if (Matrix->SMPkluMatrix->KLUmatrixNumeric == NULL) if (Matrix->SMPkluMatrix->KLUmatrixNumeric == NULL)
{ {
fprintf (stderr, "Error (Factor) (CIDER): KLUnumeric object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (Factor) (CIDER): KLUnumeric object is NULL. A problem occurred\n") ;
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (Factor): KLU Matrix is SINGULAR\n") ;
return 0 ;
}
if (Matrix->CKTkluCommon == NULL) { if (Matrix->CKTkluCommon == NULL) {
fprintf (stderr, "Error (Factor) (CIDER): KLUcommon object is NULL. A problem occurred\n") ; fprintf (stderr, "Error (Factor) (CIDER): KLUcommon object is NULL. A problem occurred\n") ;
} }
@ -672,9 +678,6 @@ SMPreorderKLUforCIDER (SMPmatrix *Matrix)
} }
return 1 ; return 1 ;
} else { } else {
if (Matrix->CKTkluCommon->status == KLU_SINGULAR) {
fprintf (stderr, "Warning (Factor) (CIDER): KLU Matrix is SINGULAR\n") ;
}
return 0 ; return 0 ;
} }
} else { } else {

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

@ -48,7 +48,6 @@ NIinit(CKTcircuit *ckt)
ckt->CKTmatrix->CKTkluMODE = ckt->CKTkluMODE ; /* TO BE SUBSTITUTED WITH THE HEURISTICS */ ckt->CKTmatrix->CKTkluMODE = ckt->CKTkluMODE ; /* TO BE SUBSTITUTED WITH THE HEURISTICS */
klu_defaults (ckt->CKTmatrix->CKTkluCommon) ; klu_defaults (ckt->CKTmatrix->CKTkluCommon) ;
ckt->CKTmatrix->CKTkluCommon->halt_if_singular = 0 ;
#endif #endif
ckt->CKTniState = NIUNINITIALIZED; ckt->CKTniState = NIUNINITIALIZED;

1
src/maths/ni/niiter.c
View File

@ -146,6 +146,7 @@ NIiter(CKTcircuit *ckt, int maxIter)
#ifdef KLU #ifdef KLU
if (error == E_SINGULAR) { if (error == E_SINGULAR) {
fprintf (stderr, "Warning: KLU ReFactor failed. Factoring again...\n") ;
ckt->CKTniState |= NISHOULDREORDER; ckt->CKTniState |= NISHOULDREORDER;
error = SMPreorder(ckt->CKTmatrix, ckt->CKTpivotAbsTol, ckt->CKTpivotRelTol, ckt->CKTdiagGmin); error = SMPreorder(ckt->CKTmatrix, ckt->CKTpivotAbsTol, ckt->CKTpivotRelTol, ckt->CKTdiagGmin);
ckt->CKTstat->STATreorderTime += SPfrontEnd->IFseconds() - startTime; ckt->CKTstat->STATreorderTime += SPfrontEnd->IFseconds() - startTime;