From 7ffd8a46db8ce58bad136f8df4cbc6a198fec4e7 Mon Sep 17 00:00:00 2001 From: mkrylova Date: Wed, 4 Aug 2021 14:24:32 +0300 Subject: [PATCH] # fixed initialization --- src/AdvApp2Var/AdvApp2Var_ApproxF2var.cxx | 35 ++++++++++++----------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/AdvApp2Var/AdvApp2Var_ApproxF2var.cxx b/src/AdvApp2Var/AdvApp2Var_ApproxF2var.cxx index 305c570298..d4bc9fcc93 100644 --- a/src/AdvApp2Var/AdvApp2Var_ApproxF2var.cxx +++ b/src/AdvApp2Var/AdvApp2Var_ApproxF2var.cxx @@ -3316,6 +3316,7 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen, integer ilong; intptr_t iofwr; doublereal* wrkar = 0; + doublereal* wrkar_off; integer iszwr; integer ibb, ier = 0; integer isz1, isz2, isz3, isz4; @@ -3505,7 +3506,7 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen, if (ier > 0) { goto L9013; } - double* wrkar_offset = reinterpret_cast(iofwr + wrkar); + wrkar_off = reinterpret_cast(iofwr + wrkar); ipt1 = isz1; ipt2 = ipt1 + isz2; ipt3 = ipt2 + isz3; @@ -3515,7 +3516,7 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen, /* --- Return 2*(IORDRU+1) coeff of 2*(IORDRU+1) polynoms of Hermite --- */ - AdvApp2Var_ApproxF2var::mma1her_(iordru, wrkar_offset, iercod); + AdvApp2Var_ApproxF2var::mma1her_(iordru, wrkar_off, iercod); if (*iercod > 0) { goto L9100; } @@ -3524,7 +3525,7 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen, ---- */ mma2cd3_(ndimen, nbpntu, &urootl[1], nbpntv, iordru, &sotbu1[1], - &sotbu2[1], &ditbu1[1], &ditbu2[1], &wrkar_offset[ipt2], wrkar_offset, + &sotbu2[1], &ditbu1[1], &ditbu2[1], &wrkar_off[ipt2], wrkar_off, &sosotb[sosotb_offset], &soditb[soditb_offset], &disotb[disotb_offset], &diditb[diditb_offset]); } @@ -3534,7 +3535,7 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen, /* --- Return 2*(IORDRV+1) coeff of 2*(IORDRV+1) polynoms of Hermite --- */ - AdvApp2Var_ApproxF2var::mma1her_(iordrv, &wrkar_offset[ipt1], iercod); + AdvApp2Var_ApproxF2var::mma1her_(iordrv, &wrkar_off[ipt1], iercod); if (*iercod > 0) { goto L9100; } @@ -3543,7 +3544,7 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen, ---- */ mma2cd2_(ndimen, nbpntu, nbpntv, &vrootl[1], iordrv, &sotbv1[1], - &sotbv2[1], &ditbv1[1], &ditbv2[1], &wrkar_offset[ipt3], &wrkar_offset[ipt1], + &sotbv2[1], &ditbv1[1], &ditbv2[1], &wrkar_off[ipt3], &wrkar_off[ipt1], &sosotb[sosotb_offset], &soditb[soditb_offset], &disotb[disotb_offset], &diditb[diditb_offset]); } @@ -3554,8 +3555,8 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen, if (*iordru >= 0 && *iordrv >= 0) { mma2cd1_(ndimen, nbpntu, &urootl[1], nbpntv, &vrootl[1], iordru, iordrv, &contr1[contr1_offset], &contr2[contr2_offset], - &contr3[contr3_offset], &contr4[contr4_offset], &wrkar_offset[ipt2], - &wrkar_offset[ipt3], wrkar_offset, &wrkar_offset[ipt1], + &contr3[contr3_offset], &contr4[contr4_offset], &wrkar_off[ipt2], + &wrkar_off[ipt3], wrkar_off, &wrkar_off[ipt1], &sosotb[sosotb_offset], &soditb[soditb_offset], &disotb[disotb_offset], &diditb[diditb_offset]); } @@ -3630,6 +3631,7 @@ int AdvApp2Var_ApproxF2var::mma2ce1_(integer *numdec, logical ldbg; intptr_t iofwr; doublereal* wrkar = 0; + doublereal* wrkar_off; integer iszwr; integer ier; integer isz1, isz2, isz3, isz4, isz5, isz6, isz7; @@ -3796,7 +3798,7 @@ int AdvApp2Var_ApproxF2var::mma2ce1_(integer *numdec, iszwr = isz1 + isz2 + isz3 + isz4 + isz5 + isz6 + isz7; AdvApp2Var_SysBase anAdvApp2Var_SysBase; anAdvApp2Var_SysBase.mcrrqst_(&c__8, &iszwr, wrkar, &iofwr, &ier); - double* wrkar_offset = reinterpret_cast (iofwr + wrkar); + wrkar_off = reinterpret_cast (iofwr + wrkar); if (ier > 0) { goto L9013; } @@ -3810,11 +3812,11 @@ int AdvApp2Var_ApproxF2var::mma2ce1_(integer *numdec, /* ----------------- Return Gauss coefficients of integration ---------------- */ - AdvApp2Var_ApproxF2var::mmapptt_(ndjacu, nbpntu, iordru, wrkar_offset, iercod); + AdvApp2Var_ApproxF2var::mmapptt_(ndjacu, nbpntu, iordru, wrkar_off, iercod); if (*iercod > 0) { goto L9999; } - AdvApp2Var_ApproxF2var::mmapptt_(ndjacv, nbpntv, iordrv, &wrkar_offset[ipt1], iercod); + AdvApp2Var_ApproxF2var::mmapptt_(ndjacv, nbpntv, iordrv, &wrkar_off[ipt1], iercod); if (*iercod > 0) { goto L9999; } @@ -3822,8 +3824,8 @@ int AdvApp2Var_ApproxF2var::mma2ce1_(integer *numdec, /* ------------------- Return max polynoms of Jacobi ------------ */ - AdvApp2Var_ApproxF2var::mma2jmx_(ndjacu, iordru, &wrkar_offset[ipt5]); - AdvApp2Var_ApproxF2var::mma2jmx_(ndjacv, iordrv, &wrkar_offset[ipt5]); + AdvApp2Var_ApproxF2var::mma2jmx_(ndjacu, iordru, &wrkar_off[ipt5]); + AdvApp2Var_ApproxF2var::mma2jmx_(ndjacv, iordrv, &wrkar_off[ipt5]); /* ------ Calculate the coefficients and their contribution to the error ---- */ @@ -3831,9 +3833,9 @@ int AdvApp2Var_ApproxF2var::mma2ce1_(integer *numdec, mma2ce2_(numdec, ndimen, nbsesp, &ndimse[1], ndminu, ndminv, ndguli, ndgvli, ndjacu, ndjacv, iordru, iordrv, nbpntu, nbpntv, &epsapr[1], &sosotb[sosotb_offset], &disotb[disotb_offset], &soditb[soditb_offset], - &diditb[diditb_offset], wrkar_offset, &wrkar_offset[ipt1], - &wrkar_offset[ipt4], &wrkar_offset[ipt5], &wrkar_offset[ipt6], &wrkar_offset[ipt2], - &wrkar_offset[ipt3], &patjac[patjac_offset], &errmax[1], &errmoy[1], ndegpu, + &diditb[diditb_offset], wrkar_off, &wrkar_off[ipt1], + &wrkar_off[ipt4], &wrkar_off[ipt5], &wrkar_off[ipt6], &wrkar_off[ipt2], + &wrkar_off[ipt3], &patjac[patjac_offset], &errmax[1], &errmoy[1], ndegpu, ndegpv, itydec, iercod); if (*iercod > 0) { goto L9999; @@ -6167,6 +6169,7 @@ int AdvApp2Var_ApproxF2var::mma2fnc_(integer *ndimen, integer ideb1, ibid1, ibid2, ncfja, ndgre, ilong, ndwrk; doublereal* wrkar = 0; + doublereal* wrkar_off; integer nupil; intptr_t iofwr; doublereal uvpav[4] /* was [2][2] */; @@ -6427,7 +6430,7 @@ int AdvApp2Var_ApproxF2var::mma2fnc_(integer *ndimen, ndwrk = isz1 + isz2 + isz3 + isz4 + isz5; anAdvApp2Var_SysBase.mcrrqst_(&c__8, &ndwrk, wrkar, &iofwr, &ier); - double* wrkar_off = reinterpret_cast(iofwr + wrkar); + wrkar_off = reinterpret_cast(iofwr + wrkar); if (ier > 0) { goto L9013; } /* --> For the parameters of discretisation (NBROOT+2 extremities). */ -- 2.39.5