From 9661c4cca69810333fbb48d719e652d6e23a74db Mon Sep 17 00:00:00 2001 From: rlar Date: Wed, 20 Sep 2017 18:26:13 +0200 Subject: [PATCH] whitespace for "introduce rcxxx limiting as long as adms can't node collapsing" --- .../devices/adms/mextram/admsva/evaluate.inc | 126 +++++++++--------- .../devices/adms/mextram/admsva/frontdef.inc | 6 +- .../devices/adms/mextram/admsva/tscaling.inc | 6 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/spicelib/devices/adms/mextram/admsva/evaluate.inc b/src/spicelib/devices/adms/mextram/admsva/evaluate.inc index e7a01f9f3..f67486930 100644 --- a/src/spicelib/devices/adms/mextram/admsva/evaluate.inc +++ b/src/spicelib/devices/adms/mextram/admsva/evaluate.inc @@ -33,32 +33,32 @@ begin // Currents and charges Vc4c1 = TYPE * V(c4, c1); Vc3c4 = TYPE * V(c3, c4); `else -if (RCBLX > 0.0) - begin - if (RCBLI > 0.0) - begin - Vc4c1 = TYPE * V(c4, c1); - Vc3c4 = TYPE * V(c3, c4); - end - else - begin - Vc4c1 = 0 ; - Vc3c4 = TYPE * V(c3, c1); - end - end -else - begin - if (RCBLI > 0.0) - begin - Vc4c1 = TYPE * V(c4, c1); - Vc3c4 = 0 ; - end - else - begin - Vc4c1 = 0 ; - Vc3c4 = 0 ; - end - end + if (RCBLX > 0.0) + begin + if (RCBLI > 0.0) + begin + Vc4c1 = TYPE * V(c4, c1); + Vc3c4 = TYPE * V(c3, c4); + end + else + begin + Vc4c1 = 0 ; + Vc3c4 = TYPE * V(c3, c1); + end + end + else + begin + if (RCBLI > 0.0) + begin + Vc4c1 = TYPE * V(c4, c1); + Vc3c4 = 0 ; + end + else + begin + Vc4c1 = 0 ; + Vc3c4 = 0 ; + end + end `endif Vb1c4 = Vb1b2 + Vb2c2 - Vc1c2 - Vc4c1 ; @@ -143,7 +143,7 @@ Vsc3 = Vsc4 - Vc3c4 ; end else begin - Iqs = 0.0 ; + Iqs = 0.0 ; p0star = 2.0 * eVb2c2VDC / (1.0 + K0); eVb2c2star = eVb2c2; if ((abs(Vc1c2) < 1.0e-5 * Vt) || @@ -611,45 +611,45 @@ and perform a node-collapse in such cases. */ if (RCBLX > 0.0) begin I(b, c3) <+ TYPE * XIex; - I(c, c3) <+ TYPE * Vcc3 * GCCxx_TM ; - I(b, c3) <+ ddt(TYPE * (XQtex + XQex)); - if (RCBLI > 0.0) - begin - I(c4, c1) <+ TYPE * Vc4c1 * GCCin_TM; - I(b1, c4) <+ TYPE * (Ib3 + Iex); - I(c3, c4) <+ TYPE * Vc3c4 * GCCex_TM ; - I(b1, c4) <+ ddt(TYPE * (Qtex + Qex)); + I(c, c3) <+ TYPE * Vcc3 * GCCxx_TM ; + I(b, c3) <+ ddt(TYPE * (XQtex + XQex)); + if (RCBLI > 0.0) + begin + I(c4, c1) <+ TYPE * Vc4c1 * GCCin_TM; + I(b1, c4) <+ TYPE * (Ib3 + Iex); + I(c3, c4) <+ TYPE * Vc3c4 * GCCex_TM ; + I(b1, c4) <+ ddt(TYPE * (Qtex + Qex)); + end + else + begin + V(c4, c1) <+ 0.0 ; + I(b1, c1) <+ TYPE * (Ib3 + Iex); + I(b1, c1) <+ ddt(TYPE * (Qtex + Qex)); + I(c3, c1) <+ TYPE * Vc3c4 * GCCex_TM ; + end end else begin - V(c4, c1) <+ 0.0 ; - I(b1, c1) <+ TYPE * (Ib3 + Iex); - I(b1, c1) <+ ddt(TYPE * (Qtex + Qex)); - I(c3, c1) <+ TYPE * Vc3c4 * GCCex_TM ; + V(c3, c4) <+ 0 ; + if (RCBLI > 0.0) + begin + I(b, c4) <+ TYPE * XIex; + I(c, c4) <+ TYPE * Vcc3 * GCCxx_TM ; + I(c4, c1) <+ TYPE * Vc4c1 * GCCin_TM; + I(b1, c4) <+ TYPE * (Ib3 + Iex); + I(b1, c4) <+ ddt(TYPE * (Qtex + Qex)); + I(b, c4) <+ ddt(TYPE * (XQtex + XQex)); + end + else + begin + I(b, c1) <+ TYPE * XIex; + I(c, c1) <+ TYPE * Vcc3 * GCCxx_TM ; + V(c4, c1) <+ 0.0 ; + I(b1, c1) <+ TYPE * (Ib3 + Iex); + I(b1, c1) <+ ddt(TYPE * (Qtex + Qex)); + I(b, c1) <+ ddt(TYPE * (XQtex + XQex)); + I(c3, c1) <+ TYPE * Vc3c4 * GCCex_TM ; + end end - end -else - begin - V(c3, c4) <+ 0 ; - if (RCBLI > 0.0) - begin - I(b, c4) <+ TYPE * XIex; - I(c, c4) <+ TYPE * Vcc3 * GCCxx_TM ; - I(c4, c1) <+ TYPE * Vc4c1 * GCCin_TM; - I(b1, c4) <+ TYPE * (Ib3 + Iex); - I(b1, c4) <+ ddt(TYPE * (Qtex + Qex)); - I(b, c4) <+ ddt(TYPE * (XQtex + XQex)); - end - else - begin - I(b, c1) <+ TYPE * XIex; - I(c, c1) <+ TYPE * Vcc3 * GCCxx_TM ; - V(c4, c1) <+ 0.0 ; - I(b1, c1) <+ TYPE * (Ib3 + Iex); - I(b1, c1) <+ ddt(TYPE * (Qtex + Qex)); - I(b, c1) <+ ddt(TYPE * (XQtex + XQex)); - I(c3, c1) <+ TYPE * Vc3c4 * GCCex_TM ; - end - end `endif diff --git a/src/spicelib/devices/adms/mextram/admsva/frontdef.inc b/src/spicelib/devices/adms/mextram/admsva/frontdef.inc index 4098d7c89..b2136db5e 100644 --- a/src/spicelib/devices/adms/mextram/admsva/frontdef.inc +++ b/src/spicelib/devices/adms/mextram/admsva/frontdef.inc @@ -44,9 +44,9 @@ `define INSTANCE @(initial_instance) `define NOISE @(noise) `else -`define MODEL -`define INSTANCE -`define NOISE + `define MODEL + `define INSTANCE + `define NOISE `endif // Smooth limitting functions diff --git a/src/spicelib/devices/adms/mextram/admsva/tscaling.inc b/src/spicelib/devices/adms/mextram/admsva/tscaling.inc index 401c87797..c5e27d255 100644 --- a/src/spicelib/devices/adms/mextram/admsva/tscaling.inc +++ b/src/spicelib/devices/adms/mextram/admsva/tscaling.inc @@ -92,9 +92,9 @@ else RCCin_T = `MIN_R * exp(lntN * ACBL); `else - RCCxx_T = RCC * exp(lntN * AC); - RCCex_T = RCBLX * exp(lntN * ACBL); - RCCin_T = RCBLI * exp(lntN * ACBL); + RCCxx_T = RCC * exp(lntN * AC); + RCCex_T = RCBLX * exp(lntN * ACBL); + RCCin_T = RCBLI * exp(lntN * ACBL); `endif RCV_T = RCV * exp(lntN * AEPI);