Merge pull request #306 from sblauth/fix/change_order

Change order of post_callback and gradient norm computation
sblauth · Sep 13, 2023 · 8f36a06 · 8f36a06
2 parents b6292d7 + 4d5ef90
commit 8f36a06
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/cashocs/_pde_problems/shape_gradient_problem.py b/cashocs/_pde_problems/shape_gradient_problem.py
@@ -129,10 +129,6 @@ def solve(self) -> List[fenics.Function]:
                 self.p_laplace_projector.solve()
                 self.has_solution = True
 
-                self.gradient_norm_squared = self.form_handler.scalar_product(
-                    self.db.function_db.gradient, self.db.function_db.gradient
-                )
-
             else:
                 self.form_handler.assembler.assemble(
                     self.form_handler.fe_shape_derivative_vector
@@ -153,12 +149,12 @@ def solve(self) -> List[fenics.Function]:
 
                 self.has_solution = True
 
-                self.gradient_norm_squared = self.form_handler.scalar_product(
-                    self.db.function_db.gradient, self.db.function_db.gradient
-                )
-
             self.db.callback.call_post()
 
+            self.gradient_norm_squared = self.form_handler.scalar_product(
+                self.db.function_db.gradient, self.db.function_db.gradient
+            )
+
         return self.db.function_db.gradient