further refactoring

Author: RemDelaporteMathurin

src/festim/hydrogen_transport_problem.py

@@ -1674,32 +1674,7 @@ def create_solver(self):
         elif Version(dolfinx.__version__) > Version("0.9.0"):
             from dolfinx.fem.petsc import NonlinearProblem
 
-            petsc_options = festim.problem.get_default_petsc_options()
-
-            # Update default PETSc options with user-provided options, if any
-            if self.petsc_options:
-                petsc_options.update(self.petsc_options)
-
-            if (
-                "snes_atol" in self.petsc_options
-                or "snes_rtol" in self.petsc_options
-                or "snes_max_it" in self.petsc_options
-            ):
-                warnings.warn(
-                    "You have set one of the following PETSc options: snes_atol, "
-                    "snes_rtol or snes_max_it. These options will be overwritten by "
-                    "the values in festim.Settings (atol, rtol and max_iterations) to "
-                    "ensure consistency between different versions of dolfinx. If you "
-                    "want to set these options manually, please set them in "
-                    "festim.Settings and not in the petsc_options dictionary."
-                )
-            petsc_options.update(
-                {
-                    "snes_atol": self.settings.atol,
-                    "snes_rtol": self.settings.rtol,
-                    "snes_max_it": self.settings.max_iterations,
-                }
-            )
+            petsc_options = self.get_petsc_options()
 
             self.solver = NonlinearProblem(
                 self.forms,

src/festim/problem.py

@@ -119,6 +119,45 @@ def define_boundary_conditions(self):
                 form = self.create_dirichletbc_form(bc)
                 self.bc_forms.append(form)
 
+    def get_petsc_options(self) -> dict[str, Any]:
+        """
+        Gets the PETSc options to pass to the NewtonProblem solver. Default
+        options are updated with user-provided options, if any.
+
+        Returns:
+            the petsc options to pass to the NewtonProblem solver.
+        """
+        petsc_options = get_default_petsc_options()
+
+        # Update default PETSc options with user-provided options, if any
+        if self.petsc_options:
+            petsc_options.update(self.petsc_options)
+
+        if self.petsc_options:
+            if (
+                "snes_atol" in self.petsc_options
+                or "snes_rtol" in self.petsc_options
+                or "snes_max_it" in self.petsc_options
+            ):
+                warnings.warn(
+                    "You have set one of the following PETSc options: snes_atol, "
+                    "snes_rtol or snes_max_it. These options will be overwritten by "
+                    "the values in festim.Settings (atol, rtol and max_iterations) to "
+                    "ensure consistency between different versions of dolfinx. If you "
+                    "want to set these options manually, please set them in "
+                    "festim.Settings and not in the petsc_options dictionary."
+                )
+
+        petsc_options.update(
+            {
+                "snes_atol": self.settings.atol,
+                "snes_rtol": self.settings.rtol,
+                "snes_max_it": self.settings.max_iterations,
+            }
+        )
+
+        return petsc_options
+
     def create_solver(self):
         """Creates the solver of the model"""
 
@@ -160,33 +199,7 @@ def create_solver(self):
         elif Version(dolfinx.__version__) > Version("0.9.0"):
             from dolfinx.fem.petsc import NonlinearProblem
 
-            petsc_options = get_default_petsc_options()
-
-            # Update default PETSc options with user-provided options, if any
-            if self.petsc_options:
-                petsc_options.update(self.petsc_options)
-
-            if (
-                "snes_atol" in self.petsc_options
-                or "snes_rtol" in self.petsc_options
-                or "snes_max_it" in self.petsc_options
-            ):
-                warnings.warn(
-                    "You have set one of the following PETSc options: snes_atol, "
-                    "snes_rtol or snes_max_it. These options will be overwritten by "
-                    "the values in festim.Settings (atol, rtol and max_iterations) to "
-                    "ensure consistency between different versions of dolfinx. If you "
-                    "want to set these options manually, please set them in "
-                    "festim.Settings and not in the petsc_options dictionary."
-                )
-            petsc_options.update(
-                {
-                    "snes_atol": self.settings.atol,
-                    "snes_rtol": self.settings.rtol,
-                    "snes_max_it": self.settings.max_iterations,
-                }
-            )
-
+            petsc_options = self.get_petsc_options()
             self.solver = NonlinearProblem(
                 self.formulation,
                 self.u,