From 291106ac9491c6bcdeeadc9a12e467c53472697e Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 17 Apr 2015 22:33:37 +0200 Subject: [PATCH] reorder --- src/spicelib/devices/cap/capload.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/spicelib/devices/cap/capload.c b/src/spicelib/devices/cap/capload.c index d6796d5b2..8f86b6206 100644 --- a/src/spicelib/devices/cap/capload.c +++ b/src/spicelib/devices/cap/capload.c @@ -26,14 +26,12 @@ CAPload(GENmodel *inModel, CKTcircuit *ckt) int error; double m; + /* evaluate device independent analysis conditions */ + cond1 = ((ckt->CKTmode & MODEDC) && (ckt->CKTmode & MODEINITJCT)) + || ((ckt->CKTmode & MODEUIC) && (ckt->CKTmode & MODEINITTRAN)); + /* check if capacitors are in the circuit or are open circuited */ if(ckt->CKTmode & (MODETRAN|MODEAC|MODETRANOP) ) { - /* evaluate device independent analysis conditions */ - cond1= - ( ( (ckt->CKTmode & MODEDC) && - (ckt->CKTmode & MODEINITJCT) ) - || ( ( ckt->CKTmode & MODEUIC) && - ( ckt->CKTmode & MODEINITTRAN) ) ) ; /* loop through all the capacitor models */ for( ; model != NULL; model = model->CAPnextModel ) {