Restore alltrans_startup

artis-mcrt · Sep 9, 2024 · 757819f · 757819f
1 parent 83605b1
commit 757819f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/atomic.h b/atomic.h
@@ -377,8 +377,7 @@ inline auto get_includedlevels() -> int { return includedlevels; }
 }
 
 [[nodiscard]] inline auto get_uptranslist(const int element, const int ion, const int level) -> LevelTransition * {
-  const auto &levelref = globals::elements[element].ions[ion].levels[level];
-  return globals::alltrans + levelref.alltrans_startdown + levelref.ndowntrans;
+  return globals::alltrans + globals::elements[element].ions[ion].levels[level].alltrans_startup;
 }
 
 [[nodiscard]] inline auto get_uptransspan(const int element, const int ion, const int level) {

diff --git a/globals.h b/globals.h
@@ -84,6 +84,7 @@ struct EnergyLevel {
   double epsilon{-1};        // Excitation energy of this level relative to the neutral ground level.
   int alltrans_startdown{};  // index into globals::alltrans for first down transition from this level
   int ndowntrans{0};         // Number of down transitions from this level
+  int alltrans_startup{};    // Allowed upward transitions from this level
   int nuptrans{0};           // Number of up transitions to this level
   int phixsstart{-1};        // index to start of photoionisation cross-sections table in global::allphixs
   int nphixstargets{0};      // number of target levels for photoionisation

diff --git a/input.cc b/input.cc
@@ -490,6 +490,8 @@ void add_transitions_to_unsorted_linelist(const int element, const int ion, cons
       for (int level = 0; level < nlevelsmax; level++) {
         globals::elements[element].ions[ion].levels[level].alltrans_startdown = alltransindex;
         alltransindex += get_ndowntrans(element, ion, level);
+
+        globals::elements[element].ions[ion].levels[level].alltrans_startup = alltransindex;
         alltransindex += get_nuptrans(element, ion, level);
 
         set_ndowntrans(element, ion, level, 0);
@@ -556,14 +558,13 @@ void add_transitions_to_unsorted_linelist(const int element, const int ion, cons
                                   .coll_str = transition.coll_str,
                                   .osc_strength = f_ul,
                                   .forbidden = transition.forbidden};
-          temp_alltranslist[globals::elements[element].ions[ion].levels[lowerlevel].alltrans_startdown +
-                            get_ndowntrans(element, ion, lowerlevel) + nloweruptrans - 1] = {
-              .lineindex = -1,
-              .targetlevelindex = level,
-              .einstein_A = transition.A,
-              .coll_str = transition.coll_str,
-              .osc_strength = f_ul,
-              .forbidden = transition.forbidden};
+          temp_alltranslist[globals::elements[element].ions[ion].levels[lowerlevel].alltrans_startup + nloweruptrans -
+                            1] = {.lineindex = -1,
+                                  .targetlevelindex = level,
+                                  .einstein_A = transition.A,
+                                  .coll_str = transition.coll_str,
+                                  .osc_strength = f_ul,
+                                  .forbidden = transition.forbidden};
         }
 
       } else if (pass == 1 && globals::rank_in_node == 0) {