From 5f34eb27290e67ec5be8bb569609f3d93b362115 Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Mon, 22 Oct 2012 23:06:25 +0200 Subject: [PATCH] white space changes --- src/spicelib/analysis/dcpss.c | 2 +- src/spicelib/devices/bsim1/b1set.c | 6 +++--- src/spicelib/devices/bsim2/b2set.c | 6 +++--- src/spicelib/devices/bsim3/b3cvtest.c | 2 +- src/spicelib/devices/bsim3/b3getic.c | 4 +--- src/spicelib/devices/bsim3/b3ld.c | 2 +- src/spicelib/devices/bsim3/b3pzld.c | 2 +- src/spicelib/devices/bsim3/b3set.c | 7 ++++--- src/spicelib/devices/bsim3/b3temp.c | 2 +- src/spicelib/devices/bsim3/b3trunc.c | 3 --- src/spicelib/devices/bsim3soi/b4soiacld.c | 2 +- src/spicelib/devices/bsim3soi/b4soicvtest.c | 2 +- src/spicelib/devices/bsim3soi/b4soidest.c | 2 +- src/spicelib/devices/bsim3soi/b4soigetic.c | 2 +- src/spicelib/devices/bsim3soi/b4soild.c | 1 + src/spicelib/devices/bsim3soi/b4soimdel.c | 5 +---- src/spicelib/devices/bsim3soi/b4soinoi.c | 2 +- src/spicelib/devices/bsim3soi/b4soitrunc.c | 1 + src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c | 2 +- src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c | 2 +- src/spicelib/devices/bsim3soi_dd/b3soiddld.c | 2 +- src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c | 2 +- src/spicelib/devices/bsim3soi_dd/b3soiddset.c | 8 ++++---- src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdacld.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdld.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdset.c | 8 ++++---- src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c | 3 --- src/spicelib/devices/bsim3soi_pd/b3soipdacld.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdld.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdset.c | 8 ++++---- src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c | 3 --- src/spicelib/devices/bsim3v0/b3v0acld.c | 2 +- src/spicelib/devices/bsim3v0/b3v0cvtest.c | 2 +- src/spicelib/devices/bsim3v0/b3v0getic.c | 2 +- src/spicelib/devices/bsim3v0/b3v0ld.c | 2 +- src/spicelib/devices/bsim3v0/b3v0noi.c | 2 +- src/spicelib/devices/bsim3v0/b3v0set.c | 11 +++++------ src/spicelib/devices/bsim3v0/b3v0temp.c | 2 +- src/spicelib/devices/bsim3v0/b3v0trunc.c | 3 --- src/spicelib/devices/bsim3v1/b3v1cvtest.c | 2 +- src/spicelib/devices/bsim3v1/b3v1getic.c | 4 +--- src/spicelib/devices/bsim3v1/b3v1ld.c | 2 +- src/spicelib/devices/bsim3v1/b3v1noi.c | 2 +- src/spicelib/devices/bsim3v1/b3v1set.c | 6 +++--- src/spicelib/devices/bsim3v1/b3v1temp.c | 2 +- src/spicelib/devices/bsim3v1/b3v1trunc.c | 3 --- src/spicelib/devices/bsim3v1/bsim3v1def.h | 2 +- src/spicelib/devices/bsim3v32/b3v32getic.c | 2 +- src/spicelib/devices/bsim3v32/b3v32set.c | 6 +++--- src/spicelib/devices/bsim4/b4set.c | 7 ++++--- src/spicelib/devices/bsim4v4/b4v4cvtest.c | 2 +- src/spicelib/devices/bsim4v4/b4v4set.c | 4 +++- src/spicelib/devices/bsim4v5/b4v5cvtest.c | 4 ++-- src/spicelib/devices/bsim4v5/b4v5set.c | 7 ++++--- src/spicelib/devices/bsim4v5/b4v5trunc.c | 1 + src/spicelib/devices/bsim4v6/b4v6set.c | 7 ++++--- src/spicelib/devices/bsim4v6/b4v6trunc.c | 1 + src/spicelib/devices/cap/capgetic.c | 1 - src/spicelib/devices/cap/capsset.c | 1 - src/spicelib/devices/cccs/cccsload.c | 2 +- src/spicelib/devices/cccs/cccspzld.c | 2 +- src/spicelib/devices/cccs/cccssacl.c | 3 +-- src/spicelib/devices/cccs/cccssset.c | 1 - src/spicelib/devices/ccvs/ccvssacl.c | 2 -- src/spicelib/devices/ccvs/ccvssld.c | 1 - src/spicelib/devices/ccvs/ccvssprt.c | 1 - src/spicelib/devices/ccvs/ccvssset.c | 1 - src/spicelib/devices/dio/diosset.c | 1 - src/spicelib/devices/hfet2/hfet2defs.h | 1 - src/spicelib/devices/ind/indsetup.c | 2 +- src/spicelib/devices/mos1/mos1set.c | 13 +++++++------ src/spicelib/devices/mos2/mos2acld.c | 2 +- src/spicelib/devices/mos2/mos2conv.c | 2 +- src/spicelib/devices/mos2/mos2ic.c | 2 +- src/spicelib/devices/mos2/mos2noi.c | 2 +- src/spicelib/devices/mos2/mos2pzld.c | 2 +- src/spicelib/devices/mos2/mos2set.c | 13 +++++++------ src/spicelib/devices/mos2/mos2trun.c | 2 +- src/spicelib/devices/mos3/mos3set.c | 6 +++--- src/spicelib/devices/mos9/mos9set.c | 7 ++++--- src/spicelib/devices/ndev/ndevaccept.c | 4 ++-- src/spicelib/devices/ndev/ndevload.c | 6 ++---- src/spicelib/devices/numd2/nud2set.c | 1 + src/spicelib/devices/res/resload.c | 2 +- src/spicelib/devices/res/resnoise.c | 2 +- src/spicelib/devices/res/respzld.c | 2 +- src/spicelib/devices/res/ressetup.c | 8 +++++--- src/spicelib/devices/res/ressload.c | 1 - src/spicelib/devices/res/restemp.c | 2 +- src/spicelib/devices/soi3/soi3set.c | 6 +++--- src/spicelib/devices/vccs/vccssld.c | 2 -- src/spicelib/devices/vccs/vccssset.c | 1 - src/spicelib/devices/vcvs/vcvssld.c | 1 - src/spicelib/devices/vcvs/vcvssset.c | 1 - 104 files changed, 146 insertions(+), 172 deletions(-) diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c index a0a7ead68..3a2135d1c 100644 --- a/src/spicelib/analysis/dcpss.c +++ b/src/spicelib/analysis/dcpss.c @@ -100,9 +100,9 @@ DCpss(CKTcircuit *ckt, int restart) IFuid *nameList; int numNames; double maxstepsize=0.0; - int ltra_num; CKTnode *node; + #ifdef XSPICE /* gtri - add - wbk - 12/19/90 - Add IPC stuff */ Ipc_Boolean_t ipc_firsttime = IPC_TRUE; diff --git a/src/spicelib/devices/bsim1/b1set.c b/src/spicelib/devices/bsim1/b1set.c index fc002808b..ab29964ee 100644 --- a/src/spicelib/devices/bsim1/b1set.c +++ b/src/spicelib/devices/bsim1/b1set.c @@ -276,9 +276,9 @@ B1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, CKTnode *tmpNode; IFuid tmpName; - /* allocate a chunk of the state vector */ - here->B1states = *states; - *states += B1numStates; + /* allocate a chunk of the state vector */ + here->B1states = *states; + *states += B1numStates; /* perform the parameter defaulting */ if(!here->B1drainAreaGiven) { diff --git a/src/spicelib/devices/bsim2/b2set.c b/src/spicelib/devices/bsim2/b2set.c index ed97eb149..9721885d7 100644 --- a/src/spicelib/devices/bsim2/b2set.c +++ b/src/spicelib/devices/bsim2/b2set.c @@ -434,9 +434,9 @@ B2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) for (here = model->B2instances; here != NULL ; here=here->B2nextInstance) { - /* allocate a chunk of the state vector */ - here->B2states = *states; - *states += B2numStates; + /* allocate a chunk of the state vector */ + here->B2states = *states; + *states += B2numStates; /* perform the parameter defaulting */ diff --git a/src/spicelib/devices/bsim3/b3cvtest.c b/src/spicelib/devices/bsim3/b3cvtest.c index 5f949014f..ee22a8a21 100644 --- a/src/spicelib/devices/bsim3/b3cvtest.c +++ b/src/spicelib/devices/bsim3/b3cvtest.c @@ -33,7 +33,7 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; { /* loop through all the instances of the model */ for (here = model->BSIM3instances; here != NULL ; here=here->BSIM3nextInstance) - { + { vbs = model->BSIM3type * (*(ckt->CKTrhsOld+here->BSIM3bNode) - *(ckt->CKTrhsOld+here->BSIM3sNodePrime)); diff --git a/src/spicelib/devices/bsim3/b3getic.c b/src/spicelib/devices/bsim3/b3getic.c index 289dfe179..6bec0e56b 100644 --- a/src/spicelib/devices/bsim3/b3getic.c +++ b/src/spicelib/devices/bsim3/b3getic.c @@ -25,7 +25,7 @@ BSIM3instance *here; for (; model ; model = model->BSIM3nextModel) { for (here = model->BSIM3instances; here; here = here->BSIM3nextInstance) - { + { if (!here->BSIM3icVBSGiven) { here->BSIM3icVBS = *(ckt->CKTrhs + here->BSIM3bNode) - *(ckt->CKTrhs + here->BSIM3sNode); @@ -42,5 +42,3 @@ BSIM3instance *here; } return(OK); } - - diff --git a/src/spicelib/devices/bsim3/b3ld.c b/src/spicelib/devices/bsim3/b3ld.c index 0c2b6885f..93f738c36 100644 --- a/src/spicelib/devices/bsim3/b3ld.c +++ b/src/spicelib/devices/bsim3/b3ld.c @@ -185,7 +185,7 @@ ChargeComputationNeeded = for (; model != NULL; model = model->BSIM3nextModel) { for (here = model->BSIM3instances; here != NULL; here = here->BSIM3nextInstance) - { + { #endif Check = 1; ByPass = 0; diff --git a/src/spicelib/devices/bsim3/b3pzld.c b/src/spicelib/devices/bsim3/b3pzld.c index b6dc4f1b5..b5fcb35a0 100644 --- a/src/spicelib/devices/bsim3/b3pzld.c +++ b/src/spicelib/devices/bsim3/b3pzld.c @@ -40,7 +40,7 @@ double m; for (; model != NULL; model = model->BSIM3nextModel) { for (here = model->BSIM3instances; here!= NULL; here = here->BSIM3nextInstance) - { + { if (here->BSIM3mode >= 0) { Gm = here->BSIM3gm; Gmbs = here->BSIM3gmbs; diff --git a/src/spicelib/devices/bsim3/b3set.c b/src/spicelib/devices/bsim3/b3set.c index abcfbb651..857e85395 100644 --- a/src/spicelib/devices/bsim3/b3set.c +++ b/src/spicelib/devices/bsim3/b3set.c @@ -864,9 +864,10 @@ BSIM3instance **InstArray; for (here = model->BSIM3instances; here != NULL ; here=here->BSIM3nextInstance) { - /* allocate a chunk of the state vector */ - here->BSIM3states = *states; - *states += BSIM3numStates; + /* allocate a chunk of the state vector */ + here->BSIM3states = *states; + *states += BSIM3numStates; + /* perform the parameter defaulting */ if (!here->BSIM3drainAreaGiven) here->BSIM3drainArea = 0.0; diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c index 3b5de849d..9ac4d396b 100644 --- a/src/spicelib/devices/bsim3/b3temp.c +++ b/src/spicelib/devices/bsim3/b3temp.c @@ -144,7 +144,7 @@ int Size_Not_Found; /* MCJ: Length and Width not initialized */ for (here = model->BSIM3instances; here != NULL; here = here->BSIM3nextInstance) - { + { pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim3/b3trunc.c b/src/spicelib/devices/bsim3/b3trunc.c index 050041bde..75e6ede60 100644 --- a/src/spicelib/devices/bsim3/b3trunc.c +++ b/src/spicelib/devices/bsim3/b3trunc.c @@ -48,6 +48,3 @@ BSIM3instance *here; } return(OK); } - - - diff --git a/src/spicelib/devices/bsim3soi/b4soiacld.c b/src/spicelib/devices/bsim3soi/b4soiacld.c index a3abe7678..aeb90c570 100644 --- a/src/spicelib/devices/bsim3soi/b4soiacld.c +++ b/src/spicelib/devices/bsim3soi/b4soiacld.c @@ -80,7 +80,7 @@ double m; for (here = model->B4SOIinstances; here!= NULL; here = here->B4SOInextInstance) - { + { selfheat = (model->B4SOIshMod == 1) && (here->B4SOIrth0 != 0.0); if (here->B4SOImode >= 0) { Gm = here->B4SOIgm; diff --git a/src/spicelib/devices/bsim3soi/b4soicvtest.c b/src/spicelib/devices/bsim3soi/b4soicvtest.c index 90093c7cc..3b12bd9b1 100644 --- a/src/spicelib/devices/bsim3soi/b4soicvtest.c +++ b/src/spicelib/devices/bsim3soi/b4soicvtest.c @@ -40,7 +40,7 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; { /* loop through all the instances of the model */ for (here = model->B4SOIinstances; here != NULL ; here=here->B4SOInextInstance) - { + { vbs = model->B4SOItype * (*(ckt->CKTrhsOld+here->B4SOIbNode) - *(ckt->CKTrhsOld+here->B4SOIsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi/b4soidest.c b/src/spicelib/devices/bsim3soi/b4soidest.c index 1f2161318..be47f9ede 100644 --- a/src/spicelib/devices/bsim3soi/b4soidest.c +++ b/src/spicelib/devices/bsim3soi/b4soidest.c @@ -34,7 +34,7 @@ B4SOImodel *oldmod = NULL; oldmod = mod; prev = (B4SOIinstance *)NULL; for (here = mod->B4SOIinstances; here; here = here->B4SOInextInstance) - { + { if(prev) FREE(prev); prev = here; } diff --git a/src/spicelib/devices/bsim3soi/b4soigetic.c b/src/spicelib/devices/bsim3soi/b4soigetic.c index 8ffc5f285..2de1f3163 100644 --- a/src/spicelib/devices/bsim3soi/b4soigetic.c +++ b/src/spicelib/devices/bsim3soi/b4soigetic.c @@ -32,7 +32,7 @@ B4SOIinstance *here; for (; model ; model = model->B4SOInextModel) { for (here = model->B4SOIinstances; here; here = here->B4SOInextInstance) - { + { if(!here->B4SOIicVBSGiven) { here->B4SOIicVBS = *(ckt->CKTrhs + here->B4SOIbNode) - *(ckt->CKTrhs + here->B4SOIsNode); diff --git a/src/spicelib/devices/bsim3soi/b4soild.c b/src/spicelib/devices/bsim3soi/b4soild.c index 710dd3290..d3a45b15b 100644 --- a/src/spicelib/devices/bsim3soi/b4soild.c +++ b/src/spicelib/devices/bsim3soi/b4soild.c @@ -496,6 +496,7 @@ int B4SOILoadOMP(B4SOIinstance *here, CKTcircuit *ckt) { { for (here = model->B4SOIinstances; here != NULL; here = here->B4SOInextInstance) { + #endif Check = 0; ByPass = 0; diff --git a/src/spicelib/devices/bsim3soi/b4soimdel.c b/src/spicelib/devices/bsim3soi/b4soimdel.c index 4507fe039..bb78be090 100644 --- a/src/spicelib/devices/bsim3soi/b4soimdel.c +++ b/src/spicelib/devices/bsim3soi/b4soimdel.c @@ -44,7 +44,7 @@ B4SOImodel **oldmod; delgot: *oldmod = (*model)->B4SOInextModel; /* cut deleted device out of list */ for (here = (*model)->B4SOIinstances; here; here = here->B4SOInextInstance) - { + { if(prev) FREE(prev); prev = here; } @@ -52,6 +52,3 @@ delgot: FREE(*model); return(OK); } - - - diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c index 089b01e0d..e4a65fdfd 100644 --- a/src/spicelib/devices/bsim3soi/b4soinoi.c +++ b/src/spicelib/devices/bsim3soi/b4soinoi.c @@ -151,7 +151,7 @@ double m; for (; model != NULL; model = model->B4SOInextModel) { for (here = model->B4SOIinstances; here != NULL; here = here->B4SOInextInstance) - { + { m = here->B4SOIm; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim3soi/b4soitrunc.c b/src/spicelib/devices/bsim3soi/b4soitrunc.c index 3d6b6c584..57068002f 100644 --- a/src/spicelib/devices/bsim3soi/b4soitrunc.c +++ b/src/spicelib/devices/bsim3soi/b4soitrunc.c @@ -38,6 +38,7 @@ register B4SOIinstance *here; { for (here = model->B4SOIinstances; here != NULL; here = here->B4SOInextInstance) { + #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c b/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c index 1f71a8bfe..4f2ca4446 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c @@ -33,7 +33,7 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; { /* loop through all the instances of the model */ for (here = model->B3SOIDDinstances; here != NULL ; here=here->B3SOIDDnextInstance) - { + { vbs = model->B3SOIDDtype * (*(ckt->CKTrhsOld+here->B3SOIDDbNode) - *(ckt->CKTrhsOld+here->B3SOIDDsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c b/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c index 221c6d6e1..c46293f24 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c @@ -25,7 +25,7 @@ B3SOIDDinstance *here; for (; model ; model = model->B3SOIDDnextModel) { for (here = model->B3SOIDDinstances; here; here = here->B3SOIDDnextInstance) - { + { if(!here->B3SOIDDicVBSGiven) { here->B3SOIDDicVBS = *(ckt->CKTrhs + here->B3SOIDDbNode) - *(ckt->CKTrhs + here->B3SOIDDsNode); diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c index 7ac0b4ce2..12a389b99 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c @@ -308,7 +308,7 @@ double m; for (; model != NULL; model = model->B3SOIDDnextModel) { for (here = model->B3SOIDDinstances; here != NULL; here = here->B3SOIDDnextInstance) - { + { Check = 0; ByPass = 0; selfheat = (model->B3SOIDDshMod == 1) && (here->B3SOIDDrth0 != 0.0); diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c index 8a3eb1f69..830fd31ee 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c @@ -131,7 +131,7 @@ int i; for (; model != NULL; model = model->B3SOIDDnextModel) { for (here = model->B3SOIDDinstances; here != NULL; here = here->B3SOIDDnextInstance) - { + { pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddset.c b/src/spicelib/devices/bsim3soi_dd/b3soiddset.c index 0ed729e88..a15f9b899 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddset.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddset.c @@ -876,10 +876,10 @@ IFuid tmpName; /* loop through all the instances of the model */ for (here = model->B3SOIDDinstances; here != NULL ; here=here->B3SOIDDnextInstance) - { - /* allocate a chunk of the state vector */ - here->B3SOIDDstates = *states; - *states += B3SOIDDnumStates; + { + /* allocate a chunk of the state vector */ + here->B3SOIDDstates = *states; + *states += B3SOIDDnumStates; /* perform the parameter defaulting */ if (!here->B3SOIDDdrainAreaGiven) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c index fe6f7c82d..a899129ca 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c @@ -74,7 +74,7 @@ int Size_Not_Found; /* MCJ: Length and Width not initialized */ for (here = model->B3SOIDDinstances; here != NULL; here = here->B3SOIDDnextInstance) - { + { here->B3SOIDDrbodyext = here->B3SOIDDbodySquares * model->B3SOIDDrbsh; pSizeDependParamKnot = model->pSizeDependParamKnot; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c index 14cc38e2d..acb9bcc79 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c @@ -54,7 +54,7 @@ double m; for (here = model->B3SOIFDinstances; here!= NULL; here = here->B3SOIFDnextInstance) - { + { selfheat = (model->B3SOIFDshMod == 1) && (here->B3SOIFDrth0 != 0.0); if (here->B3SOIFDdebugMod > 2) { diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c b/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c index 45139e02e..00e95f3a7 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c @@ -33,7 +33,7 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; { /* loop through all the instances of the model */ for (here = model->B3SOIFDinstances; here != NULL ; here=here->B3SOIFDnextInstance) - { + { vbs = model->B3SOIFDtype * (*(ckt->CKTrhsOld+here->B3SOIFDbNode) - *(ckt->CKTrhsOld+here->B3SOIFDsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c b/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c index 4dbbb1aa5..85e65b2e1 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c @@ -25,7 +25,7 @@ B3SOIFDinstance *here; for (; model ; model = model->B3SOIFDnextModel) { for (here = model->B3SOIFDinstances; here; here = here->B3SOIFDnextInstance) - { + { if(!here->B3SOIFDicVBSGiven) { here->B3SOIFDicVBS = *(ckt->CKTrhs + here->B3SOIFDbNode) - *(ckt->CKTrhs + here->B3SOIFDsNode); diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c index 5fcc5a838..ce04f8080 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c @@ -278,7 +278,7 @@ double m; for (; model != NULL; model = model->B3SOIFDnextModel) { for (here = model->B3SOIFDinstances; here != NULL; here = here->B3SOIFDnextInstance) - { + { Check = 0; ByPass = 0; selfheat = (model->B3SOIFDshMod == 1) && (here->B3SOIFDrth0 != 0.0); diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c index 3013e7707..64f65e9b2 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c @@ -131,7 +131,7 @@ int i; for (; model != NULL; model = model->B3SOIFDnextModel) { for (here = model->B3SOIFDinstances; here != NULL; here = here->B3SOIFDnextInstance) - { + { pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdset.c b/src/spicelib/devices/bsim3soi_fd/b3soifdset.c index 8eb0aa82a..6e6c8ebdb 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdset.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdset.c @@ -877,10 +877,10 @@ IFuid tmpName; /* loop through all the instances of the model */ for (here = model->B3SOIFDinstances; here != NULL ; here=here->B3SOIFDnextInstance) - { - /* allocate a chunk of the state vector */ - here->B3SOIFDstates = *states; - *states += B3SOIFDnumStates; + { + /* allocate a chunk of the state vector */ + here->B3SOIFDstates = *states; + *states += B3SOIFDnumStates; /* perform the parameter defaulting */ if (!here->B3SOIFDdrainAreaGiven) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c index 9ab491c06..f0f5ceec1 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c @@ -73,7 +73,7 @@ int Size_Not_Found; /* MCJ: Length and Width not initialized */ for (here = model->B3SOIFDinstances; here != NULL; here = here->B3SOIFDnextInstance) - { + { here->B3SOIFDrbodyext = here->B3SOIFDbodySquares * model->B3SOIFDrbsh; pSizeDependParamKnot = model->pSizeDependParamKnot; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c b/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c index 549fe96dd..cd7a7f0f5 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c @@ -48,6 +48,3 @@ B3SOIFDinstance *here; } return(OK); } - - - diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c index c64361140..b1f17d4ab 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c @@ -54,7 +54,7 @@ double m; for (here = model->B3SOIPDinstances; here!= NULL; here = here->B3SOIPDnextInstance) - { + { selfheat = (model->B3SOIPDshMod == 1) && (here->B3SOIPDrth0 != 0.0); if (here->B3SOIPDmode >= 0) { Gm = here->B3SOIPDgm; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c b/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c index 8a941fff7..bb31f52fd 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c @@ -33,7 +33,7 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; { /* loop through all the instances of the model */ for (here = model->B3SOIPDinstances; here != NULL ; here=here->B3SOIPDnextInstance) - { + { vbs = model->B3SOIPDtype * (*(ckt->CKTrhsOld+here->B3SOIPDbNode) - *(ckt->CKTrhsOld+here->B3SOIPDsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c b/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c index 98fd6b79a..665c65ebb 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c @@ -25,7 +25,7 @@ B3SOIPDinstance *here; for (; model ; model = model->B3SOIPDnextModel) { for (here = model->B3SOIPDinstances; here; here = here->B3SOIPDnextInstance) - { + { if(!here->B3SOIPDicVBSGiven) { here->B3SOIPDicVBS = *(ckt->CKTrhs + here->B3SOIPDbNode) - *(ckt->CKTrhs + here->B3SOIPDsNode); diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c index 6480b9f00..996cfac93 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c @@ -294,7 +294,7 @@ double m; for (; model != NULL; model = model->B3SOIPDnextModel) { for (here = model->B3SOIPDinstances; here != NULL; here = here->B3SOIPDnextInstance) - { + { Check = 0; ByPass = 0; selfheat = (model->B3SOIPDshMod == 1) && (here->B3SOIPDrth0 != 0.0); diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c index 80d381a3c..d1cec2fc8 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c @@ -135,7 +135,7 @@ int i; for (; model != NULL; model = model->B3SOIPDnextModel) { for (here = model->B3SOIPDinstances; here != NULL; here = here->B3SOIPDnextInstance) - { + { pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c index 4fde5ef09..99e2e4ea1 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c @@ -36,7 +36,7 @@ double m; for (; model != NULL; model = model->B3SOIPDnextModel) { for (here = model->B3SOIPDinstances; here!= NULL; here = here->B3SOIPDnextInstance) - { + { if (here->B3SOIPDmode >= 0) { Gm = here->B3SOIPDgm; Gmbs = here->B3SOIPDgmbs; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c index 5a056b280..81f8272a5 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c @@ -1050,10 +1050,10 @@ IFuid tmpName; /* loop through all the instances of the model */ for (here = model->B3SOIPDinstances; here != NULL ; here=here->B3SOIPDnextInstance) - { - /* allocate a chunk of the state vector */ - here->B3SOIPDstates = *states; - *states += B3SOIPDnumStates; + { + /* allocate a chunk of the state vector */ + here->B3SOIPDstates = *states; + *states += B3SOIPDnumStates; /* perform the parameter defaulting */ if (!here->B3SOIPDdrainAreaGiven) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c index b9c2d7bbc..4d7ee4159 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c @@ -92,7 +92,7 @@ double tmp3, T7; /* MCJ: Length and Width not initialized */ for (here = model->B3SOIPDinstances; here != NULL; here = here->B3SOIPDnextInstance) - { + { here->B3SOIPDrbodyext = here->B3SOIPDbodySquares * model->B3SOIPDrbsh; pSizeDependParamKnot = model->pSizeDependParamKnot; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c b/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c index 72d42e523..84a3d46b9 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c @@ -47,6 +47,3 @@ B3SOIPDinstance *here; } return(OK); } - - - diff --git a/src/spicelib/devices/bsim3v0/b3v0acld.c b/src/spicelib/devices/bsim3v0/b3v0acld.c index 159d1728b..2c55b5c17 100644 --- a/src/spicelib/devices/bsim3v0/b3v0acld.c +++ b/src/spicelib/devices/bsim3v0/b3v0acld.c @@ -32,7 +32,7 @@ double m; for (here = model->BSIM3v0instances; here!= NULL; here = here->BSIM3v0nextInstance) - { + { if (here->BSIM3v0mode >= 0) { Gm = here->BSIM3v0gm; Gmbs = here->BSIM3v0gmbs; diff --git a/src/spicelib/devices/bsim3v0/b3v0cvtest.c b/src/spicelib/devices/bsim3v0/b3v0cvtest.c index f982c59b3..fe5997f5e 100644 --- a/src/spicelib/devices/bsim3v0/b3v0cvtest.c +++ b/src/spicelib/devices/bsim3v0/b3v0cvtest.c @@ -27,7 +27,7 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; { /* loop through all the instances of the model */ for (here = model->BSIM3v0instances; here != NULL ; here=here->BSIM3v0nextInstance) - { + { vbs = model->BSIM3v0type * (*(ckt->CKTrhsOld+here->BSIM3v0bNode) - *(ckt->CKTrhsOld+here->BSIM3v0sNodePrime)); diff --git a/src/spicelib/devices/bsim3v0/b3v0getic.c b/src/spicelib/devices/bsim3v0/b3v0getic.c index 219a5833d..b4840a9f2 100644 --- a/src/spicelib/devices/bsim3v0/b3v0getic.c +++ b/src/spicelib/devices/bsim3v0/b3v0getic.c @@ -19,7 +19,7 @@ BSIM3v0instance *here; for (; model ; model = model->BSIM3v0nextModel) { for (here = model->BSIM3v0instances; here; here = here->BSIM3v0nextInstance) - { + { if(!here->BSIM3v0icVBSGiven) { here->BSIM3v0icVBS = *(ckt->CKTrhs + here->BSIM3v0bNode) - *(ckt->CKTrhs + here->BSIM3v0sNode); diff --git a/src/spicelib/devices/bsim3v0/b3v0ld.c b/src/spicelib/devices/bsim3v0/b3v0ld.c index 4f6a5b2e1..be7cead62 100644 --- a/src/spicelib/devices/bsim3v0/b3v0ld.c +++ b/src/spicelib/devices/bsim3v0/b3v0ld.c @@ -122,7 +122,7 @@ double m = 1.0; for (; model != NULL; model = model->BSIM3v0nextModel) { for (here = model->BSIM3v0instances; here != NULL; here = here->BSIM3v0nextInstance) - { + { Check = 1; ByPass = 0; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c index 7c5953591..5bdcb4688 100644 --- a/src/spicelib/devices/bsim3v0/b3v0noi.c +++ b/src/spicelib/devices/bsim3v0/b3v0noi.c @@ -104,7 +104,7 @@ int i; for (; model != NULL; model = model->BSIM3v0nextModel) { for (here = model->BSIM3v0instances; here != NULL; here = here->BSIM3v0nextInstance) - { + { pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3v0/b3v0set.c b/src/spicelib/devices/bsim3v0/b3v0set.c index 467e40b6a..8016aa937 100644 --- a/src/spicelib/devices/bsim3v0/b3v0set.c +++ b/src/spicelib/devices/bsim3v0/b3v0set.c @@ -751,12 +751,11 @@ IFuid tmpName; /* loop through all the instances of the model */ for (here = model->BSIM3v0instances; here != NULL ; here=here->BSIM3v0nextInstance) - { - - /* allocate a chunk of the state vector */ - here->BSIM3v0states = *states; - *states += BSIM3v0numStates; - + { + /* allocate a chunk of the state vector */ + here->BSIM3v0states = *states; + *states += BSIM3v0numStates; + /* perform the parameter defaulting */ if (!here->BSIM3v0drainAreaGiven) here->BSIM3v0drainArea = 0.0; diff --git a/src/spicelib/devices/bsim3v0/b3v0temp.c b/src/spicelib/devices/bsim3v0/b3v0temp.c index 0fca2a7a2..7340d5d82 100644 --- a/src/spicelib/devices/bsim3v0/b3v0temp.c +++ b/src/spicelib/devices/bsim3v0/b3v0temp.c @@ -51,7 +51,7 @@ int Size_Not_Found; /* loop through all the instances of the model */ for (here = model->BSIM3v0instances; here != NULL; here=here->BSIM3v0nextInstance) - { + { pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim3v0/b3v0trunc.c b/src/spicelib/devices/bsim3v0/b3v0trunc.c index ff4de7834..b06ae0ad0 100644 --- a/src/spicelib/devices/bsim3v0/b3v0trunc.c +++ b/src/spicelib/devices/bsim3v0/b3v0trunc.c @@ -42,6 +42,3 @@ BSIM3v0instance *here; } return(OK); } - - - diff --git a/src/spicelib/devices/bsim3v1/b3v1cvtest.c b/src/spicelib/devices/bsim3v1/b3v1cvtest.c index 991aed5b1..201a7be39 100644 --- a/src/spicelib/devices/bsim3v1/b3v1cvtest.c +++ b/src/spicelib/devices/bsim3v1/b3v1cvtest.c @@ -33,7 +33,7 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; { /* loop through all the instances of the model */ for (here = model->BSIM3v1instances; here != NULL ; here=here->BSIM3v1nextInstance) - { + { vbs = model->BSIM3v1type * (*(ckt->CKTrhsOld+here->BSIM3v1bNode) - *(ckt->CKTrhsOld+here->BSIM3v1sNodePrime)); diff --git a/src/spicelib/devices/bsim3v1/b3v1getic.c b/src/spicelib/devices/bsim3v1/b3v1getic.c index 37b3e6399..76a413607 100644 --- a/src/spicelib/devices/bsim3v1/b3v1getic.c +++ b/src/spicelib/devices/bsim3v1/b3v1getic.c @@ -25,7 +25,7 @@ BSIM3v1instance *here; for (; model ; model = model->BSIM3v1nextModel) { for (here = model->BSIM3v1instances; here; here = here->BSIM3v1nextInstance) - { + { if(!here->BSIM3v1icVBSGiven) { here->BSIM3v1icVBS = *(ckt->CKTrhs + here->BSIM3v1bNode) - *(ckt->CKTrhs + here->BSIM3v1sNode); @@ -42,5 +42,3 @@ BSIM3v1instance *here; } return(OK); } - - diff --git a/src/spicelib/devices/bsim3v1/b3v1ld.c b/src/spicelib/devices/bsim3v1/b3v1ld.c index ac501e1eb..a83a784d0 100644 --- a/src/spicelib/devices/bsim3v1/b3v1ld.c +++ b/src/spicelib/devices/bsim3v1/b3v1ld.c @@ -128,7 +128,7 @@ int ByPass, Check, ChargeComputationNeeded = 0, error; for (; model != NULL; model = model->BSIM3v1nextModel) { for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) - { + { Check = 1; ByPass = 0; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c index 0d4361197..8cb4f5595 100644 --- a/src/spicelib/devices/bsim3v1/b3v1noi.c +++ b/src/spicelib/devices/bsim3v1/b3v1noi.c @@ -127,7 +127,7 @@ int i; for (; model != NULL; model = model->BSIM3v1nextModel) { for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) - { + { pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3v1/b3v1set.c b/src/spicelib/devices/bsim3v1/b3v1set.c index 6f1ea3fdc..e87a372a1 100644 --- a/src/spicelib/devices/bsim3v1/b3v1set.c +++ b/src/spicelib/devices/bsim3v1/b3v1set.c @@ -778,9 +778,9 @@ IFuid tmpName; for (here = model->BSIM3v1instances; here != NULL ; here=here->BSIM3v1nextInstance) { - /* allocate a chunk of the state vector */ - here->BSIM3v1states = *states; - *states += BSIM3v1numStates; + /* allocate a chunk of the state vector */ + here->BSIM3v1states = *states; + *states += BSIM3v1numStates; /* perform the parameter defaulting */ if(here->BSIM3v1m == 0.0) diff --git a/src/spicelib/devices/bsim3v1/b3v1temp.c b/src/spicelib/devices/bsim3v1/b3v1temp.c index 3a22b33ae..77f4d656f 100644 --- a/src/spicelib/devices/bsim3v1/b3v1temp.c +++ b/src/spicelib/devices/bsim3v1/b3v1temp.c @@ -91,7 +91,7 @@ int Size_Not_Found; /* MCJ: Length and Width not initialized */ for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) - { + { pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim3v1/b3v1trunc.c b/src/spicelib/devices/bsim3v1/b3v1trunc.c index afe094ca4..e18e67111 100644 --- a/src/spicelib/devices/bsim3v1/b3v1trunc.c +++ b/src/spicelib/devices/bsim3v1/b3v1trunc.c @@ -47,6 +47,3 @@ BSIM3v1instance *here; } return(OK); } - - - diff --git a/src/spicelib/devices/bsim3v1/bsim3v1def.h b/src/spicelib/devices/bsim3v1/bsim3v1def.h index 2a1101c3b..8b1e3d53b 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1def.h +++ b/src/spicelib/devices/bsim3v1/bsim3v1def.h @@ -18,7 +18,7 @@ typedef struct sBSIM3v1instance { struct sBSIM3v1model *BSIM3v1modPtr; struct sBSIM3v1instance *BSIM3v1nextInstance; - IFuid BSIM3v1name; + IFuid BSIM3v1name; int BSIM3v1states; /* index into state table for this device */ int BSIM3v1dNode; diff --git a/src/spicelib/devices/bsim3v32/b3v32getic.c b/src/spicelib/devices/bsim3v32/b3v32getic.c index 5c8a4368f..4f7798bd8 100644 --- a/src/spicelib/devices/bsim3v32/b3v32getic.c +++ b/src/spicelib/devices/bsim3v32/b3v32getic.c @@ -23,7 +23,7 @@ BSIM3v32instance *here; for (; model ; model = model->BSIM3v32nextModel) { for (here = model->BSIM3v32instances; here; here = here->BSIM3v32nextInstance) - { + { if (!here->BSIM3v32icVBSGiven) { here->BSIM3v32icVBS = *(ckt->CKTrhs + here->BSIM3v32bNode) - *(ckt->CKTrhs + here->BSIM3v32sNode); diff --git a/src/spicelib/devices/bsim3v32/b3v32set.c b/src/spicelib/devices/bsim3v32/b3v32set.c index e5d83f3c4..df50109ca 100644 --- a/src/spicelib/devices/bsim3v32/b3v32set.c +++ b/src/spicelib/devices/bsim3v32/b3v32set.c @@ -896,9 +896,9 @@ IFuid tmpName; for (here = model->BSIM3v32instances; here != NULL ; here=here->BSIM3v32nextInstance) { - /* allocate a chunk of the state vector */ - here->BSIM3v32states = *states; - *states += BSIM3v32numStates; + /* allocate a chunk of the state vector */ + here->BSIM3v32states = *states; + *states += BSIM3v32numStates; /* perform the parameter defaulting */ if (!here->BSIM3v32drainAreaGiven) diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c index 6393f22a6..2c58e9693 100644 --- a/src/spicelib/devices/bsim4/b4set.c +++ b/src/spicelib/devices/bsim4/b4set.c @@ -2176,9 +2176,10 @@ BSIM4instance **InstArray; for (here = model->BSIM4instances; here != NULL ; here=here->BSIM4nextInstance) { - /* allocate a chunk of the state vector */ - here->BSIM4states = *states; - *states += BSIM4numStates; + /* allocate a chunk of the state vector */ + here->BSIM4states = *states; + *states += BSIM4numStates; + /* perform the parameter defaulting */ if (!here->BSIM4lGiven) here->BSIM4l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4v4/b4v4cvtest.c b/src/spicelib/devices/bsim4v4/b4v4cvtest.c index 2b0c4669e..411f9760a 100644 --- a/src/spicelib/devices/bsim4v4/b4v4cvtest.c +++ b/src/spicelib/devices/bsim4v4/b4v4cvtest.c @@ -43,7 +43,7 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6; { for (here = model->BSIM4v4instances; here != NULL ; here=here->BSIM4v4nextInstance) { - vds = model->BSIM4v4type + vds = model->BSIM4v4type * (*(ckt->CKTrhsOld + here->BSIM4v4dNodePrime) - *(ckt->CKTrhsOld + here->BSIM4v4sNodePrime)); vgs = model->BSIM4v4type diff --git a/src/spicelib/devices/bsim4v4/b4v4set.c b/src/spicelib/devices/bsim4v4/b4v4set.c index eed0c8dcf..a1f483973 100644 --- a/src/spicelib/devices/bsim4v4/b4v4set.c +++ b/src/spicelib/devices/bsim4v4/b4v4set.c @@ -1626,9 +1626,11 @@ JOB *job; for (here = model->BSIM4v4instances; here != NULL ; here=here->BSIM4v4nextInstance) - { /* allocate a chunk of the state vector */ + { + /* allocate a chunk of the state vector */ here->BSIM4v4states = *states; *states += BSIM4v4numStates; + /* perform the parameter defaulting */ if (!here->BSIM4v4lGiven) here->BSIM4v4l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4v5/b4v5cvtest.c b/src/spicelib/devices/bsim4v5/b4v5cvtest.c index fb11c324e..daebb4463 100644 --- a/src/spicelib/devices/bsim4v5/b4v5cvtest.c +++ b/src/spicelib/devices/bsim4v5/b4v5cvtest.c @@ -42,8 +42,8 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6; for (; model != NULL; model = model->BSIM4v5nextModel) { for (here = model->BSIM4v5instances; here != NULL ; here=here->BSIM4v5nextInstance) - { - vds = model->BSIM4v5type + { + vds = model->BSIM4v5type * (*(ckt->CKTrhsOld + here->BSIM4v5dNodePrime) - *(ckt->CKTrhsOld + here->BSIM4v5sNodePrime)); vgs = model->BSIM4v5type diff --git a/src/spicelib/devices/bsim4v5/b4v5set.c b/src/spicelib/devices/bsim4v5/b4v5set.c index 2d371e3c4..d84db6a15 100644 --- a/src/spicelib/devices/bsim4v5/b4v5set.c +++ b/src/spicelib/devices/bsim4v5/b4v5set.c @@ -1654,9 +1654,10 @@ JOB *job; for (here = model->BSIM4v5instances; here != NULL ; here=here->BSIM4v5nextInstance) { - /* allocate a chunk of the state vector */ - here->BSIM4v5states = *states; - *states += BSIM4v5numStates; + /* allocate a chunk of the state vector */ + here->BSIM4v5states = *states; + *states += BSIM4v5numStates; + /* perform the parameter defaulting */ if (!here->BSIM4v5lGiven) here->BSIM4v5l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4v5/b4v5trunc.c b/src/spicelib/devices/bsim4v5/b4v5trunc.c index 69322af1c..63facdef3 100644 --- a/src/spicelib/devices/bsim4v5/b4v5trunc.c +++ b/src/spicelib/devices/bsim4v5/b4v5trunc.c @@ -32,6 +32,7 @@ BSIM4v5instance *here; { for (here = model->BSIM4v5instances; here != NULL; here = here->BSIM4v5nextInstance) { + #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim4v6/b4v6set.c b/src/spicelib/devices/bsim4v6/b4v6set.c index 062471b89..6cd97e4cc 100644 --- a/src/spicelib/devices/bsim4v6/b4v6set.c +++ b/src/spicelib/devices/bsim4v6/b4v6set.c @@ -2025,9 +2025,10 @@ BSIM4v6instance **InstArray; for (here = model->BSIM4v6instances; here != NULL ; here=here->BSIM4v6nextInstance) { - /* allocate a chunk of the state vector */ - here->BSIM4v6states = *states; - *states += BSIM4v6numStates; + /* allocate a chunk of the state vector */ + here->BSIM4v6states = *states; + *states += BSIM4v6numStates; + /* perform the parameter defaulting */ if (!here->BSIM4v6lGiven) here->BSIM4v6l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4v6/b4v6trunc.c b/src/spicelib/devices/bsim4v6/b4v6trunc.c index 27d928ba3..4f9f935cf 100644 --- a/src/spicelib/devices/bsim4v6/b4v6trunc.c +++ b/src/spicelib/devices/bsim4v6/b4v6trunc.c @@ -34,6 +34,7 @@ BSIM4v6instance *here; { for (here = model->BSIM4v6instances; here != NULL; here = here->BSIM4v6nextInstance) { + #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/cap/capgetic.c b/src/spicelib/devices/cap/capgetic.c index 5a537508f..66099d7c2 100644 --- a/src/spicelib/devices/cap/capgetic.c +++ b/src/spicelib/devices/cap/capgetic.c @@ -34,4 +34,3 @@ CAPgetic(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - diff --git a/src/spicelib/devices/cap/capsset.c b/src/spicelib/devices/cap/capsset.c index de001149e..347dbe9ba 100644 --- a/src/spicelib/devices/cap/capsset.c +++ b/src/spicelib/devices/cap/capsset.c @@ -41,4 +41,3 @@ CAPsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } - diff --git a/src/spicelib/devices/cccs/cccsload.c b/src/spicelib/devices/cccs/cccsload.c index f84f582a2..fcf823c85 100644 --- a/src/spicelib/devices/cccs/cccsload.c +++ b/src/spicelib/devices/cccs/cccsload.c @@ -31,7 +31,7 @@ CCCSload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - + *(here->CCCSposContBrptr) += here->CCCScoeff ; *(here->CCCSnegContBrptr) -= here->CCCScoeff ; } diff --git a/src/spicelib/devices/cccs/cccspzld.c b/src/spicelib/devices/cccs/cccspzld.c index 9bcc4faba..e4b1ff37e 100644 --- a/src/spicelib/devices/cccs/cccspzld.c +++ b/src/spicelib/devices/cccs/cccspzld.c @@ -33,7 +33,7 @@ CCCSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - + *(here->CCCSposContBrptr) += here->CCCScoeff ; *(here->CCCSnegContBrptr) -= here->CCCScoeff ; } diff --git a/src/spicelib/devices/cccs/cccssacl.c b/src/spicelib/devices/cccs/cccssacl.c index 44e8213db..89078110f 100644 --- a/src/spicelib/devices/cccs/cccssacl.c +++ b/src/spicelib/devices/cccs/cccssacl.c @@ -31,7 +31,7 @@ CCCSsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - + if(here->CCCSsenParmNo){ ic = *(ckt->CKTrhsOld + here->CCCScontBranch); @@ -49,4 +49,3 @@ CCCSsAcLoad(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - diff --git a/src/spicelib/devices/cccs/cccssset.c b/src/spicelib/devices/cccs/cccssset.c index 9e33c98c9..8ad2bf362 100644 --- a/src/spicelib/devices/cccs/cccssset.c +++ b/src/spicelib/devices/cccs/cccssset.c @@ -38,4 +38,3 @@ CCCSsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } - diff --git a/src/spicelib/devices/ccvs/ccvssacl.c b/src/spicelib/devices/ccvs/ccvssacl.c index 29e73313a..bebbef73a 100644 --- a/src/spicelib/devices/ccvs/ccvssacl.c +++ b/src/spicelib/devices/ccvs/ccvssacl.c @@ -43,5 +43,3 @@ CCVSsAcLoad(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - - diff --git a/src/spicelib/devices/ccvs/ccvssld.c b/src/spicelib/devices/ccvs/ccvssld.c index 30ea7c12a..fd1b210cb 100644 --- a/src/spicelib/devices/ccvs/ccvssld.c +++ b/src/spicelib/devices/ccvs/ccvssld.c @@ -39,4 +39,3 @@ CCVSsLoad(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - diff --git a/src/spicelib/devices/ccvs/ccvssprt.c b/src/spicelib/devices/ccvs/ccvssprt.c index 0daece589..1115c0226 100644 --- a/src/spicelib/devices/ccvs/ccvssprt.c +++ b/src/spicelib/devices/ccvs/ccvssprt.c @@ -47,4 +47,3 @@ CCVSsPrint(GENmodel *inModel, CKTcircuit *ckt) } } } - diff --git a/src/spicelib/devices/ccvs/ccvssset.c b/src/spicelib/devices/ccvs/ccvssset.c index d0a26c504..ad1c3bb08 100644 --- a/src/spicelib/devices/ccvs/ccvssset.c +++ b/src/spicelib/devices/ccvs/ccvssset.c @@ -36,4 +36,3 @@ CCVSsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } - diff --git a/src/spicelib/devices/dio/diosset.c b/src/spicelib/devices/dio/diosset.c index e6e4b22c5..90b0b5e89 100644 --- a/src/spicelib/devices/dio/diosset.c +++ b/src/spicelib/devices/dio/diosset.c @@ -43,4 +43,3 @@ DIOsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } - diff --git a/src/spicelib/devices/hfet2/hfet2defs.h b/src/spicelib/devices/hfet2/hfet2defs.h index 6edeff4aa..01aba6175 100644 --- a/src/spicelib/devices/hfet2/hfet2defs.h +++ b/src/spicelib/devices/hfet2/hfet2defs.h @@ -1,4 +1,3 @@ - #ifndef HFET2 #define HFET2 diff --git a/src/spicelib/devices/ind/indsetup.c b/src/spicelib/devices/ind/indsetup.c index e46808b6f..d686adbe7 100644 --- a/src/spicelib/devices/ind/indsetup.c +++ b/src/spicelib/devices/ind/indsetup.c @@ -80,7 +80,7 @@ INDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ *states += 2 * (ckt->CKTsenInfo->SENparms); } - + if(here->INDbrEq == 0) { error = CKTmkCur(ckt,&tmp,here->INDname,"branch"); if(error) return(error); diff --git a/src/spicelib/devices/mos1/mos1set.c b/src/spicelib/devices/mos1/mos1set.c index 9a5116cb5..32a4c37b9 100644 --- a/src/spicelib/devices/mos1/mos1set.c +++ b/src/spicelib/devices/mos1/mos1set.c @@ -92,12 +92,13 @@ MOS1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - /* allocate a chunk of the state vector */ - here->MOS1states = *states; - *states += MOS1numStates; - if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ - *states += 10 * (ckt->CKTsenInfo->SENparms); - } + /* allocate a chunk of the state vector */ + here->MOS1states = *states; + *states += MOS1numStates; + + if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ + *states += 10 * (ckt->CKTsenInfo->SENparms); + } if(!here->MOS1drainPerimiterGiven) { here->MOS1drainPerimiter = 0; diff --git a/src/spicelib/devices/mos2/mos2acld.c b/src/spicelib/devices/mos2/mos2acld.c index 421fd2a5a..6e24c7bde 100644 --- a/src/spicelib/devices/mos2/mos2acld.c +++ b/src/spicelib/devices/mos2/mos2acld.c @@ -36,7 +36,7 @@ MOS2acLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS2nextModel) { for(here = model->MOS2instances; here!= NULL; here = here->MOS2nextInstance) { - + if (here->MOS2mode < 0) { xnrm=0; xrev=1; diff --git a/src/spicelib/devices/mos2/mos2conv.c b/src/spicelib/devices/mos2/mos2conv.c index 3566be578..7748f82a1 100644 --- a/src/spicelib/devices/mos2/mos2conv.c +++ b/src/spicelib/devices/mos2/mos2conv.c @@ -32,7 +32,7 @@ MOS2convTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS2nextModel) { for(here = model->MOS2instances; here!= NULL; here = here->MOS2nextInstance) { - + vbs = model->MOS2type * ( *(ckt->CKTrhs+here->MOS2bNode) - *(ckt->CKTrhs+here->MOS2sNodePrime)); diff --git a/src/spicelib/devices/mos2/mos2ic.c b/src/spicelib/devices/mos2/mos2ic.c index 2fca05da8..9b85538b5 100644 --- a/src/spicelib/devices/mos2/mos2ic.c +++ b/src/spicelib/devices/mos2/mos2ic.c @@ -24,7 +24,7 @@ MOS2getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MOS2nextModel) { for(here = model->MOS2instances; here ; here = here->MOS2nextInstance) { - + if(!here->MOS2icVBSGiven) { here->MOS2icVBS = *(ckt->CKTrhs + here->MOS2bNode) - diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c index 8bee0c36b..b7b81a22a 100644 --- a/src/spicelib/devices/mos2/mos2noi.c +++ b/src/spicelib/devices/mos2/mos2noi.c @@ -49,7 +49,7 @@ MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->MOS2nextModel) { for (inst=model->MOS2instances; inst != NULL; inst=inst->MOS2nextInstance) { - + switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/mos2/mos2pzld.c b/src/spicelib/devices/mos2/mos2pzld.c index 0961a2dce..27363fa97 100644 --- a/src/spicelib/devices/mos2/mos2pzld.c +++ b/src/spicelib/devices/mos2/mos2pzld.c @@ -37,7 +37,7 @@ MOS2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->MOS2nextModel) { for(here = model->MOS2instances; here!= NULL; here = here->MOS2nextInstance) { - + if (here->MOS2mode < 0) { xnrm=0; xrev=1; diff --git a/src/spicelib/devices/mos2/mos2set.c b/src/spicelib/devices/mos2/mos2set.c index dcf71feb7..3bf2fb4ba 100644 --- a/src/spicelib/devices/mos2/mos2set.c +++ b/src/spicelib/devices/mos2/mos2set.c @@ -124,12 +124,13 @@ MOS2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - /* allocate a chunk of the state vector */ - here->MOS2states = *states; - *states += MOS2numStates; - if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ - *states += 10 * (ckt->CKTsenInfo->SENparms); - } + /* allocate a chunk of the state vector */ + here->MOS2states = *states; + *states += MOS2numStates; + + if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ + *states += 10 * (ckt->CKTsenInfo->SENparms); + } if(!here->MOS2drainPerimiterGiven) { here->MOS2drainPerimiter = 0; diff --git a/src/spicelib/devices/mos2/mos2trun.c b/src/spicelib/devices/mos2/mos2trun.c index 8113fcb4a..76952bc01 100644 --- a/src/spicelib/devices/mos2/mos2trun.c +++ b/src/spicelib/devices/mos2/mos2trun.c @@ -20,7 +20,7 @@ MOS2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->MOS2nextModel) { for(here=model->MOS2instances;here!=NULL;here = here->MOS2nextInstance){ - + CKTterr(here->MOS2qgs,ckt,timeStep); CKTterr(here->MOS2qgd,ckt,timeStep); CKTterr(here->MOS2qgb,ckt,timeStep); diff --git a/src/spicelib/devices/mos3/mos3set.c b/src/spicelib/devices/mos3/mos3set.c index 35a14c82c..334160723 100644 --- a/src/spicelib/devices/mos3/mos3set.c +++ b/src/spicelib/devices/mos3/mos3set.c @@ -147,9 +147,9 @@ MOS3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - /* allocate a chunk of the state vector */ - here->MOS3states = *states; - *states += MOS3NUMSTATES; + /* allocate a chunk of the state vector */ + here->MOS3states = *states; + *states += MOS3NUMSTATES; if(!here->MOS3drainAreaGiven) { here->MOS3drainArea = ckt->CKTdefaultMosAD; diff --git a/src/spicelib/devices/mos9/mos9set.c b/src/spicelib/devices/mos9/mos9set.c index 14c2b29cb..129ebccfe 100644 --- a/src/spicelib/devices/mos9/mos9set.c +++ b/src/spicelib/devices/mos9/mos9set.c @@ -147,9 +147,10 @@ MOS9setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - /* allocate a chunk of the state vector */ - here->MOS9states = *states; - *states += MOS9NUMSTATES; + /* allocate a chunk of the state vector */ + here->MOS9states = *states; + *states += MOS9NUMSTATES; + if(!here->MOS9drainAreaGiven) { here->MOS9drainArea = ckt->CKTdefaultMosAD; } diff --git a/src/spicelib/devices/ndev/ndevaccept.c b/src/spicelib/devices/ndev/ndevaccept.c index e48e8ad1d..88c1da922 100644 --- a/src/spicelib/devices/ndev/ndevaccept.c +++ b/src/spicelib/devices/ndev/ndevaccept.c @@ -24,8 +24,7 @@ int NDEVaccept(CKTcircuit *ckt, GENmodel *inModel) { /* loop through all the instances of the model */ for (here = model->NDEVinstances; here != NULL ; here=here->NDEVnextInstance) - { - + { /* set ckt accept_flag */ here->CKTInfo.DEV_CALL = NDEV_ACCEPT; here->CKTInfo.CKTmode = ckt->CKTmode; @@ -48,6 +47,7 @@ int NDEVconvTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->NDEVnextModel) { for(here=model->NDEVinstances;here!=NULL;here = here->NDEVnextInstance){ + /* * get convergence information from ndev */ diff --git a/src/spicelib/devices/ndev/ndevload.c b/src/spicelib/devices/ndev/ndevload.c index b8652d0f2..eb76fa327 100644 --- a/src/spicelib/devices/ndev/ndevload.c +++ b/src/spicelib/devices/ndev/ndevload.c @@ -28,7 +28,7 @@ NDEVload(GENmodel * inModel, CKTcircuit * ckt) /* loop through all the instances of the model */ for (here = model->NDEVinstances; here != NULL ; here=here->NDEVnextInstance) - { + { /* sent ckt information to device simulator */ here->CKTInfo.DEV_CALL = NDEV_LOAD; here->CKTInfo.CKTmode = ckt->CKTmode; @@ -55,7 +55,7 @@ NDEVload(GENmodel * inModel, CKTcircuit * ckt) /* loop through all the instances of the model */ for (here = model->NDEVinstances; here != NULL ; here=here->NDEVnextInstance) - { + { /* reveive terminal current and conductional matrix from device simulator */ for(i=0;iterm;i++) { @@ -98,5 +98,3 @@ int NDEVgetic(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - - diff --git a/src/spicelib/devices/numd2/nud2set.c b/src/spicelib/devices/numd2/nud2set.c index 4273937cb..521fec661 100644 --- a/src/spicelib/devices/numd2/nud2set.c +++ b/src/spicelib/devices/numd2/nud2set.c @@ -245,6 +245,7 @@ NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) if ((inst->ptr = SMPmakeElt(matrix, inst->first, inst->second)) == NULL){\ return(E_NOMEM);\ } + TSTALLOC(NUMD2posPosPtr, NUMD2posNode, NUMD2posNode) TSTALLOC(NUMD2negNegPtr, NUMD2negNode, NUMD2negNode) TSTALLOC(NUMD2negPosPtr, NUMD2negNode, NUMD2posNode) diff --git a/src/spicelib/devices/res/resload.c b/src/spicelib/devices/res/resload.c index d5167efd1..f9ee09a31 100644 --- a/src/spicelib/devices/res/resload.c +++ b/src/spicelib/devices/res/resload.c @@ -75,7 +75,7 @@ RESacload(GENmodel *inModel, CKTcircuit *ckt) if(!here->REStc1Given) here->REStc1 = 0.0; if(!here->REStc2Given) here->REStc2 = 0.0; if(!here->RESmGiven) here->RESm = 1.0; - + difference = (here->REStemp + here->RESdtemp) - 300.15; factor = 1.0 + (here->REStc1)*difference + (here->REStc2)*difference*difference; diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c index a658c998e..039ae1f62 100644 --- a/src/spicelib/devices/res/resnoise.c +++ b/src/spicelib/devices/res/resnoise.c @@ -56,7 +56,7 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model = firstModel; model != NULL; model = model->RESnextModel) { for (inst = model->RESinstances; inst != NULL; inst = inst->RESnextInstance) { - + if(!inst->RESnoisy) continue; /* Quiet resistors are skipped */ switch (operation) { diff --git a/src/spicelib/devices/res/respzld.c b/src/spicelib/devices/res/respzld.c index 9f9fd8d91..bee73b83b 100644 --- a/src/spicelib/devices/res/respzld.c +++ b/src/spicelib/devices/res/respzld.c @@ -32,7 +32,7 @@ RESpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - + m = here->RESm; *(here->RESposPosptr) += m * here->RESconduct; diff --git a/src/spicelib/devices/res/ressetup.c b/src/spicelib/devices/res/ressetup.c index cdb65acc1..d9b1f148a 100644 --- a/src/spicelib/devices/res/ressetup.c +++ b/src/spicelib/devices/res/ressetup.c @@ -33,12 +33,14 @@ RESsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit*ckt, int *state) * Paolo Nenzi 2003 * The following lines are needed if I will move the defaulting code * from REStemp to RESsetup, as in other (more recent ?) spice devices - * + * + * ------------------------------------------LEGACY CODE - Francesco Lannutti - October 22, 2012 * if (here->RESowner != ARCHme) * goto matrixpointers; - * + * * matrixpointers: - * + * ------------------------------------------ + * * put here instance parameter defaulting. */ diff --git a/src/spicelib/devices/res/ressload.c b/src/spicelib/devices/res/ressload.c index dec57eb75..e4e989270 100644 --- a/src/spicelib/devices/res/ressload.c +++ b/src/spicelib/devices/res/ressload.c @@ -48,4 +48,3 @@ RESsLoad(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - diff --git a/src/spicelib/devices/res/restemp.c b/src/spicelib/devices/res/restemp.c index f1581cf4f..df227a7d7 100644 --- a/src/spicelib/devices/res/restemp.c +++ b/src/spicelib/devices/res/restemp.c @@ -42,7 +42,7 @@ REStemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - + /* Default Value Processing for Resistor Instance */ if(!here->REStempGiven) { diff --git a/src/spicelib/devices/soi3/soi3set.c b/src/spicelib/devices/soi3/soi3set.c index ab4cd1ef3..4eb10b95b 100644 --- a/src/spicelib/devices/soi3/soi3set.c +++ b/src/spicelib/devices/soi3/soi3set.c @@ -325,9 +325,9 @@ SOI3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here->SOI3gMd = 0.0; here->SOI3gMdeltaT = 0.0; - /* allocate a chunk of the state vector */ - here->SOI3states = *states; - *states += SOI3numStates; + /* allocate a chunk of the state vector */ + here->SOI3states = *states; + *states += SOI3numStates; /* if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ *states += 10 * (ckt->CKTsenInfo->SENparms); } diff --git a/src/spicelib/devices/vccs/vccssld.c b/src/spicelib/devices/vccs/vccssld.c index ca0f18866..65b86c3ea 100644 --- a/src/spicelib/devices/vccs/vccssld.c +++ b/src/spicelib/devices/vccs/vccssld.c @@ -44,5 +44,3 @@ VCCSsLoad(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - - diff --git a/src/spicelib/devices/vccs/vccssset.c b/src/spicelib/devices/vccs/vccssset.c index b4a444481..cd9ed9e68 100644 --- a/src/spicelib/devices/vccs/vccssset.c +++ b/src/spicelib/devices/vccs/vccssset.c @@ -39,4 +39,3 @@ VCCSsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } - diff --git a/src/spicelib/devices/vcvs/vcvssld.c b/src/spicelib/devices/vcvs/vcvssld.c index 9de63b0dd..4541aafc1 100644 --- a/src/spicelib/devices/vcvs/vcvssld.c +++ b/src/spicelib/devices/vcvs/vcvssld.c @@ -42,4 +42,3 @@ VCVSsLoad(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - diff --git a/src/spicelib/devices/vcvs/vcvssset.c b/src/spicelib/devices/vcvs/vcvssset.c index 71b57d02d..0d5d1f645 100644 --- a/src/spicelib/devices/vcvs/vcvssset.c +++ b/src/spicelib/devices/vcvs/vcvssset.c @@ -38,4 +38,3 @@ VCVSsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } -