Revert "Test comment new code"

This reverts commit 3eed3372a4a51b959128af14d627b51e074c9db8.
artis-mcrt · Sep 12, 2024 · 7cf1421 · 7cf1421
1 parent e726533
commit 7cf1421
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/gammapkt.cc b/gammapkt.cc
@@ -688,7 +688,7 @@ void update_gamma_dep(const Packet &pkt, const double dist, const int mgi, const
   assert_testmodeonly(std::isfinite(heating_cont));
   atomicadd(globals::dep_estimator_gamma[nonemptymgi], heating_cont);
 
-  // atomicadd(globals::estimator_gamma_kappa_integrated, heating_cont * get_kappa(pkt));
+  atomicadd(globals::estimator_gamma_kappa_integrated, heating_cont * get_kappa(pkt));
 }
 
 // handle physical pair production event
@@ -1092,8 +1092,8 @@ __host__ __device__ void pellet_gamma_decay(Packet &pkt) {
   // %g\n",pkt.stokes_qu[0],pkt.stokes_qu[1],pkt.pol_dir[0],pkt.pol_dir[1],pkt.pol_dir[2]);
   // printout("pkt direction %g, %g, %g\n",pkt.dir[0],pkt.dir[1],pkt.dir[2]);
 
-  // atomicadd(globals::estimator_gamma_kappa_decayspec, get_kappa(pkt) * pkt.e_cmf);
-  // atomicadd(globals::estimator_gamma_nu_cmf_decayspec, pkt.nu_cmf * pkt.e_cmf);
+  atomicadd(globals::estimator_gamma_kappa_decayspec, get_kappa(pkt) * pkt.e_cmf);
+  atomicadd(globals::estimator_gamma_nu_cmf_decayspec, pkt.nu_cmf * pkt.e_cmf);
 }
 
 __host__ __device__ void do_gamma(Packet &pkt, const int nts, const double t2) {
@@ -1111,8 +1111,8 @@ __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);
-    // atomicadd(globals::estimator_gamma_kappa_absorbedspec, get_kappa(pkt) * pkt.e_cmf);
-    // atomicadd(globals::estimator_gamma_nu_cmf_absorbedspec, pkt.nu_cmf * pkt.e_cmf);
+    atomicadd(globals::estimator_gamma_kappa_absorbedspec, get_kappa(pkt) * pkt.e_cmf);
+    atomicadd(globals::estimator_gamma_nu_cmf_absorbedspec, pkt.nu_cmf * pkt.e_cmf);
 
     if constexpr (GAMMA_THERMALISATION_SCHEME != ThermalisationScheme::DETAILED) {
       // no transport, so the path-based gamma deposition estimator won't get updated unless we do it here

diff --git a/sn3d.cc b/sn3d.cc
@@ -649,26 +649,26 @@ void normalise_deposition_estimators(int nts) {
   globals::timesteps[nts].electron_dep = 0.;
   globals::timesteps[nts].alpha_dep = 0.;
 
-  // double gamma_dep_erg = 0.;
-  // for (int nonemptymgi = 0; nonemptymgi < grid::get_nonempty_npts_model(); nonemptymgi++) {
-  //   gamma_dep_erg += (globals::dep_estimator_gamma[nonemptymgi] / nprocs);
-  // }
-  // globals::estimator_gamma_kappa_integrated /= gamma_dep_erg;
-
-  // globals::estimator_gamma_kappa_decayspec /= globals::timesteps[nts].gamma_emission;
-  // globals::estimator_gamma_nu_cmf_decayspec /= globals::timesteps[nts].gamma_emission;
-  // const double mean_en_decay_mev = H * globals::estimator_gamma_nu_cmf_decayspec / MEV;
-
-  // globals::estimator_gamma_kappa_absorbedspec /= globals::timesteps[nts].gamma_dep_discrete;
-  // globals::estimator_gamma_nu_cmf_absorbedspec /= globals::timesteps[nts].gamma_dep_discrete;
-  // const double mean_en_absorb_mev = H * globals::estimator_gamma_nu_cmf_absorbedspec / MEV;
-
-  // printout(
-  //     "timestep %d %.2f days kappa_eff [cm2/g]: path-integrated %.3f decay_spec %.3f deposit_spec %.3f. mean gamma "
-  //     "E[MeV]: decay %.2f deposit %.2f\n",
-  //     nts, globals::timesteps[nts].mid / DAY, globals::estimator_gamma_kappa_integrated,
-  //     globals::estimator_gamma_kappa_decayspec, globals::estimator_gamma_kappa_absorbedspec, mean_en_decay_mev,
-  //     mean_en_absorb_mev);
+  double gamma_dep_erg = 0.;
+  for (int nonemptymgi = 0; nonemptymgi < grid::get_nonempty_npts_model(); nonemptymgi++) {
+    gamma_dep_erg += (globals::dep_estimator_gamma[nonemptymgi] / nprocs);
+  }
+  globals::estimator_gamma_kappa_integrated /= gamma_dep_erg;
+
+  globals::estimator_gamma_kappa_decayspec /= globals::timesteps[nts].gamma_emission;
+  globals::estimator_gamma_nu_cmf_decayspec /= globals::timesteps[nts].gamma_emission;
+  const double mean_en_decay_mev = H * globals::estimator_gamma_nu_cmf_decayspec / MEV;
+
+  globals::estimator_gamma_kappa_absorbedspec /= globals::timesteps[nts].gamma_dep_discrete;
+  globals::estimator_gamma_nu_cmf_absorbedspec /= globals::timesteps[nts].gamma_dep_discrete;
+  const double mean_en_absorb_mev = H * globals::estimator_gamma_nu_cmf_absorbedspec / MEV;
+
+  printout(
+      "timestep %d %.2f days kappa_eff [cm2/g]: path-integrated %.3f decay_spec %.3f deposit_spec %.3f. mean gamma "
+      "E[MeV]: decay %.2f deposit %.2f\n",
+      nts, globals::timesteps[nts].mid / DAY, globals::estimator_gamma_kappa_integrated,
+      globals::estimator_gamma_kappa_decayspec, globals::estimator_gamma_kappa_absorbedspec, mean_en_decay_mev,
+      mean_en_absorb_mev);
 
   for (int nonemptymgi = 0; nonemptymgi < grid::get_nonempty_npts_model(); nonemptymgi++) {
     const int mgi = grid::get_mgi_of_nonemptymgi(nonemptymgi);