From 8d584d067f784e8e3f615202373354ad4c881899 Mon Sep 17 00:00:00 2001 From: Luke Shingles Date: Sat, 26 Oct 2024 05:40:00 +0100 Subject: [PATCH] Update kpkt.cc --- kpkt.cc | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/kpkt.cc b/kpkt.cc index c5df06603..2b84e9b66 100644 --- a/kpkt.cc +++ b/kpkt.cc @@ -463,7 +463,8 @@ __host__ __device__ void do_kpkt(Packet &pkt, const double t2, const int nts) { } const int ilow = get_coolinglistoffset(element, ion); - const int ihigh = ilow + get_ncoolingterms_ion(element, ion) - 1; + const int ncoolingterms_ion = get_ncoolingterms_ion(element, ion); + const int ihigh = ilow + ncoolingterms_ion - 1; double C_ion_procsum = globals::cellcache[cellcacheslotid].cooling_contrib[ihigh]; if (C_ion_procsum < 0.) { @@ -490,17 +491,8 @@ __host__ __device__ void do_kpkt(Packet &pkt, const double t2, const int nts) { if (i > ihigh) { printout("do_kpkt: error occurred while selecting a cooling channel: low %d, high %d, i %td, rndcool %g\n", ilow, ihigh, i, rndcool_ion_process); - printout("element %d, ion %d, offset %d, terms %d, coolingsum %g\n", element, ion, - get_coolinglistoffset(element, ion), get_ncoolingterms_ion(element, ion), coolingsum); - - printout("lower %g, %g, %g\n", - globals::cellcache[cellcacheslotid].cooling_contrib[get_coolinglistoffset(element, ion) - 1], - globals::cellcache[cellcacheslotid].cooling_contrib[get_coolinglistoffset(element, ion)], - globals::cellcache[cellcacheslotid].cooling_contrib[get_coolinglistoffset(element, ion) + 1]); - const int finalpos = get_coolinglistoffset(element, ion) + get_ncoolingterms_ion(element, ion) - 1; - printout("upper %g, %g, %g\n", globals::cellcache[cellcacheslotid].cooling_contrib[finalpos - 1], - globals::cellcache[cellcacheslotid].cooling_contrib[finalpos], - globals::cellcache[cellcacheslotid].cooling_contrib[finalpos + 1]); + printout("element %d, ion %d, offset %d, terms %d, coolingsum %g\n", element, ion, ilow, ncoolingterms_ion, + coolingsum); } assert_always(i <= ihigh);