Fixed cider code for inclusion into ngspice.

This commit is contained in:
pnenzi 2003-08-13 23:21:03 +00:00
parent 2a3285f5cd
commit 310905710b
20 changed files with 25 additions and 24 deletions

View File

@ -107,7 +107,7 @@ DOPparam(int param, IFvalue *value, void *inCard)
case DOP_DOMAIN:
if ( !card->DOPdomainsGiven ) {
card->DOPnumDomains = value->v.numValue;
card->DOPdomains = (int *)xmalloc(value->v.numValue * sizeof(int));
card->DOPdomains = (int *)tmalloc(value->v.numValue * sizeof(int));
for ( i=0; i < card->DOPnumDomains; i++ ) {
card->DOPdomains[i] = value->v.vec.iVec[i];
}

View File

@ -12,7 +12,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "onedev.h"
#include "onemesh.h"
#include "complex.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "ifsim.h"
#include "onedext.h"

View File

@ -11,7 +11,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "onemesh.h"
#include "onedev.h"
#include "macros.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "onedext.h"
#include "oneddefs.h"

View File

@ -8,7 +8,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "numenum.h"
#include "onedev.h"
#include "onemesh.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "onedext.h"
#include "oneddefs.h"

View File

@ -10,7 +10,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "onedev.h"
#include "onedext.h"
#include "oneddefs.h"
#include "spMatrix.h"
#include "spmatrix.h"
/* Functions to setup and solve the 1D poisson equation. */

View File

@ -11,7 +11,7 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group
#include "onemesh.h"
#include "onedev.h"
#include "carddefs.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "onedext.h"
#include "oneddefs.h"

View File

@ -9,7 +9,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "onemesh.h"
#include "onedev.h"
#include "macros.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "bool.h"
#include "onedext.h"
#include "oneddefs.h"

View File

@ -13,7 +13,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "numenum.h"
#include "onedev.h"
#include "onemesh.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "bool.h"
#include "macros.h"
#include "onedext.h"

View File

@ -12,7 +12,7 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group
#include "ngspice.h"
#include "numglobs.h"
#include "numenum.h"
#include "spMatrix.h"
#include "spmatrix.h"
/* Used in Solution Projection Calculations */

View File

@ -12,7 +12,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "twodev.h"
#include "twomesh.h"
#include "complex.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "bool.h"
#include "macros.h"
#include "ifsim.h"

View File

@ -11,7 +11,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "twomesh.h"
#include "twodev.h"
#include "bool.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "twoddefs.h"
#include "twodext.h"

View File

@ -10,7 +10,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "twomesh.h"
#include "twodev.h"
#include "bool.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "twoddefs.h"
#include "twodext.h"
#include "cidersupt.h"

View File

@ -8,7 +8,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "numenum.h"
#include "twodev.h"
#include "twomesh.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "twoddefs.h"
#include "twodext.h"

View File

@ -10,7 +10,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "twomesh.h"
#include "twodev.h"
#include "bool.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "twoddefs.h"
#include "twodext.h"
#include "cidersupt.h"

View File

@ -10,7 +10,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "twomesh.h"
#include "twodev.h"
#include "bool.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "twoddefs.h"
#include "twodext.h"
#include "cidersupt.h"

View File

@ -9,7 +9,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "numenum.h"
#include "twomesh.h"
#include "twodev.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "twoddefs.h"
#include "twodext.h"

View File

@ -11,7 +11,7 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group
#include "twomesh.h"
#include "twodev.h"
#include "carddefs.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "bool.h"
#include "twoddefs.h"
#include "twodext.h"

View File

@ -15,7 +15,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "twomesh.h"
#include "twodev.h"
#include "bool.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "twoddefs.h"
#include "twodext.h"
#include "cidersupt.h"

View File

@ -9,8 +9,9 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#include "numenum.h"
#include "twodev.h"
#include "twomesh.h"
#include "spMatrix.h"
#include "spmatrix.h"
#include "bool.h"
#include "macros.h"
#include "twoddefs.h"
#include "twodext.h"
#include "cidersupt.h"

View File

@ -242,7 +242,7 @@ INPparseNumMod( ckt, model, tab, errMessage )
cardType = lastType;
while (*line == '+') line++; /* Skip leading '+'s */
} else {
tmp = (char *)xmalloc((55)*sizeof(char));
tmp = (char *)tmalloc((55)*sizeof(char));
(void) sprintf(tmp,
"Error on card %d : illegal continuation \'+\' - ignored",
cardNum);
@ -275,7 +275,7 @@ INPparseNumMod( ckt, model, tab, errMessage )
cardType = E_MISSING;
} else {
/* Error */
tmp =(char *)xmalloc((55+strlen(cardName))*sizeof(char));
tmp =(char *)tmalloc((55+strlen(cardName))*sizeof(char));
(void) sprintf(tmp,
"Error on card %d : unrecognized name (%s) - ignored",
cardNum, cardName );
@ -298,14 +298,14 @@ INPparseNumMod( ckt, model, tab, errMessage )
idx = INPfindParm(parm, info->cardParms, info->numParms);
if (idx == E_MISSING) {
/* parm not found */
tmp = (char *)xmalloc((60+strlen(parm)) * sizeof(char));
tmp = (char *)tmalloc((60+strlen(parm)) * sizeof(char));
(void)sprintf(tmp,
"Error on card %d : unrecognized parameter (%s) - ignored",
cardNum, parm);
err = INPerrCat(err, tmp);
} else if (idx == E_AMBIGUOUS) {
/* parm ambiguous */
tmp = (char *)xmalloc((58+strlen(parm)) * sizeof(char));
tmp = (char *)tmalloc((58+strlen(parm)) * sizeof(char));
(void)sprintf(tmp,
"Error on card %d : ambiguous parameter (%s) - ignored",
cardNum, parm);
@ -318,7 +318,7 @@ INPparseNumMod( ckt, model, tab, errMessage )
== IF_FLAG) {
value->iValue = 0;
} else {
tmp =(char *)xmalloc((63+strlen(parm))*sizeof(char));
tmp =(char *)tmalloc((63+strlen(parm))*sizeof(char));
(void)sprintf(tmp,
"Error on card %d : non-boolean parameter (%s) - \'^\' ignored",
cardNum, parm);