From 6d3ab5945ec3ad74fcd0467715e02f52063dd9e6 Mon Sep 17 00:00:00 2001 From: Jim Monte Date: Sat, 25 Apr 2020 19:33:13 +0200 Subject: [PATCH] variable redefinition removed --- src/spicelib/devices/cpl/cplload.c | 17 ++++++++------- src/spicelib/devices/cpl/cplsetup.c | 32 ++++++++++++++--------------- src/spicelib/devices/txl/txlload.c | 17 ++++++++------- 3 files changed, 31 insertions(+), 35 deletions(-) diff --git a/src/spicelib/devices/cpl/cplload.c b/src/spicelib/devices/cpl/cplload.c index 9a8e06ba9..3f5aef254 100644 --- a/src/spicelib/devices/cpl/cplload.c +++ b/src/spicelib/devices/cpl/cplload.c @@ -789,45 +789,44 @@ errordetect: } -static int -update_delayed_cnv(CPLine *cp, double h) +static int update_delayed_cnv(CPLine *cp, double h) { int i, j, k; - double *ratio; + double *ratio1; double f; VI_list *vi; TMS *tms; int noL; h *= 0.5e-12; - ratio = cp->ratio; + ratio1 = cp->ratio; vi = cp->vi_tail; noL = cp->noL; for (k = 0; k < noL; k++) /* mode */ - if (ratio[k] > 0.0) + if (ratio1[k] > 0.0) for (i = 0; i < noL; i++) /* current eqn */ for (j = 0; j < noL; j++) { tms = cp->h3t[i][j][k]; if (tms == NULL) continue; - f = h * ratio[k] * vi->v_i[j]; + f = h * ratio1[k] * vi->v_i[j]; tms->tm[0].cnv_i += f * tms->tm[0].c; tms->tm[1].cnv_i += f * tms->tm[1].c; tms->tm[2].cnv_i += f * tms->tm[2].c; - f = h * ratio[k] * vi->v_o[j]; + f = h * ratio1[k] * vi->v_o[j]; tms->tm[0].cnv_o += f * tms->tm[0].c; tms->tm[1].cnv_o += f * tms->tm[1].c; tms->tm[2].cnv_o += f * tms->tm[2].c; tms = cp->h2t[i][j][k]; - f = h * ratio[k] * vi->i_i[j]; + f = h * ratio1[k] * vi->i_i[j]; tms->tm[0].cnv_i += f * tms->tm[0].c; tms->tm[1].cnv_i += f * tms->tm[1].c; tms->tm[2].cnv_i += f * tms->tm[2].c; - f = h * ratio[k] * vi->i_o[j]; + f = h * ratio1[k] * vi->i_o[j]; tms->tm[0].cnv_o += f * tms->tm[0].c; tms->tm[1].cnv_o += f * tms->tm[1].c; tms->tm[2].cnv_o += f * tms->tm[2].c; diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index cff29580a..3913e6d83 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -1061,14 +1061,14 @@ loop_ZY(int dim, double y) static void poly_matrix( - double *A[MAX_DIM][MAX_DIM], + double *A_in[MAX_DIM][MAX_DIM], int dim, int deg) { int i, j; for (i = 0; i < dim; i++) for (j = 0; j < dim; j++) - match(deg, A[i][j], frequency, A[i][j]); + match(deg, A_in[i][j], frequency, A_in[i][j]); } /*** @@ -1464,10 +1464,9 @@ mult_p(double *p1, double *p2, double *p3, int d1, int d2, int d3) } -static void -matrix_p_mult( - double *A[MAX_DIM][MAX_DIM], - double *D[MAX_DIM], +static void matrix_p_mult( + double *A_in[MAX_DIM][MAX_DIM], + double *D1[MAX_DIM], double *B[MAX_DIM][MAX_DIM], int dim, int deg, int deg_o, Mult_Out X[MAX_DIM][MAX_DIM]) @@ -1480,14 +1479,14 @@ matrix_p_mult( for (i = 0; i < dim; i++) for (j = 0; j < dim; j++) { p = T[i][j] = (double *) calloc((size_t) (deg_o+1), sizeof(double)); - mult_p(B[i][j], D[i], p, deg, deg_o, deg_o); + mult_p(B[i][j], D1[i], p, deg, deg_o, deg_o); } for (i = 0; i < dim; i++) for (j = 0; j < dim; j++) for (k = 0; k < dim; k++) { p = X[i][j].Poly[k] = (double *) calloc((size_t) (deg_o+1), sizeof(double)); - mult_p(A[i][k], T[k][j], p, deg, deg_o, deg_o); + mult_p(A_in[i][k], T[k][j], p, deg, deg_o, deg_o); t1 = X[i][j].C_0[k] = p[0]; if (t1 != 0.0) { p[0] = 1.0; @@ -1523,7 +1522,7 @@ matrix_p_mult( ***/ static double -approx_mode(double *X, double *b, double length) +approx_mode(double *X, double *b, double length_in) { double w0, w1, w2, w3, w4, w5; double a[8]; @@ -1545,7 +1544,7 @@ approx_mode(double *X, double *b, double length) y5 = 60.0 * w5 - 5.0 * y1 * y4 -10.0 * y2 * y3; y6 = -10.0 * y3 * y3 - 15.0 * y2 * y4 - 6.0 * y1 * y5; - delay = sqrt(w0) * length / Scaling_F; + delay = sqrt(w0) * length_in / Scaling_F; atten = exp(- delay * y1); a[1] = y2 / 2.0; @@ -2080,8 +2079,7 @@ diag(int dims) rotate() rotation of the Jacobi's method ****************************************************************/ -static int -rotate(int dim, int p, int q) +static int rotate(int dim_in, int p, int q) { int j; double co, si; @@ -2095,12 +2093,12 @@ rotate(int dim, int p, int q) co = sqrt((ve + ABS(mu)) / (2.0 * ve)); si = SGN(mu) * ld / (2.0 * ve * co); - for (j = p+1; j < dim; j++) + for (j = p+1; j < dim_in; j++) T[j] = ZY[p][j]; for (j = 0; j < p; j++) T[j] = ZY[j][p]; - for (j = p+1; j < dim; j++) { + for (j = p+1; j < dim_in; j++) { if (j == q) continue; if (j > q) @@ -2108,7 +2106,7 @@ rotate(int dim, int p, int q) else ZY[p][j] = T[j] * co - ZY[j][q] * si; } - for (j = q+1; j < dim; j++) { + for (j = q+1; j < dim_in; j++) { if (j == p) continue; ZY[q][j] = T[j] * si + ZY[q][j] * co; @@ -2133,12 +2131,12 @@ rotate(int dim, int p, int q) { double R[MAX_DIM]; - for (j = 0; j < dim; j++) { + for (j = 0; j < dim_in; j++) { T[j] = Sv[j][p]; R[j] = Sv[j][q]; } - for (j = 0; j < dim; j++) { + for (j = 0; j < dim_in; j++) { Sv[j][p] = T[j] * co - R[j] * si; Sv[j][q] = T[j] * si + R[j] * co; } diff --git a/src/spicelib/devices/txl/txlload.c b/src/spicelib/devices/txl/txlload.c index 22a0d66df..9926bf975 100644 --- a/src/spicelib/devices/txl/txlload.c +++ b/src/spicelib/devices/txl/txlload.c @@ -609,21 +609,20 @@ right_consts_txl(TXLine *tx, int t, int time, double h, double h1, int l1, int l } -static int -update_delayed_cnv_txl(TXLine *tx, double h) +static int update_delayed_cnv_txl(TXLine *tx, double h) { - double ratio; + double ratio1; double f; VI_list_txl *vi; TERM *tms; h *= 0.5e-12; - ratio = tx->ratio; + ratio1 = tx->ratio; vi = tx->vi_tail; - if (ratio > 0.0) { + if (ratio1 > 0.0) { tms = tx->h3_term; - f = h * ratio * vi->v_i; + f = h * ratio1 * vi->v_i; tms[0].cnv_i += f * tms[0].c; tms[1].cnv_i += f * tms[1].c; tms[2].cnv_i += f * tms[2].c; @@ -631,7 +630,7 @@ update_delayed_cnv_txl(TXLine *tx, double h) tms[4].cnv_i += f * tms[4].c; tms[5].cnv_i += f * tms[5].c; - f = h * ratio * vi->v_o; + f = h * ratio1 * vi->v_o; tms[0].cnv_o += f * tms[0].c; tms[1].cnv_o += f * tms[1].c; tms[2].cnv_o += f * tms[2].c; @@ -640,12 +639,12 @@ update_delayed_cnv_txl(TXLine *tx, double h) tms[5].cnv_o += f * tms[5].c; tms = tx->h2_term; - f = h * ratio * vi->i_i; + f = h * ratio1 * vi->i_i; tms[0].cnv_i += f * tms[0].c; tms[1].cnv_i += f * tms[1].c; tms[2].cnv_i += f * tms[2].c; - f = h * ratio * vi->i_o; + f = h * ratio1 * vi->i_o; tms[0].cnv_o += f * tms[0].c; tms[1].cnv_o += f * tms[1].c; tms[2].cnv_o += f * tms[2].c;