luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

frontend/rawfile.c, raw_read(), reorder

This commit is contained in:
rlar 2015-12-22 16:15:41 +01:00
parent 88414a58ce
commit 814c51659e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontend/rawfile.c
View File

@ -464,18 +464,24 @@ raw_read(char *name) {
}
/* Now read all the variable lines in. */
for (i = 0; i < nvars; i++) {
/* Allocate the data array. We would use
* the desired vector length, but this would
* be dangerous if the file is invalid.
*/
v = alloc(struct dvec);
ZERO(v, struct dvec);
v->v_type = SV_NOTYPE;
v->v_flags = (short)flags;
v->v_length = npoints;
if (isreal(v))
v->v_realdata = TMALLOC(double, npoints);
else
v->v_compdata = TMALLOC(ngcomplex_t, npoints);
v->v_numdims = 0;
/* Length and dims might be changed by options. */
v->v_plot = curpl;
v->v_next = curpl->pl_dvecs;
curpl->pl_dvecs = v;
if (!curpl->pl_scale)
curpl->pl_scale = v;
@ -537,14 +543,9 @@ raw_read(char *name) {
for (j = 0; j < numdims; j++)
v->v_dims[j] = dims[j];
}
/* And allocate the data array. We would use
* the desired vector length, but this would
* be dangerous if the file is invalid.
*/
if (isreal(v))
v->v_realdata = TMALLOC(double, npoints);
else
v->v_compdata = TMALLOC(ngcomplex_t, npoints);
v->v_next = curpl->pl_dvecs;
curpl->pl_dvecs = v;
}
} else if (ciprefix("values:", buf) || ciprefix("binary:", buf)) {