drop `NEWN', use `TMALLOC'

This commit is contained in:
rlar 2015-04-12 20:10:07 +02:00
parent ad869c6d2d
commit 232debc6ec
8 changed files with 17 additions and 18 deletions

View File

@ -1128,7 +1128,7 @@ doset(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op
switch (opt->dataType & (IF_VARTYPES & ~IF_VECTOR)) {
case IF_FLAG:
case IF_INTEGER:
iptr = nval.v.vec.iVec = NEWN(int, n);
iptr = nval.v.vec.iVec = TMALLOC(int, n);
for (i = 0; i < n; i++)
*iptr++ = (int)floor(*dptr++ + 0.5);

View File

@ -50,7 +50,6 @@
} while(0)
#define NEW(TYPE) (TMALLOC(TYPE, 1))
#define NEWN(TYPE,COUNT) (TMALLOC(TYPE, COUNT))
#define R_NORM(A,B) { \

View File

@ -149,11 +149,11 @@ int sens_sens(CKTcircuit *ckt, int restart)
size += 1;
/* Create an extra rhs */
delta_I = NEWN(double, size);
delta_iI = NEWN(double, size);
delta_I = TMALLOC(double, size);
delta_iI = TMALLOC(double, size);
delta_I_delta_Y = NEWN(double, size);
delta_iI_delta_Y = NEWN(double, size);
delta_I_delta_Y = TMALLOC(double, size);
delta_iI_delta_Y = TMALLOC(double, size);
num_vars = 0;
@ -165,7 +165,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
return OK; /* XXXX Should be E_ something */
k = 0;
output_names = NEWN(IFuid, num_vars);
output_names = TMALLOC(IFuid, num_vars);
for (sg = sgen_init(ckt, is_dc); sg; sgen_next(&sg)) {
if (!sg->is_instparam) {
sprintf(namebuf, "%s:%s",
@ -203,11 +203,11 @@ int sens_sens(CKTcircuit *ckt, int restart)
FREE(output_names);
if (is_dc) {
output_values = NEWN(double, num_vars);
output_values = TMALLOC(double, num_vars);
output_cvalues = NULL;
} else {
output_values = NULL;
output_cvalues = NEWN(IFcomplex, num_vars);
output_cvalues = TMALLOC(IFcomplex, num_vars);
if (job->step_type != SENS_LINEAR)
SPfrontEnd->OUTattributes (sen_data, NULL, OUT_SCALE_LOG, NULL);

View File

@ -198,7 +198,7 @@ DCpss(CKTcircuit *ckt,
ckt->CKTtimeListSize = (int)(1 / ckt->CKTguessedFreq / maxstepsize + 0.5);
ltra_num = CKTtypelook("LTRA");
if (ltra_num >= 0 && ckt->CKThead[ltra_num] != NULL)
ckt->CKTtimePoints = NEWN(double, ckt->CKTtimeListSize);
ckt->CKTtimePoints = TMALLOC(double, ckt->CKTtimeListSize);
/* end LTRA code addition */
/* Breakpoints initialization */

View File

@ -128,7 +128,7 @@ DCtran(CKTcircuit *ckt,
ckt->CKTtimeListSize = (int) ceil( ckt->CKTfinalTime / maxstepsize );
ltra_num = CKTtypelook("LTRA");
if (ltra_num >= 0 && ckt->CKThead[ltra_num] != NULL)
ckt->CKTtimePoints = NEWN(double, ckt->CKTtimeListSize);
ckt->CKTtimePoints = TMALLOC(double, ckt->CKTtimeListSize);
/* end LTRA code addition */
if(ckt->CKTbreaks) FREE(ckt->CKTbreaks);

View File

@ -31,8 +31,8 @@ ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt)
FREE(asrc_derivs);
}
asrc_nvals = i;
asrc_vals = NEWN(double, i);
asrc_derivs = NEWN(double, i);
asrc_vals = TMALLOC(double, i);
asrc_derivs = TMALLOC(double, i);
}
for (i = 0; i < here->ASRCtree->numVars; i++)

View File

@ -49,8 +49,8 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt)
FREE(asrc_derivs);
}
asrc_nvals = i;
asrc_vals = NEWN(double, i);
asrc_derivs = NEWN(double, i);
asrc_vals = TMALLOC(double, i);
asrc_derivs = TMALLOC(double, i);
}
j = 0;
@ -76,7 +76,7 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt)
/* The ac load precomputation and storage */
if (ckt->CKTmode & MODEINITSMSIG) {
int size = here->ASRCtree->numVars + 1;
here->ASRCacValues = NEWN(double, size);
here->ASRCacValues = TMALLOC(double, size);
for (i = 0; i < here->ASRCtree->numVars; i++)
here->ASRCacValues[i] = asrc_derivs[i];
}

View File

@ -48,8 +48,8 @@ ASRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
FREE(asrc_derivs);
}
asrc_nvals = i;
asrc_vals = NEWN(double, i);
asrc_derivs = NEWN(double, i);
asrc_vals = TMALLOC(double, i);
asrc_derivs = TMALLOC(double, i);
}
/* Fill the vector of values from the previous solution */