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

backup NEWCONV because of using original BSIM code

This commit is contained in:
dwarning 2008-04-16 20:20:49 +00:00
parent c241af9864
commit 0e52a0fcc2
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/include/macros.h
View File

@ -12,6 +12,12 @@
#ifndef _MACROS_H_
#define _MACROS_H_
/*
* #define-s that are always on
*/
#define NEWCONV
#define NUMELEMS(ARRAY) (sizeof(ARRAY)/sizeof(*ARRAY))
/* String macros */
@ -77,16 +83,16 @@
times(&buffer); \
time = buffer.user / 60.0; \
}
#ifdef HAVE_SIGSETJMP
# define SETJMP(env, save_signals) sigsetjmp(env, save_signals)
# define LONGJMP(env, retval) siglongjmp(env, retval)
# define JMP_BUF sigjmp_buf
#else
# define SETJMP(env, save_signals) setjmp(env)
# define LONGJMP(env, retval) longjmp(env, retval)
# define JMP_BUF jmp_buf
#endif
#ifdef HAVE_SIGSETJMP
# define SETJMP(env, save_signals) sigsetjmp(env, save_signals)
# define LONGJMP(env, retval) siglongjmp(env, retval)
# define JMP_BUF sigjmp_buf
#else
# define SETJMP(env, save_signals) setjmp(env)
# define LONGJMP(env, retval) longjmp(env, retval)
# define JMP_BUF jmp_buf
#endif
#endif /* _MACROS_H_ */

5
src/spicelib/devices/hisim/hsm1ld.c
View File

@ -169,11 +169,10 @@ int HSM1load(GENmodel *inModel, register CKTcircuit *ckt)
double tempv;
#endif /*NOBYPASS*/
int tmp;
/* spice3f4 defined NEWCONV by default, looking to niconv.c
#ifndef NEWCONV
double tol, tol2, tol3, tol4;
#endif
*/
int ChargeComputationNeeded =
((ckt->CKTmode & (MODEAC | MODETRAN | MODEINITSMSIG)) ||
((ckt->CKTmode & MODETRANOP) && (ckt->CKTmode & MODEUIC)))
@ -911,7 +910,6 @@ int HSM1load(GENmodel *inModel, register CKTcircuit *ckt)
if (Check == 1) {
ckt->CKTnoncon++;
isConv = 0;
/* spice3f4 defined NEWCONV by default, looking to niconv.c
#ifndef NEWCONV
}
else {
@ -951,7 +949,6 @@ int HSM1load(GENmodel *inModel, register CKTcircuit *ckt)
}
}
#endif
*/
}
}
*(ckt->CKTstate0 + here->HSM1vbs) = vbs;