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

.probe: replace (all) by alli (we only measure all currents)

This commit is contained in:
Holger Vogt 2022-03-14 10:56:16 +01:00
parent 4cc6222230
commit 56a3771d9a
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/frontend/inpc_probe.c
View File

@ -10,7 +10,7 @@
#include "ngspice/hash.h" #include "ngspice/hash.h"
#include "ngspice/inpdefs.h" #include "ngspice/inpdefs.h"
#include "ngspice/wordlist.h" #include "ngspice/wordlist.h"
#include "ngspice/stringskip.h"
void inp_probe(struct card* card); void inp_probe(struct card* card);
void modprobenames(INPtables* tab); void modprobenames(INPtables* tab);
@ -18,6 +18,7 @@ void modprobenames(INPtables* tab);
extern struct card* insert_new_line( extern struct card* insert_new_line(
struct card* card, char* line, int linenum, int linenum_orig); struct card* card, char* line, int linenum, int linenum_orig);
extern int get_number_terminals(char* c); extern int get_number_terminals(char* c);
extern char* search_plain_identifier(char* str, const char* identifier);
static char* get_terminal_name(char* element, char* numberstr, NGHASHPTR instances); static char* get_terminal_name(char* element, char* numberstr, NGHASHPTR instances);
static char* get_terminal_number(char* element, char* numberstr); static char* get_terminal_number(char* element, char* numberstr);
@ -68,20 +69,34 @@ void inp_probe(struct card* deck)
char* tmpstr = wltmp->wl_word; char* tmpstr = wltmp->wl_word;
/* skip *probe */ /* skip *probe */
tmpstr = nexttok(tmpstr); tmpstr = nexttok(tmpstr);
if (*tmpstr == '\0')
continue; if (*tmpstr == '\0') {
if (ciprefix("(all)", tmpstr)) { fprintf(stderr, "Note: Empty .probe command, treated as .probe alli\n");
haveall = TRUE; haveall = TRUE;
continue;
}
/* set haveall and remove 'alli' token */
char *allistr = search_plain_identifier(tmpstr, "alli");
if (allistr) {
haveall = TRUE;
memcpy(allistr, " ", 4);
}
tmpstr = skip_ws(tmpstr);
if (!strchr("vipVIP", *tmpstr)) {
fprintf(stderr, "Warning: Strange parameter in line %s, ingnored\n", wltmp->wl_word);
tmpstr = nexttok(tmpstr); tmpstr = nexttok(tmpstr);
} }
nextnode = gettok_char(&tmpstr, ')', TRUE, FALSE); nextnode = gettok_char(&tmpstr, ')', TRUE, FALSE);
if (haveall == FALSE && !nextnode) {
fprintf(stderr, "Warning: Strange parameter in line %s, ingnored\n", wltmp->wl_word);
continue;
}
while (nextnode && (*nextnode != '\0')) { while (nextnode && (*nextnode != '\0')) {
if (cieq(nextnode, "(all)")) { probeparams = wl_cons(nextnode, probeparams);
haveall = TRUE;
}
else {
probeparams = wl_cons(nextnode, probeparams);
}
if (ciprefix("vd(", nextnode)) { if (ciprefix("vd(", nextnode)) {
havedifferential = TRUE; havedifferential = TRUE;