Print solver iteration and convergence param

ukaea · Aug 16, 2023 · ff70078 · ff70078
1 parent 0c6010e
commit ff70078
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/process/solver.py b/process/solver.py
@@ -168,6 +168,9 @@ def solve(self) -> int:
         if self.b is not None:
             B = np.identity(numerics.nvar) * self.b
 
+        def _solver_callback(i: int, _x, _result, convergence_param: float):
+            print(f"{i+1} | Convergence Parameter: {convergence_param}")
+
         try:
             x, _, _, res = solve(
                 problem,
@@ -178,6 +181,7 @@ def solve(self) -> int:
                 epsilon=self.tolerance,
                 qsp_options={"eps_rel": 1e-1, "adaptive_rho_interval": 25},
                 initial_B=B,
+                callback=_solver_callback,
             )
         except VMCONConvergenceException as e:
             if isinstance(e, LineSearchConvergenceException):

diff --git a/requirements.txt b/requirements.txt
@@ -25,6 +25,6 @@ pandas>=1.1.5
 bokeh==2.4.0
 mkdocstrings==0.18.0
 flinter==0.3.0
-PyVMCON>=2.0.0,<3.0.0
+PyVMCON>=2.1.0,<3.0.0
 CoolProp>=6.4
 Jinja2>=3.0
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
         "tables",
         "SALib",
         "numba>=0.55.2",
-        "PyVMCON>=2.0.0,<3.0.0",
+        "PyVMCON>=2.1.0,<3.0.0",
         "CoolProp>=6.4",
     ],
     "extras_require": {"test": ["pytest"]},