From 400332bce382113e3832cd0c0e24c1df10c6493e Mon Sep 17 00:00:00 2001 From: Andrew Fullard Date: Tue, 12 Nov 2024 10:44:29 -0500 Subject: [PATCH] Fixes standard workflow --- tardis/workflows/standard_tardis_workflow.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tardis/workflows/standard_tardis_workflow.py b/tardis/workflows/standard_tardis_workflow.py index f5842943f32..e4ed2433799 100644 --- a/tardis/workflows/standard_tardis_workflow.py +++ b/tardis/workflows/standard_tardis_workflow.py @@ -219,18 +219,10 @@ def run(self): self.simulation_state.t_inner, ) - self.opacity_state = self.opacity_solver.solve(self.plasma_solver) - - if self.macro_atom_solver is not None: - self.macro_atom_state = self.macro_atom_solver.solve( - self.plasma_solver, - self.plasma_solver.atomic_data, - self.opacity_state.tau_sobolev, - self.plasma_solver.stimulated_emission_factor, - ) + opacity_states = self.solve_opacity() transport_state, virtual_packet_energies = self.solve_montecarlo( - self.real_packet_count + opacity_states, self.real_packet_count ) ( @@ -258,7 +250,9 @@ def run(self): "\n\tITERATIONS HAVE NOT CONVERGED, starting final iteration" ) transport_state, virtual_packet_energies = self.solve_montecarlo( - self.final_iteration_packet_count, self.virtual_packet_count + opacity_states, + self.final_iteration_packet_count, + self.virtual_packet_count, ) self.store_plasma_state( self.completed_iterations, @@ -276,5 +270,6 @@ def run(self): ) self.initialize_spectrum_solver( transport_state, + opacity_states, virtual_packet_energies, )