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

comments added

This commit is contained in:
h_vogt 2009-11-17 22:51:55 +00:00
parent 1cfd7d82fe
commit 3f0b344a82
2 changed files with 170 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2009-11-17 Holger Vogt
* runcoms.c: comments added
2009-11-17 Dietmar Warning
* configure.in: add search for strings.h because AC_HEADER_STDC isn't sufficient
* com_measure2.c, 116: remove empty statement

69
src/frontend/runcoms.c
View File

@ -34,7 +34,7 @@ static int dosim(char *what, wordlist *wl);
* resume, stop, trace, run, end. Op, tran, ac, and dc cause the action
* to be performed immediately, and run causes whatever actions were
* present in the deck to be carried out. End has the effect of stopping
* any simulations in progress, as opposed to ending te input deck as
* any simulations in progress, as opposed to ending the input deck as
* the .end line does.
*/
@ -46,6 +46,7 @@ char rawfileBuf[RAWBUF_SIZE];
char *last_used_rawfile = NULL;
/*end saj */
/* command "setcirc" */
void
com_scirc(wordlist *wl)
{
@ -165,16 +166,27 @@ com_noise(wordlist *wl)
}
static int
dosim(char *what, wordlist *wl)
dosim(
char *what, /* in: command (pz,op,dc,ac,tf,tran,sens,disto,noise,run) */
wordlist *wl /* in: command option */
/* global variables in: ft_curckt, ft_circuits,
out: ft_setflag, ft_intrpt, rawfileFp, rawfileBinary,
last_used_rawfile
*/
)
{
wordlist *ww = NULL;
bool dofile = FALSE;
char buf[BSIZE_SP];
struct circ *ct;
int err = 0;
/* set file type to binary or to what is given by environmental
variable SPICE_ASCIIRAWFILE in ivars.c */
bool ascii = AsciiRawFile;
if (eq(what, "run") && wl)
dofile = TRUE;
/* add "what" to beginning of wordlist wl, except "what" equals "run"
and a rawfile name is given (in wl) */
if (!dofile) {
ww = alloc(struct wordlist);
ww->wl_next = wl;
@ -182,16 +194,17 @@ dosim(char *what, wordlist *wl)
wl->wl_prev = ww;
ww->wl_word = copy(what);
}
/* reset output file type according to variable given in spinit */
if (cp_getvar("filetype", VT_STRING, buf)) {
if (eq(buf, "binary"))
ascii = FALSE;
else if (eq(buf, "ascii"))
ascii = TRUE;
else
else {
fprintf(cp_err,
"Warning: strange file type \"%s\" (using \"ascii\")\n",
buf);
"Warning: strange file type \"%s\" (using \"ascii\")\n", buf);
ascii = TRUE;
}
}
if (!ft_curckt) {
@ -208,6 +221,7 @@ dosim(char *what, wordlist *wl)
ct->ci_name);
ct->ci_inprogress = FALSE;
}
/* "resume" will never occur in ngspice */
if (ft_curckt->ci_inprogress && eq(what, "resume")) {
ft_setflag = TRUE; /* don't allow abort upon interrupt during run */
ft_intrpt = FALSE;
@ -223,6 +237,7 @@ dosim(char *what, wordlist *wl)
*/
ft_setflag = TRUE; /* Don't allow abort upon interrupt during run. */
ft_intrpt = FALSE;
/* command "run" is given with rawfile name in wl */
if (dofile) {
#ifdef PARALLEL_ARCH
if (ARCHme == 0) {
@ -230,7 +245,7 @@ dosim(char *what, wordlist *wl)
if (!*wl->wl_word)
rawfileFp = stdout;
#if defined(__MINGW32__) || defined(_MSC_VER)
/* ask if binary or ASCII, open file with w or wb hvogt 15.3.2000 */
/* ask if binary or ASCII, open file with wb or w */
else if (ascii) {
if(!(rawfileFp = fopen(wl->wl_word, "w"))) {
perror(wl->wl_word);
@ -266,7 +281,7 @@ dosim(char *what, wordlist *wl)
rawfileFp = NULL;
}
/*save rawfile name saj*/
/*save rawfile name */
if(last_used_rawfile)
tfree(last_used_rawfile);
if(rawfileFp){
@ -274,14 +289,12 @@ dosim(char *what, wordlist *wl)
} else {
last_used_rawfile = NULL;
}
/*end saj*/
/* Spice calls wrd_init and wrd_end itself */
ft_curckt->ci_inprogress = TRUE;
/* "sens2" not used in ngspice */
if (eq(what,"sens2")) {
if (if_sens_run(ft_curckt->ci_ckt, ww, ft_curckt->ci_symtab) == 1) {
/* The circuit was interrupted somewhere. */
fprintf(cp_err, "%s simulation interrupted\n", what);
#ifdef XSPICE
/* gtri - add - 12/12/90 - wbk - record error and return errchk */
@ -292,13 +305,14 @@ dosim(char *what, wordlist *wl)
#endif
} else
ft_curckt->ci_inprogress = FALSE;
/* Do a run of the circuit */
} else {
err = if_run(ft_curckt->ci_ckt, what, ww, ft_curckt->ci_symtab);
if (err == 1) {
/* The circuit was interrupted somewhere. */
fprintf(cp_err, "%s simulation interrupted\n", what);
#ifdef XSPICE
/* gtri - add - 12/12/90 - wbk - record error and return errchk */
/* record error and return errchk */
g_ipc.run_error = IPC_TRUE;
if(g_ipc.enabled)
ipc_send_errchk();
@ -312,7 +326,7 @@ dosim(char *what, wordlist *wl)
} else
ft_curckt->ci_inprogress = FALSE;
}
/* close the rawfile */
if (rawfileFp){
if (ftell(rawfileFp)==0) {
(void) fclose(rawfileFp);
@ -332,14 +346,13 @@ dosim(char *what, wordlist *wl)
tfree(ww);
}
/* execute the .measure statements */
if ( !err && ft_curckt->ci_last_an) do_measure( ft_curckt->ci_last_an, FALSE );
return err;
}
/* Usage is run [filename] Do the wrd_{open,run} and wrd_(void) close
* here, and let the CKT stuff do wrd_init and wrd_end.
*/
/* Usage is run [filename] */
void
com_run(wordlist *wl)
@ -365,35 +378,11 @@ ft_dorun(char *file)
bool
ft_getOutReq(FILE **fpp, struct plot **plotp, bool *binp, char *name, char *title)
{
/*struct plot *pl;*/
/* PN: the following code prevents operating point an AC analysis
* dump in the rawfile -- it is still needed ?
*/
/* #ifndef BATCH
if ( (strcmp(name, "Operating Point")==0) ||
(strcmp(name, "AC Operating Point")==0) ) {
return (FALSE);
};
#endif */
if (rawfileFp) {
*fpp = rawfileFp;
*binp = rawfileBinary;
return (TRUE);
} else {
/*
pl = plot_alloc(name);
pl->pl_title = copy(title);
pl->pl_name = copy(name);
pl->pl_date = copy(datestring( ));
pl->pl_next = plot_list;
plot_list = pl;
plot_cur = pl;
*plotp = pl;
*/
return (FALSE);
}
}