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

Revert "Reading CIDER "Device Cross Section" failed if written in ASCII." 

This reverts commit 4a907749a6.
This commit is contained in:
Holger Vogt 2021-09-17 15:00:48 +02:00
parent 2ebed3f747
commit 6b12971fc6
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/rawfile.c
View File

@ -325,7 +325,7 @@ raw_read(char *name) {
char *date = NULL; char *date = NULL;
struct plot *plots = NULL, *curpl = NULL; struct plot *plots = NULL, *curpl = NULL;
char buf[BSIZE_SP], *s, *t, *r; char buf[BSIZE_SP], *s, *t, *r;
int flags = 0, nvars = 0, npoints = 0, i, j, k; int flags = 0, nvars = 0, npoints = 0, i, j;
int ndimpoints, numdims = 0, dims[MAXDIMS]; int ndimpoints, numdims = 0, dims[MAXDIMS];
bool raw_padded = TRUE, is_ascii = FALSE; bool raw_padded = TRUE, is_ascii = FALSE;
double junk; double junk;
@ -618,16 +618,6 @@ raw_read(char *name) {
fprintf(cp_err, "Error: unable to read point count\n"); fprintf(cp_err, "Error: unable to read point count\n");
break; break;
} }
#ifdef CIDER
/* special for 2D CIDER: read second point count,
written by TWOprnSolution() in twoprint.c, line 323 */
if (eq(curpl->pl_name, "Device Cross Section")) {
if (fscanf(fp, " %d", &k) != 1) {
fprintf(cp_err, "Error: unable to read second point count\n");
break;
}
}
#endif
for (v = curpl->pl_dvecs; v; v = v->v_next) { for (v = curpl->pl_dvecs; v; v = v->v_next) {
if (i < v->v_length) { if (i < v->v_length) {
if (flags & VF_REAL) { if (flags & VF_REAL) {