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

com_measure2.c: enable 'meas dc' without 'from' and 'to' given 

measure.c: no error printout during autostop
This commit is contained in:
h_vogt 2012-08-05 20:03:00 +02:00
parent d6ba5e5b3f
commit 11ae043c3d
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/frontend/com_measure2.c
View File

@ -1247,6 +1247,13 @@ static int measure_parse_find (
meas->m_to = 0.0e0; meas->m_to = 0.0e0;
meas->m_at = 1e99; meas->m_at = 1e99;
/* for DC, set new outer limits for 'from' and 'to'
because 0.0e0 may be valid inside of range */
if (cieq("dc", meas->m_analysis)) {
meas->m_to = 1.0e99;
meas->m_from = -1.0e99;
}
pCnt =0; pCnt =0;
while(wl != wlBreak) { while(wl != wlBreak) {
p = wl->wl_word; p = wl->wl_word;
@ -1314,6 +1321,14 @@ static int measure_parse_when (
meas->m_to = 0.0e0; meas->m_to = 0.0e0;
meas->m_at = 1e99; meas->m_at = 1e99;
/* for DC, set new outer limits for 'from' and 'to'
because 0.0e0 may be valid inside of range */
if (cieq("dc", meas->m_analysis)) {
meas->m_to = 1.0e99;
meas->m_from = -1.0e99;
}
pCnt =0; pCnt =0;
while (wl) { while (wl) {
p= wl->wl_word; p= wl->wl_word;
@ -1378,23 +1393,30 @@ static int measure_parse_trigtarg (
meas->m_to = 0.0e0; meas->m_to = 0.0e0;
meas->m_at = 1e99; meas->m_at = 1e99;
/* for DC, set new outer limits for 'from' and 'to'
because 0.0e0 may be valid inside of range */
if (cieq("dc", meas->m_analysis)) {
meas->m_to = 1.0e99;
meas->m_from = -1.0e99;
}
pcnt =0; pcnt =0;
while (words != wlTarg) {
p = words->wl_word;
if ((pcnt == 0) && !ciprefix("at", p)) { while (words != wlTarg) {
meas->m_vec= cp_unquote(words->wl_word); p = words->wl_word;
/* correct for vectors like vm, vp etc. */
if (cieq("ac", meas->m_analysis) || cieq("sp", meas->m_analysis)) if ((pcnt == 0) && !ciprefix("at", p)) {
correct_vec(meas); meas->m_vec= cp_unquote(words->wl_word);
} else if (ciprefix("at", p)) { /* correct for vectors like vm, vp etc. */
if (measure_parse_stdParams(meas, words, wlTarg, errbuf) == 0) if (cieq("ac", meas->m_analysis) || cieq("sp", meas->m_analysis))
return 0; correct_vec(meas);
} else { } else if (ciprefix("at", p)) {
if (measure_parse_stdParams(meas, words, wlTarg, errbuf) == 0) if (measure_parse_stdParams(meas, words, wlTarg, errbuf) == 0)
return 0; return 0;
} else {
if (measure_parse_stdParams(meas, words, wlTarg, errbuf) == 0)
return 0;
break; break;
} }
words = words->wl_next; words = words->wl_next;

3
src/frontend/measure.c
View File

@ -292,7 +292,8 @@ do_measure(
if( fail ) { if( fail ) {
measure_valid[idx++] = FALSE; measure_valid[idx++] = FALSE;
measures_passed = FALSE; measures_passed = FALSE;
fprintf(stdout, " %s failed!\n\n", meas_card->li_line); if (!chk_only)
fprintf(stderr, " %s failed!\n\n", meas_card->li_line);
} else { } else {
if(!(just_chk_meas)) { if(!(just_chk_meas)) {
nupa_add_param( resname, result ); nupa_add_param( resname, result );