From 06e86cc3f580c651d08827c8c6bb29ca5454c4e1 Mon Sep 17 00:00:00 2001 From: Giovanni La Mura Date: Fri, 13 Jun 2025 12:00:42 +0200 Subject: [PATCH] Clean up outdated commented code lines --- src/libnptm/clu_subs.cpp | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/src/libnptm/clu_subs.cpp b/src/libnptm/clu_subs.cpp index 7bd73b10..0e3a55ba 100644 --- a/src/libnptm/clu_subs.cpp +++ b/src/libnptm/clu_subs.cpp @@ -1312,13 +1312,13 @@ void pcros(double vk, double exri, ParticleDescriptor *c1) { nvtxRangePush("whole pcros"); #endif const dcomplex cc0 = 0.0 + 0.0 * I; - dcomplex sump, sum1, sum2, sum3, sum4, am, amp, cc, csam; + dcomplex sump, sum1, sum2, sum3, sum4, cc, csam; const double exdc = exri * exri; double ccs = 1.0 / (vk * vk); double cccs = ccs / exdc; csam = -(ccs / (exri * vk)) * 0.5 * I; const double pi4sq = 64.0 * acos(0.0) * acos(0.0); - double cfsq = 4.0 / (pi4sq *ccs * ccs); + double cfsq = 4.0 / (pi4sq * ccs * ccs); const int nlemt = c1->nlem + c1->nlem; int jpo = 2; dcomplex *vec_am0m = c1->am0m[0]; @@ -1373,7 +1373,6 @@ void pcros(double vk, double exri, ParticleDescriptor *c1) { c1->sac[jpo][ipo18] = csam * sum4; } // ipo18 loop int i = 0; - dcomplex * &vint = c1->vint; #ifdef USE_NVTX nvtxRangePush("pcros loop 2"); #endif @@ -2003,28 +2002,26 @@ void raba( dcomplex c1 = cc0; dcomplex c2 = cc0; #ifdef USE_NVTX - nvtxRangePush("raba inner loop 1"); + nvtxRangePush("raba inner loop 1"); #endif #ifdef USE_TARGET_OFFLOAD #pragma omp target teams distribute parallel for simd reduction(+:c1, c2) #else #pragma omp parallel for simd reduction(+:c1, c2) #endif - for (int j10 = 1; j10 <= nlemt; j10++) { + for (int j10 = 1; j10 <= nlemt; j10++) { int j = j10 - 1; c1 += (vec_am0m[i*nlemt+j] * vec_w[4*j]); c2 += (vec_am0m[i*nlemt+j] * vec_w[4*j+1]); } // j10 loop #ifdef USE_NVTX - nvtxRangePop(); + nvtxRangePop(); #endif vec_a[2*i] = c1; vec_a[2*i+1] = c2; } //i20 loop #ifdef USE_NVTX nvtxRangePop(); -#endif -#ifdef USE_NVTX nvtxRangePush("raba outer loop 2"); #endif #ifdef USE_TARGET_OFFLOAD @@ -2086,7 +2083,7 @@ void raba( int ie = i + nlem; int mmmu = m + 1; int mmmmu = (mmmu > 0) ? mmmu : -mmmu; - double rmu = 0.0; + double rmu = 0.0; dcomplex acw; dcomplex acwp; dcomplex aca; @@ -2246,15 +2243,11 @@ void scr0(double vk, double exri, ParticleDescriptor *c1) { c1->sqabs[i14 - 1] = abssec / gcss; c1->fsas[i14 - 1] = sum21 * csam; } - // label 12 - // scs += c1->sscs[iogi - 1]; - // ecs += c1->sexs[iogi - 1]; - // acs += c1->sabs[iogi - 1]; - // tfsas += c1->fsas[iogi - 1]; } // i14 loop #ifdef USE_NVTX nvtxRangePop(); #endif + // label 12 double scs = 0.0; double ecs = 0.0; double acs = 0.0; @@ -2367,16 +2360,11 @@ void scr2( vec_sas[vecindex+1] = s12 * csam; vec_sas[vecindex+3] = s22 * csam; } - // label 12 - // dcomplex phas = cexp(cph * (duk[0] * c1->rxx[i] + duk[1] * c1->ryy[i] + duk[2] * c1->rzz[i])); - // tsas00 += (c1->sas[iogi - 1][0][0] * phas); - // tsas10 += (c1->sas[iogi - 1][1][0] * phas); - // tsas01 += (c1->sas[iogi - 1][0][1] * phas); - // tsas11 += (c1->sas[iogi - 1][1][1] * phas); } // i14 loop #ifdef USE_NVTX nvtxRangePop(); #endif + // label 12 dcomplex tsas00 = cc0; dcomplex tsas10 = cc0; dcomplex tsas01 = cc0; @@ -2405,9 +2393,7 @@ void scr2( c1->tsas[1][1] = tsas11; #ifdef USE_NVTX nvtxRangePop(); - //#endif - //dcomplex *vec_vints = c1->vints[0]; - //#ifdef USE_NVTX + nvtxRangePush("scr2 outer loop 3"); #endif #pragma omp parallel for -- GitLab