extend commit "unify ind/mut (append Ptr)"

from the master branch to the cuda branch
This commit is contained in:
rlar 2017-06-05 18:57:15 +02:00
parent 4e1ee0bbb1
commit f6887b0663
2 changed files with 7 additions and 7 deletions

View File

@ -57,31 +57,31 @@ INDtopology (GENmodel *inModel, CKTcircuit *ckt, int *i, int *j)
{
if ((here->INDposNode != 0) && (here->INDbrEq != 0))
{
TopologyMatrixInsert (INDposIbrptr, k, 0, 1, *i) ;
TopologyMatrixInsert (INDposIbrPtr, k, 0, 1, *i) ;
(*i)++ ;
}
if ((here->INDnegNode != 0) && (here->INDbrEq != 0))
{
TopologyMatrixInsert (INDnegIbrptr, k, 0, -1, *i) ;
TopologyMatrixInsert (INDnegIbrPtr, k, 0, -1, *i) ;
(*i)++ ;
}
if ((here->INDbrEq != 0) && (here->INDnegNode != 0))
{
TopologyMatrixInsert (INDibrNegptr, k, 0, -1, *i) ;
TopologyMatrixInsert (INDibrNegPtr, k, 0, -1, *i) ;
(*i)++ ;
}
if ((here->INDbrEq != 0) && (here->INDposNode != 0))
{
TopologyMatrixInsert (INDibrPosptr, k, 0, 1, *i) ;
TopologyMatrixInsert (INDibrPosPtr, k, 0, 1, *i) ;
(*i)++ ;
}
if ((here->INDbrEq != 0) && (here->INDbrEq != 0))
{
TopologyMatrixInsert (INDibrIbrptr, k, 1, -1, *i) ;
TopologyMatrixInsert (INDibrIbrPtr, k, 1, -1, *i) ;
(*i)++ ;
}

View File

@ -54,13 +54,13 @@ MUTtopology (GENmodel *inModel, CKTcircuit *ckt, int *i, int *j)
{
if ((here->MUTind1->INDbrEq != 0) && (here->MUTind2->INDbrEq != 0))
{
TopologyMatrixInsert (MUTbr1br2, k, 0, -1, *i) ;
TopologyMatrixInsert (MUTbr1br2Ptr, k, 0, -1, *i) ;
(*i)++ ;
}
if ((here->MUTind2->INDbrEq != 0) && (here->MUTind1->INDbrEq != 0))
{
TopologyMatrixInsert (MUTbr2br1, k, 0, -1, *i) ;
TopologyMatrixInsert (MUTbr2br1Ptr, k, 0, -1, *i) ;
(*i)++ ;
}