Moves time explosion off the transport solver to the transport state

tardis-sn · Jul 23, 2024 · a2aba1d · a2aba1d
1 parent 38a35c3
commit a2aba1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/tardis/simulation/base.py b/tardis/simulation/base.py
@@ -389,7 +389,6 @@ def iterate(self, no_of_packets, no_of_virtual_packets=0):
 
         v_packets_energy_hist = self.transport.run(
             transport_state,
-            time_explosion=self.simulation_state.time_explosion,
             iteration=self.iterations_executed,
             total_iterations=self.iterations,
             show_progress_bars=self.show_progress_bars,

diff --git a/tardis/transport/montecarlo/base.py b/tardis/transport/montecarlo/base.py
@@ -118,6 +118,7 @@ def initialize_transport_state(
             estimators,
             geometry_state=geometry_state,
             opacity_state=opacity_state,
+            time_explosion=simulation_state.time_explosion,
         )
 
         transport_state.enable_full_relativity = (
@@ -133,7 +134,6 @@ def initialize_transport_state(
     def run(
         self,
         transport_state,
-        time_explosion,
         iteration=0,
         total_iterations=0,
         show_progress_bars=True,
@@ -167,7 +167,7 @@ def run(
         ) = montecarlo_main_loop(
             transport_state.packet_collection,
             transport_state.geometry_state,
-            time_explosion.cgs.value,
+            transport_state.time_explosion.cgs.value,
             transport_state.opacity_state,
             self.montecarlo_configuration,
             transport_state.radfield_mc_estimators,

diff --git a/tardis/transport/montecarlo/montecarlo_transport_state.py b/tardis/transport/montecarlo/montecarlo_transport_state.py
@@ -59,13 +59,15 @@ def __init__(
         radfield_mc_estimators,
         geometry_state,
         opacity_state,
+        time_explosion,
         rpacket_tracker=None,
         vpacket_tracker=None,
     ):
         self.packet_collection = packet_collection
         self.radfield_mc_estimators = radfield_mc_estimators
         self.enable_full_relativity = False
         self.enable_continuum_processes = False
+        self.time_explosion = time_explosion
         self.geometry_state = geometry_state
         self.opacity_state = opacity_state
         self.rpacket_tracker = rpacket_tracker