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

Reverting "NUMDdump(): add binary mode" 

This reverts commit 40e8f868da
This commit is contained in:
rlar 2012-05-06 14:06:33 +02:00
parent d8105873db
commit e598598d70
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/spicelib/devices/numd/numddump.c
View File

@ -69,7 +69,7 @@ NUMDdump(GENmodel *inModel, CKTcircuit *ckt)
anyOutput = 1;
sprintf(fileName, "%s%s.%d.%s", output->OUTProotFile, prefix,
*state_num, inst->NUMDname);
if ((fpState = fopen(fileName, "wb")) == NULL) {
if ((fpState = fopen(fileName, "w")) == NULL) {
perror(fileName);
} else {
NUMDputHeader(fpState, ckt, inst);
@ -124,28 +124,14 @@ NUMDputHeader(FILE *file, CKTcircuit *ckt, NUMDinstance *inst)
fprintf(file, "\t%d i1 current\n", numVars++);
fprintf(file, "\t%d i2 current\n", numVars++);
fprintf(file, "\t%d g11 conductance\n", numVars++);
if (0/*AsciiRawFile*/) {
fprintf(file, "Values:\n0");
if (reference) {
fprintf(file, "\t% e\n", refVal);
}
fprintf(file, "\t% e\n", *(ckt->CKTstate0 + inst->NUMDvoltage));
fprintf(file, "\t% e\n", *(ckt->CKTstate0 + inst->NUMDid));
fprintf(file, "\t% e\n", - *(ckt->CKTstate0 + inst->NUMDid));
fprintf(file, "\t% e\n", *(ckt->CKTstate0 + inst->NUMDconduct));
}
else {
double tmpval = - *(ckt->CKTstate0 + inst->NUMDid);
fprintf(file, "Binary:\n");
if (reference) {
fwrite(&refVal, sizeof (double), 1, file);
}
fwrite((ckt->CKTstate0 + inst->NUMDvoltage), sizeof (double), 1, file);
fwrite((ckt->CKTstate0 + inst->NUMDid), sizeof (double), 1, file);
fwrite(&tmpval, sizeof (double), 1, file);
fwrite((ckt->CKTstate0 + inst->NUMDconduct), sizeof (double), 1, file);
fprintf(file, "Values:\n0");
if (reference) {
fprintf(file, "\t% e\n", refVal);
}
fprintf(file, "\t% e\n", *(ckt->CKTstate0 + inst->NUMDvoltage));
fprintf(file, "\t% e\n", *(ckt->CKTstate0 + inst->NUMDid));
fprintf(file, "\t% e\n", - *(ckt->CKTstate0 + inst->NUMDid));
fprintf(file, "\t% e\n", *(ckt->CKTstate0 + inst->NUMDconduct));
}
void