Skip to content

Commit

Permalink
updated converged status to self.converged throughout workflow (#2963)
Browse files Browse the repository at this point in the history
* updated converged status to be self.converged throughout workflow

* Trigger workflows
  • Loading branch information
erinvisser authored Feb 3, 2025
1 parent 35c3190 commit 12b26c5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions tardis/workflows/simple_tardis_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ def initialize_spectrum_solver(

def run(self):
"""Run the TARDIS simulation until convergence is reached"""
converged = False
self.converged = False
while self.completed_iterations < self.total_iterations - 1:
logger.info(
f"\n\tStarting iteration {(self.completed_iterations + 1):d} of {self.total_iterations:d}"
Expand All @@ -466,13 +466,13 @@ def run(self):

self.solve_plasma(estimated_radfield_properties)

converged = self.check_convergence(estimated_values)
self.converged = self.check_convergence(estimated_values)
self.completed_iterations += 1

if converged and self.convergence_strategy.stop_if_converged:
if self.converged and self.convergence_strategy.stop_if_converged:
break

if converged:
if self.converged:
logger.info("\n\tStarting final iteration")
else:
logger.error(
Expand Down
8 changes: 4 additions & 4 deletions tardis/workflows/standard_tardis_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def update_convergence_plot_data(self, plot_data_dict):

def run(self):
"""Run the TARDIS simulation until convergence is reached"""
converged = False
self.converged = False
while self.completed_iterations < self.total_iterations - 1:
logger.info(
f"\n\tStarting iteration {(self.completed_iterations + 1):d} of {self.total_iterations:d}"
Expand Down Expand Up @@ -237,13 +237,13 @@ def run(self):

self.solve_plasma(estimated_radfield_properties)

converged = self.check_convergence(estimated_values)
self.converged = self.check_convergence(estimated_values)
self.completed_iterations += 1

if converged and self.convergence_strategy.stop_if_converged:
if self.converged and self.convergence_strategy.stop_if_converged:
break

if converged:
if self.converged:
logger.info("\n\tStarting final iteration")
else:
logger.error(
Expand Down
8 changes: 4 additions & 4 deletions tardis/workflows/v_inner_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def solve_plasma(

def run(self):
"""Run the TARDIS simulation until convergence is reached"""
converged = False
self.converged = False
while self.completed_iterations < self.total_iterations - 1:
logger.info(
f"\n\tStarting iteration {(self.completed_iterations + 1):d} of {self.total_iterations:d}"
Expand All @@ -334,14 +334,14 @@ def run(self):
estimated_values["mask"],
)

converged = self.check_convergence(estimated_values)
self.converged = self.check_convergence(estimated_values)

self.completed_iterations += 1

if converged and self.convergence_strategy.stop_if_converged:
if self.converged and self.convergence_strategy.stop_if_converged:
break

if converged:
if self.converged:
logger.info("\n\tStarting final iteration")
else:
logger.error(
Expand Down

0 comments on commit 12b26c5

Please sign in to comment.