ifparm, fix numdev too

src/include/ngspice/devdefs.h

@@ -171,6 +171,7 @@ extern int        DEVmaxnum;    /* size of DEVices array */
 # define IOPQOR(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_ORQUERY|IF_REDUNDANT, d }
 
 # define IP(a,b,c,d) { a , b , c|IF_SET , d }
+# define IPR(a,b,c,d) { a , b , c|IF_SET|IF_REDUNDANT , d }
 # define OP(a,b,c,d) { a , b , c|IF_ASK , d }
 # define OPU(a,b,c,d) { a , b , c|IF_ASK|IF_UNINTERESTING , d }
 # define OPR(a,b,c,d) { a , b , c|IF_ASK|IF_REDUNDANT , d }

src/spicelib/devices/nbjt/nbjt.c

@@ -18,7 +18,7 @@ IFparm NBJTpTable[] = {		/* parameters */
   IP("ic.file", NBJT_IC_FILE, IF_STRING, "Initial condition file"),
   IOP("area", NBJT_AREA, IF_REAL, "Area factor"),
   IP("save", NBJT_PRINT, IF_INTEGER, "Save Solutions"),
-  IP("print", NBJT_PRINT, IF_INTEGER, "Print Solutions"),
+  IPR("print", NBJT_PRINT, IF_INTEGER, "Print Solutions"),
   OP("g11", NBJT_G11, IF_REAL, "Conductance"),
   OP("c11", NBJT_C11, IF_REAL, "Capacitance"),
   OP("y11", NBJT_Y11, IF_COMPLEX, "Admittance"),

src/spicelib/devices/nbjt2/nbt2.c

@@ -19,7 +19,7 @@ IFparm NBJT2pTable[] = {	/* parameters */
   IOP("w", NBJT2_WIDTH, IF_REAL, "Width factor"),
   IOP("area", NBJT2_AREA, IF_REAL, "Area factor"),
   IP("save", NBJT2_PRINT, IF_INTEGER, "Save solutions"),
-  IP("print", NBJT2_PRINT, IF_INTEGER, "Print solutions"),
+  IPR("print", NBJT2_PRINT, IF_INTEGER, "Print solutions"),
   OP("g11", NBJT2_G11, IF_REAL, "Conductance"),
   OP("c11", NBJT2_C11, IF_REAL, "Capacitance"),
   OP("y11", NBJT2_Y11, IF_COMPLEX, "Admittance"),

src/spicelib/devices/numd/numd.c

@@ -13,11 +13,15 @@ IFparm NUMDpTable[] = {		/* parameters */
   IP("ic.file", NUMD_IC_FILE, IF_REAL, "Initial conditions file"),
   IOP("area", NUMD_AREA, IF_REAL, "Area factor"),
   IP("save", NUMD_PRINT, IF_INTEGER, "Save Solutions"),
-  IP("print", NUMD_PRINT, IF_INTEGER, "Print Solutions"),
+  IPR("print", NUMD_PRINT, IF_INTEGER, "Print Solutions"),
   OP("vd", NUMD_VD, IF_REAL, "Voltage"),
+  OPR("voltage", NUMD_VD, IF_REAL, "Voltage"),
   OP("id", NUMD_ID, IF_REAL, "Current"),
+  OPR("current", NUMD_ID, IF_REAL, "Current"),
   OP("g11", NUMD_G11, IF_REAL, "Conductance"),
+  OPR("conductance", NUMD_G11, IF_REAL, "Conductance"),
   OP("c11", NUMD_C11, IF_REAL, "Capacitance"),
+  OPR("capacitance", NUMD_C11, IF_REAL, "Capacitance"),
   OP("y11", NUMD_Y11, IF_COMPLEX, "Admittance"),
   OPU("g12", NUMD_G12, IF_REAL, "Conductance"),
   OPU("c12", NUMD_C12, IF_REAL, "Capacitance"),
@@ -28,10 +32,6 @@ IFparm NUMDpTable[] = {		/* parameters */
   OPU("g22", NUMD_G22, IF_REAL, "Conductance"),
   OPU("c22", NUMD_C22, IF_REAL, "Capacitance"),
   OPU("y22", NUMD_Y22, IF_COMPLEX, "Admittance"),
-  OPR("voltage", NUMD_VD, IF_REAL, "Voltage"),
-  OPR("current", NUMD_ID, IF_REAL, "Current"),
-  OPR("conductance", NUMD_G11, IF_REAL, "Conductance"),
-  OPR("capacitance", NUMD_C11, IF_REAL, "Capacitance"),
   IOP("temp", NUMD_TEMP, IF_REAL, "Instance Temperature")
 };
 

src/spicelib/devices/numd2/nud2.c

@@ -19,11 +19,15 @@ IFparm NUMD2pTable[] = {	/* parameters */
   IOP("w", NUMD2_WIDTH, IF_REAL, "Width factor"),
   IOP("area", NUMD2_AREA, IF_REAL, "Area factor"),
   IP("save", NUMD2_PRINT, IF_INTEGER, "Save solutions"),
-  IP("print", NUMD2_PRINT, IF_INTEGER, "Print solutions"),
+  IPR("print", NUMD2_PRINT, IF_INTEGER, "Print solutions"),
   OP("vd", NUMD2_VD, IF_REAL, "Voltage"),
+  OPR("voltage", NUMD2_VD, IF_REAL, "Voltage"),
   OP("id", NUMD2_ID, IF_REAL, "Current"),
+  OPR("current", NUMD2_ID, IF_REAL, "Current"),
   OP("g11", NUMD2_G11, IF_REAL, "Conductance"),
+  OPR("conductance", NUMD2_G11, IF_REAL, "Conductance"),
   OP("c11", NUMD2_C11, IF_REAL, "Capacitance"),
+  OPR("capacitance", NUMD2_C11, IF_REAL, "Capacitance"),
   OP("y11", NUMD2_Y11, IF_COMPLEX, "Admittance"),
   OPU("g12", NUMD2_G12, IF_REAL, "Conductance"),
   OPU("c12", NUMD2_C12, IF_REAL, "Capacitance"),
@@ -34,10 +38,6 @@ IFparm NUMD2pTable[] = {	/* parameters */
   OPU("g22", NUMD2_G22, IF_REAL, "Conductance"),
   OPU("c22", NUMD2_C22, IF_REAL, "Capacitance"),
   OPU("y22", NUMD2_Y22, IF_COMPLEX, "Admittance"),
-  OPR("voltage", NUMD2_VD, IF_REAL, "Voltage"),
-  OPR("current", NUMD2_ID, IF_REAL, "Current"),
-  OPR("conductance", NUMD2_G11, IF_REAL, "Conductance"),
-  OPR("capacitance", NUMD2_C11, IF_REAL, "Capacitance"),
   IOP("temp", NUMD2_TEMP, IF_REAL, "Instance Temperature")
 };
 

src/spicelib/devices/numos/numm.c

@@ -21,7 +21,7 @@ IFparm NUMOSpTable[] = {	/* parameters */
   IOP("w", NUMOS_WIDTH, IF_REAL, "Width factor"),
   IOP("l", NUMOS_LENGTH, IF_REAL, "Length factor"),
   IP("save", NUMOS_PRINT, IF_INTEGER, "Save solutions"),
-  IP("print", NUMOS_PRINT, IF_INTEGER, "Print solutions"),
+  IPR("print", NUMOS_PRINT, IF_INTEGER, "Print solutions"),
   OP("g11", NUMOS_G11, IF_REAL, "Conductance"),
   OP("c11", NUMOS_C11, IF_REAL, "Capacitance"),
   OP("y11", NUMOS_Y11, IF_COMPLEX, "Admittance"),