From 75d1e4573740f4b89f40c168c766c44ee03c30dd Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sat, 20 Oct 2018 23:47:29 +0200 Subject: [PATCH] consider all PSPICE containing compatibility settings for the evaluation of the pwr function or allowing '-' in a subcircuit name --- src/frontend/numparam/spicenum.c | 3 ++- src/spicelib/parser/ptfuncs.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c index 454432307..9d9a69f11 100644 --- a/src/frontend/numparam/spicenum.c +++ b/src/frontend/numparam/spicenum.c @@ -186,7 +186,8 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p) char *t; entry_t *entry; /* check for known subckt name */ - if (inp_compat_mode == COMPATMODE_PS) + if (inp_compat_mode == COMPATMODE_PS || inp_compat_mode == COMPATMODE_PSA + || inp_compat_mode == COMPATMODE_LTPS || inp_compat_mode == COMPATMODE_LTPSA) for (t = p; alfanumps(*t); t++) ; else diff --git a/src/spicelib/parser/ptfuncs.c b/src/spicelib/parser/ptfuncs.c index 0671dfe08..d3f945756 100644 --- a/src/spicelib/parser/ptfuncs.c +++ b/src/spicelib/parser/ptfuncs.c @@ -77,7 +77,9 @@ double PTpwr(double arg1, double arg2) { /* if PSPICE device is evaluated */ - if (arg1 == 0.0 && arg2 < 0.0 && inp_compat_mode == COMPATMODE_PS) + if (arg1 == 0.0 && arg2 < 0.0 && + (inp_compat_mode == COMPATMODE_PS || inp_compat_mode == COMPATMODE_PSA + || inp_compat_mode == COMPATMODE_LTPS || inp_compat_mode == COMPATMODE_LTPSA)) arg1 += PTfudge_factor; if (arg1 < 0.0)