Browse Source

dcpss.c : compatibility to MS Visual Studio C

vngspice.vcproj, config.h: add PSS to Vc project
pre-master-46
h_vogt 13 years ago
parent
commit
0ecd633334
  1. 10
      src/spicelib/analysis/dcpss.c
  2. 3
      visualc/include/ngspice/config.h
  3. 16
      visualc/vngspice.vcproj

10
src/spicelib/analysis/dcpss.c

@ -628,6 +628,8 @@ DCpss(CKTcircuit *ckt,
case SHOOTING:
{
double offset, interval, nextBreak ;
int i ;
/* Calculation of error norms of RHS solution of every accepted nextTime */
err = 0 ;
for (i = 0 ; i < msize ; i++)
@ -685,9 +687,9 @@ DCpss(CKTcircuit *ckt,
/* Force the tran analysis to evaluate requested breakpoints. Breakpoints are even more closer as
the next occurence of guessed period is approaching. La lunga notte dei robot viventi... */
double offset, interval, nextBreak ;
/* double offset, interval, nextBreak ;
int i ;
*/
if ((ckt->CKTtime > time_temp + (1 / ckt->CKTguessedFreq) * 0.995) && (ckt->CKTtime <= time_temp + (1 / ckt->CKTguessedFreq)))
{
offset = time_temp + (1 / ckt->CKTguessedFreq) * 0.995 ;
@ -740,6 +742,8 @@ DCpss(CKTcircuit *ckt,
/* If evolution is near shooting... */
if ((AlmostEqualUlps (ckt->CKTtime, time_temp + 1 / ckt->CKTguessedFreq, 10)) || (ckt->CKTtime > time_temp + 1 / ckt->CKTguessedFreq))
{
int excessive_err_nodes = 0 ;
/* Calculation of error norms of RHS solution of every accepted nextTime */
predsum = 0 ;
for (i = 0 ; i < msize ; i++)
@ -769,7 +773,7 @@ DCpss(CKTcircuit *ckt,
}
int excessive_err_nodes = 0 ;
// int excessive_err_nodes = 0 ;
if (shooting_cycle_counter == 0)
{

3
visualc/include/ngspice/config.h

@ -538,6 +538,9 @@
/* Define if we want spice2 sensitivity analysis */
/* #undef WANT_SENSE2 */
/* Define if you want PSS analysis */
#define WITH_PSS /**/
/* The xspice enhancements */
#define XSPICE 1

16
visualc/vngspice.vcproj

@ -5248,6 +5248,10 @@
RelativePath="..\src\spicelib\analysis\dcosetp.c"
>
</File>
<File
RelativePath="..\src\spicelib\analysis\dcpss.c"
>
</File>
<File
RelativePath="..\src\spicelib\analysis\dctaskq.c"
>
@ -7856,6 +7860,18 @@
RelativePath="..\src\spicelib\devices\jfet2\psmodel.c"
>
</File>
<File
RelativePath="..\src\spicelib\analysis\pssaskq.c"
>
</File>
<File
RelativePath="..\src\spicelib\analysis\pssinit.c"
>
</File>
<File
RelativePath="..\src\spicelib\analysis\psssetp.c"
>
</File>
<File
RelativePath="..\src\spicelib\parser\ptfuncs.c"
>

Loading…
Cancel
Save