From 0d3201028b19d787845d29d45521718419400c40 Mon Sep 17 00:00:00 2001 From: Davor Dundovic <33790330+ddundo@users.noreply.github.com> Date: Wed, 8 Jan 2025 22:19:17 +0000 Subject: [PATCH 1/2] Switch to comp coords before solving with QN --- movement/monge_ampere.py | 1 + 1 file changed, 1 insertion(+) diff --git a/movement/monge_ampere.py b/movement/monge_ampere.py index f38b1a3..12dbcdc 100644 --- a/movement/monge_ampere.py +++ b/movement/monge_ampere.py @@ -728,6 +728,7 @@ def move(self): # Solve equidistribution problem, handling convergence errors according to # desired behaviour try: + self.to_computational_coordinates() self.equidistributor.solve() self._convergence_message(self.snes.getIterationNumber()) except fexc.ConvergenceError as conv_err: From 53ed805fb1db90785543dd56cdb6b769742bcd7a Mon Sep 17 00:00:00 2001 From: Davor Dundovic <33790330+ddundo@users.noreply.github.com> Date: Thu, 9 Jan 2025 01:56:13 +0100 Subject: [PATCH 2/2] Switch coordinates outside of try/except --- movement/monge_ampere.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/movement/monge_ampere.py b/movement/monge_ampere.py index 12dbcdc..50915bf 100644 --- a/movement/monge_ampere.py +++ b/movement/monge_ampere.py @@ -725,10 +725,12 @@ def move(self): :return: the iteration count :rtype: :class:`int` """ + # Switch to computational coordinates + self.to_computational_coordinates() + # Solve equidistribution problem, handling convergence errors according to # desired behaviour try: - self.to_computational_coordinates() self.equidistributor.solve() self._convergence_message(self.snes.getIterationNumber()) except fexc.ConvergenceError as conv_err: