always add trapping term

festim-dev · Jan 16, 2024 · 9d26ac3 · 9d26ac3
1 parent 8679056
commit 9d26ac3
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 36 deletions.
diff --git a/festim/concentration/mobile.py b/festim/concentration/mobile.py
@@ -106,38 +106,37 @@ def create_diffusion_form(
 
         # add the trapping terms
         F_trapping = 0
-        if dt is not None:
-            if traps is not None:
-                for trap in traps.traps:
-                    for i, mat in enumerate(trap.materials):
-                        if type(trap.k_0) is list:
-                            k_0 = trap.k_0[i]
-                            E_k = trap.E_k[i]
-                            p_0 = trap.p_0[i]
-                            E_p = trap.E_p[i]
-                            density = trap.density[i]
-                        else:
-                            k_0 = trap.k_0
-                            E_k = trap.E_k
-                            p_0 = trap.p_0
-                            E_p = trap.E_p
-                            density = trap.density[0]
-                        c_m, _ = self.get_concentration_for_a_given_material(mat, T)
-                        F_trapping += (
-                            -k_0
-                            * exp(-E_k / k_B / T.T)
-                            * c_m
-                            * (density - trap.solution)
-                            * self.test_function
-                            * dx(mat.id)
-                        )
-                        F_trapping += (
-                            p_0
-                            * exp(-E_p / k_B / T.T)
-                            * trap.solution
-                            * self.test_function
-                            * dx(mat.id)
-                        )
+        if traps is not None:
+            for trap in traps.traps:
+                for i, mat in enumerate(trap.materials):
+                    if type(trap.k_0) is list:
+                        k_0 = trap.k_0[i]
+                        E_k = trap.E_k[i]
+                        p_0 = trap.p_0[i]
+                        E_p = trap.E_p[i]
+                        density = trap.density[i]
+                    else:
+                        k_0 = trap.k_0
+                        E_k = trap.E_k
+                        p_0 = trap.p_0
+                        E_p = trap.E_p
+                        density = trap.density[0]
+                    c_m, _ = self.get_concentration_for_a_given_material(mat, T)
+                    F_trapping += (
+                        -k_0
+                        * exp(-E_k / k_B / T.T)
+                        * c_m
+                        * (density - trap.solution)
+                        * self.test_function
+                        * dx(mat.id)
+                    )
+                    F_trapping += (
+                        p_0
+                        * exp(-E_p / k_B / T.T)
+                        * trap.solution
+                        * self.test_function
+                        * dx(mat.id)
+                    )
         F += -F_trapping
 
         self.F_diffusion = F

diff --git a/test/system/test_system.py b/test/system/test_system.py
@@ -591,12 +591,11 @@ def test_run_MMS_steady_state(tmpdir):
     k = k_0 * sp.exp(-E_k / k_B / T)
 
     f = (
-        sp.diff(u, festim.t)
-        + sp.diff(v, festim.t)
-        - D * sp.diff(u, festim.x, 2)
+        -D * sp.diff(u, festim.x, 2)
         - sp.diff(D, festim.x) * sp.diff(u, festim.x)
+        - (p * v - k * u * (n_trap - v))
     )
-    g = sp.diff(v, festim.t) + p * v - k * u * (n_trap - v)
+    g = p * v - k * u * (n_trap - v)
 
     def run(h):
         my_materials = festim.Materials(