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

Fixed 2 files due to rebasing KLU branch on the master branch - 8/7/2020

This commit is contained in:
Francesco Lannutti 2020-08-07 16:36:04 +02:00 committed by Holger Vogt
parent dbd5d18b99
commit 88074a23c9
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ciderlib/twod/twosolve.c
View File

@ -546,7 +546,7 @@ int TWOequilSolve(TWOdevice *pDevice)
if (pDevice->matrix->SMPkluMatrix->KLUmatrixSymbolic == NULL) { if (pDevice->matrix->SMPkluMatrix->KLUmatrixSymbolic == NULL) {
printf ("CIDER: KLU Failed\n") ; printf ("CIDER: KLU Failed\n") ;
if (pDevice->matrix->SMPkluMatrix->KLUmatrixCommon->status == KLU_EMPTY_MATRIX) { if (pDevice->matrix->SMPkluMatrix->KLUmatrixCommon->status == KLU_EMPTY_MATRIX) {
return ; // Francesco Lannutti - Fix KLU return values return E_NOMEM ; // Francesco Lannutti - Fix KLU return values
} }
} }
printf ("CIDER: KLU to be fixed: spElementCount\n") ; printf ("CIDER: KLU to be fixed: spElementCount\n") ;

48
src/spicelib/devices/cpl/cplsetup.c
View File

@ -234,21 +234,39 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
MATRIX_ALLOC(double, here->CPLibr2Ibr1Ptr, noL, noL); MATRIX_ALLOC(double, here->CPLibr2Ibr1Ptr, noL, noL);
#ifdef KLU #ifdef KLU
VECTOR_ALLOC(here->CPLibr1Ibr1Binding, BindElement, noL); // <<<<<<< HEAD
VECTOR_ALLOC(here->CPLibr2Ibr2Binding, BindElement, noL); // VECTOR_ALLOC(here->CPLibr1Ibr1Binding, BindElement, noL);
VECTOR_ALLOC(here->CPLposIbr1Binding, BindElement, noL); // VECTOR_ALLOC(here->CPLibr2Ibr2Binding, BindElement, noL);
VECTOR_ALLOC(here->CPLnegIbr2Binding, BindElement, noL); // VECTOR_ALLOC(here->CPLposIbr1Binding, BindElement, noL);
VECTOR_ALLOC(here->CPLposPosBinding, BindElement, noL); // VECTOR_ALLOC(here->CPLnegIbr2Binding, BindElement, noL);
VECTOR_ALLOC(here->CPLnegNegBinding, BindElement, noL); // VECTOR_ALLOC(here->CPLposPosBinding, BindElement, noL);
VECTOR_ALLOC(here->CPLnegPosBinding, BindElement, noL); // VECTOR_ALLOC(here->CPLnegNegBinding, BindElement, noL);
VECTOR_ALLOC(here->CPLposNegBinding, BindElement, noL); // VECTOR_ALLOC(here->CPLnegPosBinding, BindElement, noL);
// VECTOR_ALLOC(here->CPLposNegBinding, BindElement, noL);
MATRIX_ALLOC(here->CPLibr1PosBinding, BindElement, noL, noL); //
MATRIX_ALLOC(here->CPLibr2NegBinding, BindElement, noL, noL); // MATRIX_ALLOC(here->CPLibr1PosBinding, BindElement, noL, noL);
MATRIX_ALLOC(here->CPLibr1NegBinding, BindElement, noL, noL); // MATRIX_ALLOC(here->CPLibr2NegBinding, BindElement, noL, noL);
MATRIX_ALLOC(here->CPLibr2PosBinding, BindElement, noL, noL); // MATRIX_ALLOC(here->CPLibr1NegBinding, BindElement, noL, noL);
MATRIX_ALLOC(here->CPLibr1Ibr2Binding, BindElement, noL, noL); // MATRIX_ALLOC(here->CPLibr2PosBinding, BindElement, noL, noL);
MATRIX_ALLOC(here->CPLibr2Ibr1Binding, BindElement, noL, noL); // MATRIX_ALLOC(here->CPLibr1Ibr2Binding, BindElement, noL, noL);
// MATRIX_ALLOC(here->CPLibr2Ibr1Binding, BindElement, noL, noL);
// =======
// VECTOR_ALLOC(BindElement, here->CPLibr1Ibr1Binding, noL);
// VECTOR_ALLOC(BindElement, here->CPLibr2Ibr2Binding, noL);
// VECTOR_ALLOC(BindElement, here->CPLposIbr1Binding, noL);
// VECTOR_ALLOC(BindElement, here->CPLnegIbr2Binding, noL);
// VECTOR_ALLOC(BindElement, here->CPLposPosBinding, noL);
// VECTOR_ALLOC(BindElement, here->CPLnegNegBinding, noL);
// VECTOR_ALLOC(BindElement, here->CPLnegPosBinding, noL);
// VECTOR_ALLOC(BindElement, here->CPLposNegBinding, noL);
//
// MATRIX_ALLOC(BindElement, here->CPLibr1PosBinding, noL, noL);
// MATRIX_ALLOC(BindElement, here->CPLibr2NegBinding, noL, noL);
// MATRIX_ALLOC(BindElement, here->CPLibr1NegBinding, noL, noL);
// MATRIX_ALLOC(BindElement, here->CPLibr2PosBinding, noL, noL);
// MATRIX_ALLOC(BindElement, here->CPLibr1Ibr2Binding, noL, noL);
// MATRIX_ALLOC(BindElement, here->CPLibr2Ibr1Binding, noL, noL);
// >>>>>>> Fixed 2 files due to rebasing KLU branch on the master branch - 8/7/2020
#endif #endif
branchname = TMALLOC(char*, here->dimension); branchname = TMALLOC(char*, here->dimension);