Browse Source

simplify #ifdef nesting #1/4

pre-master-46
rlar 13 years ago
parent
commit
b1a2eef4d0
  1. 9
      src/spicelib/analysis/dcpss.c
  2. 9
      src/spicelib/analysis/dctran.c

9
src/spicelib/analysis/dcpss.c

@ -1206,6 +1206,12 @@ resume:
#endif
}
#ifndef XSPICE
/* don't want to get below delmin for no reason */
ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
}
#endif
#ifdef XSPICE
}
@ -1251,9 +1257,6 @@ resume:
/* gtri - end - wbk - Modify Breakpoint stuff */
#else /* !XSPICE */
/* don't want to get below delmin for no reason */
ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
}
else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
ckt->CKTsaveDelta = ckt->CKTdelta;
ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;

9
src/spicelib/analysis/dctran.c

@ -561,6 +561,12 @@ resume:
#endif
}
#ifndef XSPICE
/* don't want to get below delmin for no reason */
ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
}
#endif
#ifdef XSPICE
}
@ -606,9 +612,6 @@ resume:
/* gtri - end - wbk - Modify Breakpoint stuff */
#else /* !XSPICE */
/* don't want to get below delmin for no reason */
ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
}
else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
ckt->CKTsaveDelta = ckt->CKTdelta;
ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;

Loading…
Cancel
Save