Browse Source

Remove all entries related to CLUSTER,

an old, never finished attempt to run transient in parallel.
pre-master-46
Holger Vogt 5 months ago
parent
commit
f929b0c9b3
  1. 46
      src/spicelib/analysis/dctran.c

46
src/spicelib/analysis/dctran.c

@ -28,10 +28,6 @@ extern struct dbcomm *dbs;
#include "ngspice/ipctiein.h" #include "ngspice/ipctiein.h"
#endif #endif
#ifdef CLUSTER
#include "ngspice/cluster.h"
#endif
#ifdef SHARED_MODULE #ifdef SHARED_MODULE
extern int add_bkpt(void); extern int add_bkpt(void);
extern int sharedsync(double*, double*, double, double, double, int, int*, int); extern int sharedsync(double*, double*, double, double, double, int, int*, int);
@ -120,9 +116,9 @@ DCtran(CKTcircuit *ckt,
#ifdef SHARED_MODULE #ifdef SHARED_MODULE
double olddelta_for_shared_sync = 0.0; double olddelta_for_shared_sync = 0.0;
#endif // SHARED_MODULE
#endif #endif
#if defined CLUSTER || defined SHARED_MODULE
#endif
#if defined SHARED_MODULE
int redostep; int redostep;
#endif #endif
if(restart || ckt->CKTtime == 0) { if(restart || ckt->CKTtime == 0) {
@ -344,9 +340,7 @@ DCtran(CKTcircuit *ckt,
#endif #endif
INIT_STATS(); INIT_STATS();
#ifdef CLUSTER
CLUsetup(ckt);
#endif
/* End of (restart || ckt->CKTtime == 0) */ /* End of (restart || ckt->CKTtime == 0) */
} else { } else {
/* traninit resets CKTmode */ /* traninit resets CKTmode */
@ -469,9 +463,7 @@ DCtran(CKTcircuit *ckt,
/* End of Send IPC stuff*/ /* End of Send IPC stuff*/
} else } else
#endif #endif
#ifdef CLUSTER
CLUoutput(ckt);
#endif
if((ckt->CKTmode&MODEUIC && ckt->CKTtime > 0 && ckt->CKTtime >= ckt->CKTinitTime) if((ckt->CKTmode&MODEUIC && ckt->CKTtime > 0 && ckt->CKTtime >= ckt->CKTinitTime)
|| (!(ckt->CKTmode&MODEUIC) && ckt->CKTtime >= ckt->CKTinitTime)) || (!(ckt->CKTmode&MODEUIC) && ckt->CKTtime >= ckt->CKTinitTime))
CKTdump(ckt, ckt->CKTtime, job->TRANplot); CKTdump(ckt, ckt->CKTtime, job->TRANplot);
@ -684,13 +676,6 @@ resume:
#else /* no XSPICE */ #else /* no XSPICE */
#ifdef CLUSTER
if(!CLUsync(ckt->CKTtime,&ckt->CKTdelta,0)) {
printf("Sync error!\n");
exit(0);
}
#endif /* CLUSTER */
#ifdef SHARED_MODULE #ifdef SHARED_MODULE
/* Either directly go to next time step, or modify ckt->CKTdelta depending on /* Either directly go to next time step, or modify ckt->CKTdelta depending on
synchronization requirements. sharedsync() returns 0. synchronization requirements. sharedsync() returns 0.
@ -712,7 +697,7 @@ resume:
/* 600 */ /* 600 */
for (;;) { for (;;) {
#if defined CLUSTER || defined SHARED_MODULE
#if defined SHARED_MODULE
redostep = 1; redostep = 1;
#endif #endif
#ifdef XSPICE #ifdef XSPICE
@ -725,9 +710,6 @@ resume:
olddelta=ckt->CKTdelta; olddelta=ckt->CKTdelta;
/* time abort? */ /* time abort? */
ckt->CKTtime += ckt->CKTdelta; ckt->CKTtime += ckt->CKTdelta;
#ifdef CLUSTER
CLUinput(ckt);
#endif
ckt->CKTdeltaOld[0]=ckt->CKTdelta; ckt->CKTdeltaOld[0]=ckt->CKTdelta;
NIcomCof(ckt); NIcomCof(ckt);
#ifdef PREDICTOR #ifdef PREDICTOR
@ -772,13 +754,12 @@ resume:
/* If no convergence in Central solver step */ /* If no convergence in Central solver step */
if(converged != 0) { if(converged != 0) {
#ifndef CLUSTER
#ifndef SHARED_MODULE #ifndef SHARED_MODULE
ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta; ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta;
ckt->CKTstat->STATrejected ++; ckt->CKTstat->STATrejected ++;
#else #else
redostep = 1; redostep = 1;
#endif
#endif #endif
ckt->CKTdelta = ckt->CKTdelta/8; ckt->CKTdelta = ckt->CKTdelta/8;
#ifdef STEPDEBUG #ifdef STEPDEBUG
@ -832,7 +813,7 @@ resume:
} }
#endif #endif
firsttime = 0; firsttime = 0;
#if !defined CLUSTER && !defined SHARED_MODULE
#if !defined SHARED_MODULE
/* no check on first time point */ /* no check on first time point */
goto nextTime; /* line 373 */ goto nextTime; /* line 373 */
#else #else
@ -919,7 +900,7 @@ resume:
} }
#endif #endif
#if !defined CLUSTER && !defined SHARED_MODULE
#if !defined SHARED_MODULE
/* trapezoidal */ /* trapezoidal */
goto nextTime; /* line 373 */ goto nextTime; /* line 373 */
#else #else
@ -930,13 +911,11 @@ resume:
/* not (newdelta > .9 * ckt->CKTdelta): reject the step /* not (newdelta > .9 * ckt->CKTdelta): reject the step
- redo the time - redo the time
- apply the new (reduced) delta */ - apply the new (reduced) delta */
#ifndef CLUSTER
#ifndef SHARED_MODULE #ifndef SHARED_MODULE
ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta; ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta;
ckt->CKTstat->STATrejected ++; ckt->CKTstat->STATrejected ++;
#else #else
redostep = 1; redostep = 1;
#endif
#endif #endif
ckt->CKTdelta = newdelta; ckt->CKTdelta = newdelta;
#ifdef STEPDEBUG #ifdef STEPDEBUG
@ -986,15 +965,6 @@ resume:
} }
#endif #endif
#ifdef CLUSTER
chkStep:
if(CLUsync(ckt->CKTtime,&ckt->CKTdelta,redostep)){
goto nextTime;
} else {
ckt->CKTtime -= olddelta;
ckt->CKTstat->STATrejected ++;
}
#endif
#ifdef SHARED_MODULE #ifdef SHARED_MODULE
/* redostep == 0: /* redostep == 0:

Loading…
Cancel
Save