Formatting and clean up imports + switch CG->Lagrange to avoid warnings

Author: jorgensd

src/festim/hydrogen_transport_problem.py

@@ -13,12 +13,9 @@
 import tqdm.autonotebook
 import ufl
 from dolfinx import fem
-from dolfinx.nls.petsc import NewtonSolver
 from packaging.version import Version
 from scifem import BlockedNewtonSolver
 
-import festim.boundary_conditions
-import festim.problem
 from festim import (
     boundary_conditions,
     exports,
@@ -37,12 +34,12 @@
 )
 from festim.advection import AdvectionTerm
 from festim.helpers import (
+    KSPMonitor,
+    SnesMonitor,
     as_fenics_constant,
+    convergenceTest,
     get_interpolation_points,
     is_it_time_to_export,
-    SnesMonitor,
-    KSPMonitor,
-    convergenceTest,
     nmm_interpolate,
 )
 from festim.material import SolubilityLaw
@@ -433,7 +430,7 @@ def initialise_exports(self):
                             self.settings.stepsize.milestones.append(time)
                     self.settings.stepsize.milestones.sort()
 
-                if isinstance(export, festim.VTXTemperatureExport):
+                if isinstance(export, exports.VTXTemperatureExport):
                     self._temperature_as_function = (
                         self._get_temperature_field_as_function()
                     )
@@ -819,7 +816,7 @@ def create_formulation(self):
 
         for reaction in self.reactions:
             for reactant in reaction.reactant:
-                if isinstance(reactant, festim.species.Species):
+                if isinstance(reactant, _species.Species):
                     self.formulation += (
                         reaction.reaction_term(self.temperature_fenics)
                         * reactant.test_function
@@ -976,7 +973,7 @@ def post_processing(self):
                     else:
                         export.writer.write(float(self.t))
                 elif (
-                    isinstance(export, festim.VTXTemperatureExport)
+                    isinstance(export, exports.VTXTemperatureExport)
                     and self.temperature_time_dependent
                 ):
                     self._temperature_as_function.interpolate(
@@ -1422,14 +1419,14 @@ def create_subdomain_formulation(self, subdomain: _subdomain.VolumeSubdomain):
             if reaction.volume != subdomain:
                 continue
             for species in reaction.reactant + reaction.product:
-                if isinstance(species, festim.species.Species):
+                if isinstance(species, _species.Species):
                     # TODO remove
                     # temporarily overide the solution to the one of the subdomain
                     species.solution = species.subdomain_to_solution[subdomain]
 
             # reactant
             for reactant in reaction.reactant:
-                if isinstance(reactant, festim.species.Species):
+                if isinstance(reactant, _species.Species):
                     form += (
                         reaction.reaction_term(self.temperature_fenics)
                         * reactant.subdomain_to_test_function[subdomain]
@@ -2093,7 +2090,7 @@ def get_concentrations(species_list) -> list:
         # add reaction term to formulation
         # reactant
         for reactant in reaction.reactant:
-            if isinstance(reactant, festim.species.Species):
+            if isinstance(reactant, _species.Species):
                 self.formulation += (
                     reaction_term * reactant.test_function * self.dx(reaction.volume.id)
                 )
@@ -2123,7 +2120,7 @@ def override_post_processing_solution(self):
                 K_S0.x.array[entities] = subdomain.material.get_K_S_0(spe)
                 E_KS.x.array[entities] = subdomain.material.get_E_K_S(spe)
 
-            K_S = K_S0 * ufl.exp(-E_KS / (festim.k_B * self.temperature_fenics))
+            K_S = K_S0 * ufl.exp(-E_KS / (k_B * self.temperature_fenics))
 
             theta = spe.solution
 
@@ -2164,7 +2161,7 @@ def create_dirichletbc_form(self, bc: festim.FixedConcentrationBC):
             K_S0.x.array[entities] = subdomain.material.get_K_S_0(bc.species)
             E_KS.x.array[entities] = subdomain.material.get_E_K_S(bc.species)
 
-        K_S = K_S0 * ufl.exp(-E_KS / (festim.k_B * self.temperature_fenics))
+        K_S = K_S0 * ufl.exp(-E_KS / (k_B * self.temperature_fenics))
 
         # create value_fenics
         bc.create_value(

src/festim/initial_condition.py

@@ -240,7 +240,12 @@ def create_expr_fenics(
 
 
 def read_function_from_file(
-    filename: str, name: str, timestamp: int | float, family="P", order: int = 1, mesh: dolfinx.mesh.Mesh|None = None
+    filename: str,
+    name: str,
+    timestamp: int | float,
+    family="P",
+    order: int = 1,
+    mesh: dolfinx.mesh.Mesh | None = None,
 ) -> fem.Function:
     """
     Read a function from a file
@@ -279,4 +284,4 @@ def read_function_from_file(
         padding = 1e2 * np.finfo(mesh.geometry.x.dtype).eps
         idata = fem.create_interpolation_data(V, V_in, cells=cells, padding=padding)
         u.interpolate_nonmatching(u_in, cells, idata)
-        return u
+        return u

test/system_tests/test_io.py

@@ -74,7 +74,7 @@ def test_writing_and_reading_of_species_function_using_checkpoints(tmpdir):
                 filename=tmpdir + "/out_checkpoint.bp",
                 name="H",
                 timestamp=10,
-                mesh=mesh
+                mesh=mesh,
             ),
             species=H,
             volume=vol,
@@ -84,7 +84,7 @@ def test_writing_and_reading_of_species_function_using_checkpoints(tmpdir):
                 filename=tmpdir + "/out_checkpoint.bp",
                 name="D",
                 timestamp=10,
-                mesh=mesh
+                mesh=mesh,
             ),
             species=D,
             volume=vol,

test/system_tests/test_misc.py

@@ -186,7 +186,7 @@ def test_temp_dependent_bc_mixed_domain_temperature_as_function():
     """Test to catch bug 986"""
     mesh, mt, ct = generate_mesh(8)
 
-    V = dolfinx.fem.functionspace(mesh, ("CG", 1))
+    V = dolfinx.fem.functionspace(mesh, ("Lagrange", 1))
     T = dolfinx.fem.Function(V)
     T.interpolate(lambda x: 800.0 + 100 * x[0] + x[1])
 

test/test_advection.py

@@ -9,7 +9,7 @@
 import festim as F
 
 test_mesh_1d = F.Mesh1D(vertices=np.linspace(0, 1, 100))
-test_functionspace = fem.functionspace(test_mesh_1d.mesh, ("CG", 1))
+test_functionspace = fem.functionspace(test_mesh_1d.mesh, ("Lagrange", 1))
 
 
 @pytest.mark.parametrize(

test/test_h_transport_problem.py

@@ -1366,7 +1366,7 @@ def test_traps_with_CG_elements():
         species=[trap],
     )
 
-    my_model._element_for_traps = "CG"
+    my_model._element_for_traps = "Lagrange"
 
     my_model.create_species_from_traps()
     my_model.define_function_spaces(element_degree=1)
@@ -1486,7 +1486,7 @@ def test_temperature_as_function_in_discontinuous():
     H = F.Species("H", subdomains=my_model.volume_subdomains)
     my_model.species = [H]
 
-    V = fem.functionspace(my_model.mesh.mesh, ("CG", 1))
+    V = fem.functionspace(my_model.mesh.mesh, ("Lagrange", 1))
     u = fem.Function(V)
     u.interpolate(lambda x: 100 + x[0])
     u.x.array[:] = 100

test/test_initial_condition.py

@@ -233,20 +233,14 @@ def f2(x):
     my_problem.initial_conditions = [
         F.InitialConcentration(
             value=F.read_function_from_file(
-                filename=filename,
-                name="my_function1",
-                timestamp=0.2,
-                mesh=mesh
+                filename=filename, name="my_function1", timestamp=0.2, mesh=mesh
             ),
             species=H,
             volume=vol,
         ),
         F.InitialConcentration(
             value=F.read_function_from_file(
-                filename=filename,
-                name="my_function2",
-                timestamp=0.3,
-                mesh=mesh
+                filename=filename, name="my_function2", timestamp=0.3, mesh=mesh
             ),
             species=D,
             volume=vol,
@@ -462,7 +456,7 @@ def test_initial_condition_mixed_domain():
     my_model.temperature = 300
 
     intial_cond_value = 100
-    V = fem.functionspace(my_model.mesh.mesh, ("CG", 1))
+    V = fem.functionspace(my_model.mesh.mesh, ("Lagrange", 1))
     u = fem.Function(V)
     u.x.array[:] = intial_cond_value
 
@@ -509,11 +503,11 @@ def test_initial_condition_mixed_domain_multispecies():
 
     intial_cond_value_1 = 100
     intial_cond_value_2 = 200
-    V = fem.functionspace(my_model.mesh.mesh, ("CG", 1))
+    V = fem.functionspace(my_model.mesh.mesh, ("Lagrange", 1))
     u = fem.Function(V)
     u.x.array[:] = intial_cond_value_1
 
-    V2 = fem.functionspace(my_model.mesh.mesh, ("CG", 1))
+    V2 = fem.functionspace(my_model.mesh.mesh, ("Lagrange", 1))
     u2 = fem.Function(V2)
     u2.x.array[:] = intial_cond_value_2
 

test/test_mesh.py

@@ -1,8 +1,9 @@
 import logging
 import os
-import pytest
+
 from mpi4py import MPI
 
+import pytest
 
 ipp = pytest.importorskip("ipyparallel")