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

Rename the internal circuit nodes generated by .probe 

to probe_int_xxx to make it probe specific.
Don't save these nodes.
This commit is contained in:
Holger Vogt 2022-06-18 00:29:48 +02:00
parent 9619b52180
commit fc83328952
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontend/inpc_probe.c
View File

@ -227,7 +227,7 @@ void inp_probe(struct card* deck)
nodename2 = get_terminal_name(instname, "2", instances); nodename2 = get_terminal_name(instname, "2", instances);
char* newnode = tprintf("int_%s_%s", strnode2, instname); char* newnode = tprintf("probe_int_%s_%s", strnode2, instname);
char* vline = tprintf("vcurr_%s:%s_%s %s %s 0", instname, nodename2, strnode2, newnode, strnode2); char* vline = tprintf("vcurr_%s:%s_%s %s %s 0", instname, nodename2, strnode2, newnode, strnode2);
char *newline = tprintf("%s %s %s %s", instname, strnode1, newnode, thisline); char *newline = tprintf("%s %s %s %s", instname, strnode1, newnode, thisline);
@ -260,7 +260,7 @@ void inp_probe(struct card* deck)
tfree(thisnode); tfree(thisnode);
continue; continue;
} }
char* newnode = tprintf("int_%s_%s_%d", thisnode, instname, i); char* newnode = tprintf("probe_int_%s_%s_%d", thisnode, instname, i);
sadd(&dnewline, newnode); sadd(&dnewline, newnode);
cadd(&dnewline, ' '); cadd(&dnewline, ' ');
/* to make the nodes unique */ /* to make the nodes unique */
@ -718,7 +718,7 @@ void inp_probe(struct card* deck)
nodename2 = get_terminal_name(instname, "2", instances); nodename2 = get_terminal_name(instname, "2", instances);
char* newnode = tprintf("int_%s_%s_2", strnode2, instname); char* newnode = tprintf("probe_int_%s_%s_2", strnode2, instname);
char* vline = tprintf("vcurr_%s:%s_%s %s %s 0", instname, nodename2, strnode2, newnode, strnode2); char* vline = tprintf("vcurr_%s:%s_%s %s %s 0", instname, nodename2, strnode2, newnode, strnode2);
newline = tprintf("%s %s %s", begstr, newnode, thisline); newline = tprintf("%s %s %s", begstr, newnode, thisline);
@ -774,7 +774,7 @@ void inp_probe(struct card* deck)
char* strnode1 = gettok(&thisline); char* strnode1 = gettok(&thisline);
char* newnode = tprintf("int_%s_%s_%d", strnode1, instname, nodenum); char* newnode = tprintf("probe_int_%s_%s_%d", strnode1, instname, nodenum);
newline = tprintf("%s %s %s", begstr, newnode, thisline); newline = tprintf("%s %s %s", begstr, newnode, thisline);
@ -1253,7 +1253,7 @@ static int setallvsources(struct card *tmpcard, NGHASHPTR instances, char *instn
} }
char* begstr = copy_substring(tmpcard->line, instline); char* begstr = copy_substring(tmpcard->line, instline);
char* strnode1 = gettok(&instline); char* strnode1 = gettok(&instline);
char* newnode = tprintf("int_%s_%s_%d", strnode1, instname, nodenum); char* newnode = tprintf("probe_int_%s_%s_%d", strnode1, instname, nodenum);
char nodenumstr[3]; char nodenumstr[3];
char *nodename1 = get_terminal_name(instname, itoa10(nodenum, nodenumstr), instances); char *nodename1 = get_terminal_name(instname, itoa10(nodenum, nodenumstr), instances);

1
src/frontend/outitf.c
View File

@ -275,6 +275,7 @@ beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNam
!strstr(dataNames[i], "#collector") && !strstr(dataNames[i], "#collector") &&
!strstr(dataNames[i], "#collCX") && !strstr(dataNames[i], "#collCX") &&
!strstr(dataNames[i], "#emitter") && !strstr(dataNames[i], "#emitter") &&
!strstr(dataNames[i], "probe_int_") && /* created by .probe */
!strstr(dataNames[i], "#base")) !strstr(dataNames[i], "#base"))
{ {
addDataDesc(run, dataNames[i], dataType, i, initmem); addDataDesc(run, dataNames[i], dataType, i, initmem);