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

Set up the matrix according to branch KLU-6+11-rebase-master-28_10_2020 

All cpl example files from ngspice\examples\TransmissionLines are o.k.
This commit is contained in:
Holger Vogt 2022-02-04 11:59:32 +01:00
parent 02e7c1c5b0
commit d6aeb6cd94
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,39 +234,21 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
MATRIX_ALLOC(double, here->CPLibr2Ibr1Ptr, noL, noL);
#ifdef KLU
// <<<<<<< HEAD
// VECTOR_ALLOC(here->CPLibr1Ibr1Binding, BindElement, noL);
// VECTOR_ALLOC(here->CPLibr2Ibr2Binding, BindElement, noL);
// VECTOR_ALLOC(here->CPLposIbr1Binding, BindElement, noL);
// VECTOR_ALLOC(here->CPLnegIbr2Binding, BindElement, noL);
// VECTOR_ALLOC(here->CPLposPosBinding, BindElement, noL);
// VECTOR_ALLOC(here->CPLnegNegBinding, 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->CPLibr1NegBinding, BindElement, noL, noL);
// MATRIX_ALLOC(here->CPLibr2PosBinding, 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
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);
#endif
branchname = TMALLOC(char*, here->dimension);