Skip to content

Commit

Permalink
Add thermalisation scheme DETAILEDWITHGAMMAPRODUCTS
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeshingles committed Sep 17, 2024
1 parent d6608c2 commit 5a52180
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 26 deletions.
2 changes: 1 addition & 1 deletion constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ constexpr size_t GSLWSIZE = 16384; // GSL integration workspace size

enum class TimeStepSizeMethod { LOGARITHMIC, CONSTANT, LOGARITHMIC_THEN_CONSTANT, CONSTANT_THEN_LOGARITHMIC };

enum class ThermalisationScheme { INSTANT, DETAILED, BARNES, WOLLAEGER, GUTTMAN };
enum class ThermalisationScheme { INSTANT, DETAILED, DETAILEDWITHGAMMAPRODUCTS, BARNES, WOLLAEGER, GUTTMAN };

#endif
45 changes: 34 additions & 11 deletions gammapkt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,13 @@ void compton_scatter(Packet &pkt) {

pkt.last_cross = BOUNDARY_NONE; // allow it to re-cross a boundary
} else {
// It's converted to an e-minus packet.
pkt.type = TYPE_NTLEPTON_DEPOSITED;
// energy loss of the gamma becomes energy of the electron (needed to calculate time-dependent thermalisation rate)
if constexpr (PARTICLE_THERMALISATION_SCHEME == ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS) {
pkt.nu_cmf = pkt.nu_cmf * (1 - 1 / f);
pkt.type = TYPE_NONTHERMAL_PREDEPOSIT_BETAMINUS;
} else {
pkt.type = TYPE_NTLEPTON_DEPOSITED;
}
pkt.absorptiontype = -3;
stats::increment(stats::COUNTER_NT_STAT_FROM_GAMMA);
}
Expand Down Expand Up @@ -632,6 +637,9 @@ void update_gamma_dep(const Packet &pkt, const double dist, const int mgi, const
if (!(dist > 0)) {
return;
}
if constexpr (PARTICLE_THERMALISATION_SCHEME == ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS) {
return; // don't instantly deposit energy from gamma rays, handle the particles they produce instead
}

const double doppler_sq = doppler_squared_nucmf_on_nurf(pkt.pos, pkt.dir, pkt.prop_time);

Expand Down Expand Up @@ -666,10 +674,16 @@ void pair_prod(Packet &pkt) {

assert_always(prob_gamma >= 0);

if (rng_uniform() > prob_gamma) {
// Convert it to an e-minus packet - actually it could be positron EK too, but this works
// for consistency with compton_scatter.
pkt.type = TYPE_NTLEPTON_DEPOSITED;
const auto zrand = rng_uniform();
if (zrand > prob_gamma) {
if constexpr (PARTICLE_THERMALISATION_SCHEME == ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS) {
// Convert it to an e-minus or positron kinetic energy packet
pkt.type = (rng_uniform() > 0.5) ? TYPE_NONTHERMAL_PREDEPOSIT_BETAMINUS : TYPE_NONTHERMAL_PREDEPOSIT_BETAPLUS;
} else {
pkt.type = TYPE_NTLEPTON_DEPOSITED;
}

// nu_cmf stays the same as the gamma energy becomes the kinetic energy of the electron
pkt.absorptiontype = -5;
stats::increment(stats::COUNTER_NT_STAT_FROM_GAMMA);
} else {
Expand Down Expand Up @@ -809,16 +823,22 @@ void transport_gamma(Packet &pkt, const double t2) {
// Compton scattering.
compton_scatter(pkt);
} else if ((chi_compton + chi_photo_electric) > chi_rnd) {
// Photo electric effect - makes it a k-packet for sure.
pkt.type = TYPE_NTLEPTON_DEPOSITED;
// Photo electric effect
if constexpr (PARTICLE_THERMALISATION_SCHEME == ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS) {
pkt.type = TYPE_NONTHERMAL_PREDEPOSIT_BETAMINUS;
// nu_cmf stays the same as the gamma-ray energy becomes the kinetic energy of the electron (minus ionisation
// energy but this is neglected here)
} else {
pkt.type = TYPE_NTLEPTON_DEPOSITED;
}

pkt.absorptiontype = -4;
stats::increment(stats::COUNTER_NT_STAT_FROM_GAMMA);
} else {
// It's a pair production
pair_prod(pkt);
}
} else {
printout("Failed to identify event. Gamma (2). edist %g, sdist %g, tdist %g Abort.\n", edist, sdist, tdist);
assert_always(false);
}
}
Expand Down Expand Up @@ -1055,9 +1075,12 @@ __host__ __device__ void do_gamma(Packet &pkt, const int nts, const double t2) {
}

if (pkt.type != TYPE_GAMMA && pkt.type != TYPE_ESCAPE) {
atomicadd(globals::timesteps[nts].gamma_dep_discrete, pkt.e_cmf);
if constexpr (PARTICLE_THERMALISATION_SCHEME != ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS) {
atomicadd(globals::timesteps[nts].gamma_dep_discrete, pkt.e_cmf);
}

if constexpr (GAMMA_THERMALISATION_SCHEME != ThermalisationScheme::DETAILED) {
if constexpr (GAMMA_THERMALISATION_SCHEME != ThermalisationScheme::DETAILED &&
GAMMA_THERMALISATION_SCHEME != ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS) {
// no transport, so the path-based gamma deposition estimator won't get updated unless we do it here
const int mgi = grid::get_cell_modelgridindex(pkt.where);
const int nonemptymgi = grid::get_modelcell_nonemptymgi(mgi);
Expand Down
39 changes: 25 additions & 14 deletions update_packets.cc
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ void do_nonthermal_predeposit(Packet &pkt, const int nts, const double t2) {
grid::change_cell(pkt, -99);
}
} else {
// ThermalisationScheme::DETAILED or ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS
// local, detailed absorption following Shingles+2023
const double rho = grid::get_rho(grid::get_cell_modelgridindex(pkt.where));

Expand Down Expand Up @@ -113,20 +114,30 @@ void do_nonthermal_predeposit(Packet &pkt, const int nts, const double t2) {

// contribute to the trajectory integrated deposition estimator
// and if a deposition event occurred, also the discrete Monte Carlo count deposition rate
if (priortype == TYPE_NONTHERMAL_PREDEPOSIT_BETAMINUS) {
atomicadd(globals::dep_estimator_electron[nonemptymgi], en_deposited);
if (pkt.type == deposit_type) {
atomicadd(globals::timesteps[nts].electron_dep_discrete, pkt.e_cmf);
}
} else if (priortype == TYPE_NONTHERMAL_PREDEPOSIT_BETAPLUS) {
atomicadd(globals::dep_estimator_positron[nonemptymgi], en_deposited);
if (pkt.type == deposit_type) {
atomicadd(globals::timesteps[nts].positron_dep_discrete, pkt.e_cmf);
}
} else if (priortype == TYPE_NONTHERMAL_PREDEPOSIT_ALPHA) {
atomicadd(globals::dep_estimator_alpha[nonemptymgi], en_deposited);
if (pkt.type == deposit_type) {
atomicadd(globals::timesteps[nts].alpha_dep_discrete, pkt.e_cmf);
// for DETAILEDWITHGAMMAPRODUCTS, gamma-ray deposition will lead to predeposit beta particles, but they will count
// toward "gamma deposition" not particle deposition
if (pkt.originated_from_particlenotgamma) {
if (priortype == TYPE_NONTHERMAL_PREDEPOSIT_BETAMINUS) {
atomicadd(globals::dep_estimator_electron[nonemptymgi], en_deposited);
if (pkt.type == deposit_type) {
atomicadd(globals::timesteps[nts].electron_dep_discrete, pkt.e_cmf);
}
} else if (priortype == TYPE_NONTHERMAL_PREDEPOSIT_BETAPLUS) {
atomicadd(globals::dep_estimator_positron[nonemptymgi], en_deposited);
if (pkt.type == deposit_type) {
atomicadd(globals::timesteps[nts].positron_dep_discrete, pkt.e_cmf);
}
} else if (priortype == TYPE_NONTHERMAL_PREDEPOSIT_ALPHA) {
atomicadd(globals::dep_estimator_alpha[nonemptymgi], en_deposited);
if (pkt.type == deposit_type) {
atomicadd(globals::timesteps[nts].alpha_dep_discrete, pkt.e_cmf);
}

} else if constexpr (PARTICLE_THERMALISATION_SCHEME == ThermalisationScheme::DETAILEDWITHGAMMAPRODUCTS) {
atomicadd(globals::dep_estimator_gamma[nonemptymgi], en_deposited);
if (pkt.type == TYPE_NTLEPTON_DEPOSITED) {
atomicadd(globals::timesteps[nts].gamma_dep_discrete, pkt.e_cmf);
}
}
}
}
Expand Down

0 comments on commit 5a52180

Please sign in to comment.