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

white spaces

This commit is contained in:
dwarning 2020-07-31 21:06:13 +02:00
parent 8a0504bb13
commit 36862a7bc6
1 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/spicelib/devices/hicum2/hicum2setup.c
View File

@ -560,12 +560,12 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if(error) return(error); if(error) return(error);
here->HICUMcollCINode = tmp->number; here->HICUMcollCINode = tmp->number;
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
}
} }
}
} }
} }
if(model->HICUMrbx == 0) { if(model->HICUMrbx == 0) {
@ -575,12 +575,12 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if(error) return(error); if(error) return(error);
here->HICUMbaseBPNode = tmp->number; here->HICUMbaseBPNode = tmp->number;
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,2,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,2,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
} }
if(model->HICUMre == 0) { if(model->HICUMre == 0) {
@ -590,12 +590,12 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if(error) return(error); if(error) return(error);
here->HICUMemitEINode = tmp->number; here->HICUMemitEINode = tmp->number;
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
} }
if(model->HICUMrsu == 0) { if(model->HICUMrsu == 0) {
@ -605,12 +605,12 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if(error) return(error); if(error) return(error);
here->HICUMsubsSINode = tmp->number; here->HICUMsubsSINode = tmp->number;
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,4,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,4,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
} }
if(model->HICUMrbi0 == 0) { if(model->HICUMrbi0 == 0) {
@ -620,21 +620,21 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if(error) return(error); if(error) return(error);
here->HICUMbaseBINode = tmp->number; here->HICUMbaseBINode = tmp->number;
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,5,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,5,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
} }
if (selfheat) { if (selfheat) {
if (here->HICUMtempNode == 0) { // no external node for temperature if (here->HICUMtempNode == 0) { // no external node for temperature
error = CKTmkVolt(ckt,&tmp,here->HICUMname,"dT"); // create internal node error = CKTmkVolt(ckt,&tmp,here->HICUMname,"dT"); // create internal node
if (error) return(error); if (error) return(error);
here->HICUMtempNode = tmp->number; here->HICUMtempNode = tmp->number;
} }
} else { } else {
if (here->HICUMtempNode > 0) { // external temp node is given, but no she parameter if (here->HICUMtempNode > 0) { // external temp node is given, but no she parameter
here->HICUMtempNode = 0; here->HICUMtempNode = 0;
@ -663,7 +663,6 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
here->HICUMxf2Node = 0; here->HICUMxf2Node = 0;
} }
/* macro to make elements with built in test for out of memory */ /* macro to make elements with built in test for out of memory */
#define TSTALLOC(ptr,first,second) \ #define TSTALLOC(ptr,first,second) \
do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
@ -751,7 +750,6 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
TSTALLOC(HICUMxfCollCIPtr ,HICUMxfNode,HICUMcollCINode); TSTALLOC(HICUMxfCollCIPtr ,HICUMxfNode,HICUMcollCINode);
TSTALLOC(HICUMxfBaseBIPtr ,HICUMxfNode,HICUMbaseBINode); TSTALLOC(HICUMxfBaseBIPtr ,HICUMxfNode,HICUMbaseBINode);
} }
TSTALLOC(HICUMbaseBPSubsSIPtr ,HICUMbaseBPNode,HICUMsubsSINode); TSTALLOC(HICUMbaseBPSubsSIPtr ,HICUMbaseBPNode,HICUMsubsSINode);
@ -842,20 +840,20 @@ HICUMunsetup(
} }
} }
if (nqs) { if (nqs) {
if(here->HICUMxfNode > 0) if(here->HICUMxfNode > 0)
CKTdltNNum(ckt, here->HICUMxfNode); CKTdltNNum(ckt, here->HICUMxfNode);
here->HICUMxfNode = 0; here->HICUMxfNode = 0;
if(here->HICUMxf1Node > 0) if(here->HICUMxf1Node > 0)
CKTdltNNum(ckt, here->HICUMxf1Node); CKTdltNNum(ckt, here->HICUMxf1Node);
here->HICUMxf1Node = 0; here->HICUMxf1Node = 0;
if(here->HICUMxf2Node > 0) if(here->HICUMxf2Node > 0)
CKTdltNNum(ckt, here->HICUMxf2Node); CKTdltNNum(ckt, here->HICUMxf2Node);
here->HICUMxf2Node = 0; here->HICUMxf2Node = 0;
} }
} }
} }