From 4fc33eb6568e87edba7c52ea43852b032ab3ff8c Mon Sep 17 00:00:00 2001 From: rlar Date: Wed, 29 Mar 2017 19:57:12 +0200 Subject: [PATCH] ifparm, #6/16, missing IF_NONSENSE for some aliases, introduce IOPXR --- src/include/ngspice/devdefs.h | 1 + src/spicelib/devices/cap/cap.c | 4 ++-- src/spicelib/devices/res/res.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h index f5f9bbe36..ea0817b1a 100644 --- a/src/include/ngspice/devdefs.h +++ b/src/include/ngspice/devdefs.h @@ -154,6 +154,7 @@ extern int DEVmaxnum; /* size of DEVices array */ # define IOPN(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_NOISE, d } # define IOPR(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_REDUNDANT, NULL } # define IOPX(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_NONSENSE, d } +# define IOPXR(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_NONSENSE|IF_REDUNDANT, d } # define IOPXU(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_NONSENSE|IF_UNINTERESTING,\ d } # define IOPQ(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_SETQUERY, d } diff --git a/src/spicelib/devices/cap/cap.c b/src/spicelib/devices/cap/cap.c index ef1d5fd70..afcb58d29 100644 --- a/src/spicelib/devices/cap/cap.c +++ b/src/spicelib/devices/cap/cap.c @@ -43,9 +43,9 @@ IFparm CAPmPTable[] = { /* names of model parameters */ IOPA( "cjsw", CAP_MOD_CJSW, IF_REAL, "Sidewall capacitance per meter"), IOPAR( "capsw", CAP_MOD_CJSW, IF_REAL, "Sidewall capacitance per meter"), IOPX( "defw", CAP_MOD_DEFWIDTH, IF_REAL, "Default width"), - IOPR( "w", CAP_MOD_DEFWIDTH, IF_REAL, "Default width"), + IOPXR( "w", CAP_MOD_DEFWIDTH, IF_REAL, "Default width"), IOPX( "defl", CAP_MOD_DEFLENGTH,IF_REAL, "Default length"), - IOPR( "l", CAP_MOD_DEFLENGTH,IF_REAL, "Default length"), + IOPXR( "l", CAP_MOD_DEFLENGTH,IF_REAL, "Default length"), IOPA( "narrow", CAP_MOD_NARROW, IF_REAL, "width correction factor"), IOPA( "short", CAP_MOD_SHORT, IF_REAL, "length correction factor"), IOPA( "del", CAP_MOD_DEL, IF_REAL, "length and width correction factor"), diff --git a/src/spicelib/devices/res/res.c b/src/spicelib/devices/res/res.c index e3cf3e317..84fa5341a 100644 --- a/src/spicelib/devices/res/res.c +++ b/src/spicelib/devices/res/res.c @@ -54,7 +54,7 @@ IFparm RESmPTable[] = { /* model parameters */ IOPR( "tc2r", RES_MOD_TC2, IF_REAL,"Second order temp. coefficient"), IOPQ( "tce", RES_MOD_TCE, IF_REAL,"exponential temp. coefficient"), IOPX( "defw", RES_MOD_DEFWIDTH, IF_REAL,"Default device width"), - IOPR( "w", RES_MOD_DEFWIDTH, IF_REAL,"Default device width"), + IOPXR( "w", RES_MOD_DEFWIDTH, IF_REAL,"Default device width"), IOPX( "l", RES_MOD_DEFLENGTH,IF_REAL,"Default device length"), IOPQ( "kf", RES_MOD_KF, IF_REAL,"Flicker noise coefficient"), IOPQ( "af", RES_MOD_AF, IF_REAL,"Flicker noise exponent"),