From fc833289526cef764d2b0a44aaebbcd98a53c88a Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sat, 18 Jun 2022 00:29:48 +0200 Subject: [PATCH] Rename the internal circuit nodes generated by .probe to probe_int_xxx to make it probe specific. Don't save these nodes. --- src/frontend/inpc_probe.c | 10 +++++----- src/frontend/outitf.c | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/frontend/inpc_probe.c b/src/frontend/inpc_probe.c index 5c50d3359..ef8d073cc 100644 --- a/src/frontend/inpc_probe.c +++ b/src/frontend/inpc_probe.c @@ -227,7 +227,7 @@ void inp_probe(struct card* deck) 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 *newline = tprintf("%s %s %s %s", instname, strnode1, newnode, thisline); @@ -260,7 +260,7 @@ void inp_probe(struct card* deck) tfree(thisnode); 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); cadd(&dnewline, ' '); /* to make the nodes unique */ @@ -718,7 +718,7 @@ void inp_probe(struct card* deck) 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); newline = tprintf("%s %s %s", begstr, newnode, thisline); @@ -774,7 +774,7 @@ void inp_probe(struct card* deck) 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); @@ -1253,7 +1253,7 @@ static int setallvsources(struct card *tmpcard, NGHASHPTR instances, char *instn } char* begstr = copy_substring(tmpcard->line, 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 *nodename1 = get_terminal_name(instname, itoa10(nodenum, nodenumstr), instances); diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c index bb1dcdc98..59f631cee 100644 --- a/src/frontend/outitf.c +++ b/src/frontend/outitf.c @@ -275,6 +275,7 @@ beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNam !strstr(dataNames[i], "#collector") && !strstr(dataNames[i], "#collCX") && !strstr(dataNames[i], "#emitter") && + !strstr(dataNames[i], "probe_int_") && /* created by .probe */ !strstr(dataNames[i], "#base")) { addDataDesc(run, dataNames[i], dataType, i, initmem);