Browse Source

Added some code nedeed by cpl an txl from kspice.

pre-master-46
pnenzi 23 years ago
parent
commit
ebb73dcfc8
  1. 2
      src/frontend/subckt.c
  2. 2
      src/spicelib/analysis/cktdojob.c
  3. 5
      src/spicelib/analysis/dctran.c

2
src/frontend/subckt.c

@ -1593,6 +1593,7 @@ inp_numnodes(char c)
case 'l': return (2); case 'l': return (2);
case 'm': return (7); /* This means that 7 is the maximun number of nodes */ case 'm': return (7); /* This means that 7 is the maximun number of nodes */
case 'o': return (4); case 'o': return (4);
case 'p': return (0);
case 'q': return (4); case 'q': return (4);
case 'r': return (2); case 'r': return (2);
case 's': return (4); case 's': return (4);
@ -1601,6 +1602,7 @@ inp_numnodes(char c)
case 'v': return (2); case 'v': return (2);
/* change 3 to 2 here to fix w bug, NCF 1/31/95 */ /* change 3 to 2 here to fix w bug, NCF 1/31/95 */
case 'w': return (2); case 'w': return (2);
case 'y': return (2);
case 'z': return (3); case 'z': return (3);
default: default:

2
src/spicelib/analysis/cktdojob.c

@ -157,6 +157,8 @@ printf("Doing analysis at TEMP = %f and TNOM = %f\n",
/* gtri - end - 6/10/91 - wbk - Setup event-driven data */ /* gtri - end - 6/10/91 - wbk - Setup event-driven data */
#endif #endif
error = (*(analInfo[i]->an_func))(ckt, reset); error = (*(analInfo[i]->an_func))(ckt, reset);
/* txl, cpl addition */
if (error == 1111) break;
} }
if (error) if (error)
error2 = error; error2 = error;

5
src/spicelib/analysis/dctran.c

@ -688,6 +688,11 @@ resume:
*(ckt->CKTstate3+i) = *(ckt->CKTstate1+i); *(ckt->CKTstate3+i) = *(ckt->CKTstate1+i);
} }
} }
/* txl, cpl addition */
if (converged == 1111) {
return(converged);
}
if(converged != 0) { if(converged != 0) {
#ifndef CLUSTER #ifndef CLUSTER
ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta; ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta;

Loading…
Cancel
Save