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

Fixed a bug in CKTtrunc reduction when there is nothing to reduce

This commit is contained in:
Francesco Lannutti 2015-09-16 19:54:26 +02:00 committed by rlar
parent dcb62b8259
commit fb1fb2deb4
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/spicelib/analysis/CUSPICE/cuckttrunc.cu
View File

@ -54,6 +54,13 @@ CKTcircuit *ckt, double timetemp, double *timeStep
cudaDeviceSynchronize () ; cudaDeviceSynchronize () ;
status = cudaGetLastError () ; // check for launch error
if (status != cudaSuccess)
{
fprintf (stderr, "Kernel 1 launch failure in cuCKTtrunc\n\n") ;
return (E_NOMEM) ;
}
cuCKTtrunc_kernel <<< 1, thread, thread_y * sizeof(double) >>> (ckt->d_CKTtimeStepsOut, ckt->d_CKTtimeSteps, block_x) ; cuCKTtrunc_kernel <<< 1, thread, thread_y * sizeof(double) >>> (ckt->d_CKTtimeStepsOut, ckt->d_CKTtimeSteps, block_x) ;
cudaDeviceSynchronize () ; cudaDeviceSynchronize () ;
@ -61,7 +68,7 @@ CKTcircuit *ckt, double timetemp, double *timeStep
status = cudaGetLastError () ; // check for launch error status = cudaGetLastError () ; // check for launch error
if (status != cudaSuccess) if (status != cudaSuccess)
{ {
fprintf (stderr, "Kernel launch failure in cuCKTtrunc\n\n") ; fprintf (stderr, "Kernel 2 launch failure in cuCKTtrunc\n\n") ;
return (E_NOMEM) ; return (E_NOMEM) ;
} }

23
src/spicelib/analysis/ckttrunc.c
View File

@ -33,8 +33,16 @@ CKTtrunc (CKTcircuit *ckt, double *timeStep)
double startTime ; double startTime ;
int error = OK ; int error = OK ;
#ifdef USE_CUSPICE
int doReduction, status ;
#endif
startTime = SPfrontEnd->IFseconds () ; startTime = SPfrontEnd->IFseconds () ;
#ifdef USE_CUSPICE
doReduction = 0 ;
#endif
timetemp = HUGE ; timetemp = HUGE ;
for (i = 0 ; i < DEVmaxnum ; i++) for (i = 0 ; i < DEVmaxnum ; i++)
{ {
@ -45,6 +53,10 @@ CKTtrunc (CKTcircuit *ckt, double *timeStep)
debugtemp = timetemp ; debugtemp = timetemp ;
#endif /* STEPDEBUG */ #endif /* STEPDEBUG */
#ifdef USE_CUSPICE
doReduction = 1 ;
#endif
error = DEVices[i]->DEVtrunc (ckt->CKThead[i], ckt, &timetemp) ; error = DEVices[i]->DEVtrunc (ckt->CKThead[i], ckt, &timetemp) ;
if (error) if (error)
{ {
@ -63,11 +75,12 @@ CKTtrunc (CKTcircuit *ckt, double *timeStep)
} }
#ifdef USE_CUSPICE #ifdef USE_CUSPICE
int status ; if (doReduction)
{
status = cuCKTtrunc (ckt, HUGE, timeStep) ; status = cuCKTtrunc (ckt, HUGE, timeStep) ;
if (status != 0) if (status != 0)
return (E_NOMEM) ; return (E_NOMEM) ;
}
#else #else
*timeStep = MIN (2 * *timeStep, timetemp) ; *timeStep = MIN (2 * *timeStep, timetemp) ;
#endif #endif