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

separate progress report from having Windows GUI

This commit is contained in:
h_vogt 2013-03-23 11:03:08 +01:00 committed by rlar
parent 5a44b3f7f8
commit df65fa28cf
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/inp.c
View File

@ -492,7 +492,7 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
Go on if there is something left after the controls.*/ Go on if there is something left after the controls.*/
if (deck->li_next) { if (deck->li_next) {
fprintf(cp_out, "\nCircuit: %s\n\n", tt); fprintf(cp_out, "\nCircuit: %s\n\n", tt);
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
SetAnalyse("Prepare Deck", 0); SetAnalyse("Prepare Deck", 0);
#endif #endif
/* Now expand subcircuit macros and substitute numparams.*/ /* Now expand subcircuit macros and substitute numparams.*/

2
src/frontend/measure.c
View File

@ -221,7 +221,7 @@ do_measure(
wordlist *measure_word_list; wordlist *measure_word_list;
int precision = measure_get_precision(); int precision = measure_get_precision();
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
if (!chk_only) if (!chk_only)
SetAnalyse("meas", 0); SetAnalyse("meas", 0);
#endif #endif

2
src/frontend/spec.c
View File

@ -264,7 +264,7 @@ com_spec(wordlist *wl)
fdvec[i][j].cx_imag += value*sina; fdvec[i][j].cx_imag += value*sina;
} }
} }
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
SetAnalyse("spec", (int)(j * 1000./ fpts)); SetAnalyse("spec", (int)(j * 1000./ fpts));
#endif #endif
} }

4
src/spicelib/analysis/acan.c
View File

@ -341,7 +341,7 @@ ACan(CKTcircuit *ckt, int restart)
case OCTAVE: case OCTAVE:
/* inserted again 14.12.2001 */ /* inserted again 14.12.2001 */
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
{ {
double endfreq = job->ACstopFreq; double endfreq = job->ACstopFreq;
double startfreq = job->ACstartFreq; double startfreq = job->ACstartFreq;
@ -360,7 +360,7 @@ ACan(CKTcircuit *ckt, int restart)
break; break;
case LINEAR: case LINEAR:
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
{ {
double endfreq = job->ACstopFreq; double endfreq = job->ACstopFreq;
double startfreq = job->ACstartFreq; double startfreq = job->ACstartFreq;

2
src/spicelib/analysis/cktop.c
View File

@ -22,7 +22,7 @@ CKTop (CKTcircuit * ckt, long int firstmode, long int continuemode,
int iterlim) int iterlim)
{ {
int converged; int converged;
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
SetAnalyse("op", 0); SetAnalyse("op", 0);
#endif #endif
ckt->CKTmode = firstmode; ckt->CKTmode = firstmode;

2
src/spicelib/analysis/cktsetup.c
View File

@ -68,7 +68,7 @@ CKTsetup(CKTcircuit *ckt)
#endif #endif
for (i=0;i<DEVmaxnum;i++) { for (i=0;i<DEVmaxnum;i++) {
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
SetAnalyse( "Device Setup", 0 ); SetAnalyse( "Device Setup", 0 );
#endif #endif
if ( DEVices[i] && DEVices[i]->DEVsetup && ckt->CKThead[i] ) { if ( DEVices[i] && DEVices[i]->DEVsetup && ckt->CKThead[i] ) {

2
src/spicelib/analysis/dcpss.c
View File

@ -1147,7 +1147,7 @@ resume:
} }
} }
#endif #endif
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
if (ckt->CKTtime == 0.) if (ckt->CKTtime == 0.)
SetAnalyse( "tran init", 0); SetAnalyse( "tran init", 0);
else if ((pss_state != PSS) && (shooting_cycle_counter > 0)) else if ((pss_state != PSS) && (shooting_cycle_counter > 0))

2
src/spicelib/analysis/dctran.c
View File

@ -504,7 +504,7 @@ resume:
} }
} }
#endif #endif
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
if (ckt->CKTtime == 0.) if (ckt->CKTtime == 0.)
SetAnalyse( "tran init", 0); SetAnalyse( "tran init", 0);
else else

6
src/spicelib/analysis/dctrcurv.c
View File

@ -24,7 +24,7 @@ Modified: 1999 Paolo Nenzi
#include "ngspice/devdefs.h" #include "ngspice/devdefs.h"
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
static double actval, actdiff; static double actval, actdiff;
#endif #endif
@ -166,7 +166,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
found:; found:;
} }
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
actval = job->TRCVvStart[job->TRCVnestLevel]; actval = job->TRCVvStart[job->TRCVnestLevel];
actdiff = job->TRCVvStart[job->TRCVnestLevel] - job->TRCVvStop[job->TRCVnestLevel]; actdiff = job->TRCVvStart[job->TRCVnestLevel] - job->TRCVvStop[job->TRCVnestLevel];
#endif #endif
@ -518,7 +518,7 @@ nextstep:;
job->TRCVnestState = i; job->TRCVnestState = i;
return(E_PAUSE); return(E_PAUSE);
} }
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
if (i == job->TRCVnestLevel) { if (i == job->TRCVnestLevel) {
actval += job->TRCVvStep[job->TRCVnestLevel]; actval += job->TRCVvStep[job->TRCVnestLevel];
SetAnalyse( "dc", abs((int)(actval * 1000. / actdiff))); SetAnalyse( "dc", abs((int)(actval * 1000. / actdiff)));

6
src/spicelib/parser/inppas2.c
View File

@ -32,7 +32,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
char *gname; char *gname;
CKTnode *gnode; CKTnode *gnode;
int error; /* used by the macros defined above */ int error; /* used by the macros defined above */
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
int linecount = 0, actcount = 0; int linecount = 0, actcount = 0;
#endif #endif
@ -68,7 +68,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
#endif #endif
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
for (current = data; current != NULL; current = current->nextcard) for (current = data; current != NULL; current = current->nextcard)
linecount++; linecount++;
#endif #endif
@ -80,7 +80,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
printf("In INPpas2, examining card %s . . .\n", current->line); printf("In INPpas2, examining card %s . . .\n", current->line);
#endif #endif
#ifdef HAS_WINGUI #ifdef HAS_PROGREP
if (linecount > 0) { if (linecount > 0) {
SetAnalyse( "Circuit2", (int) (1000.*actcount/linecount)); SetAnalyse( "Circuit2", (int) (1000.*actcount/linecount));
actcount++; actcount++;