Merge pull request #60 from pyroteus/59_for_else

Use for/else loop in `fixed_point_iteration` methods
mesh-adaptation · Oct 26, 2023 · d9ddc0b · d9ddc0b
2 parents a08b9b0 + d8547af
commit d9ddc0b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/goalie/go_mesh_seq.py b/goalie/go_mesh_seq.py
@@ -271,7 +271,6 @@ def fixed_point_iteration(
         self.vertex_counts = [self.count_vertices()]
         self.qoi_values = []
         self.estimator_values = []
-        converged = False
         self.converged[:] = False
         self.check_convergence[:] = True
 
@@ -320,20 +319,18 @@ def fixed_point_iteration(
                 break
 
             # Convergence check for 'all' mode
-            converged = qoi_converged and ee_converged and elem_converged
-            if converged:
+            if qoi_converged and ee_converged and elem_converged:
                 break
-
-        if self.params.convergence_criteria == "all":
-            if not converged:
-                self.converged[:] = False
-                pyrint(f"Failed to converge in {self.params.maxiter} iterations.")
         else:
-            for i, conv in enumerate(self.converged):
-                if not conv:
-                    pyrint(
-                        f"Failed to converge on subinterval {i} in {self.params.maxiter}"
-                        " iterations."
-                    )
+            if self.params.convergence_criteria == "all":
+                pyrint(f"Failed to converge in {self.params.maxiter} iterations.")
+                self.converged[:] = False
+            else:
+                for i, conv in enumerate(self.converged):
+                    if not conv:
+                        pyrint(
+                            f"Failed to converge on subinterval {i} in"
+                            f" {self.params.maxiter} iterations."
+                        )
 
         return sols, indicators
diff --git a/goalie/mesh_seq.py b/goalie/mesh_seq.py
@@ -678,12 +678,12 @@ def fixed_point_iteration(
             self.converged[:] = self.check_element_count_convergence()
             if self.converged.all():
                 break
-
-        for i, conv in enumerate(self.converged):
-            if not conv:
-                pyrint(
-                    f"Failed to converge on subinterval {i} in {self.params.maxiter}"
-                    " iterations."
-                )
+        else:
+            for i, conv in enumerate(self.converged):
+                if not conv:
+                    pyrint(
+                        f"Failed to converge on subinterval {i} in"
+                        f" {self.params.maxiter} iterations."
+                    )
 
         return sols