Merge pull request #534 from RemDelaporteMathurin/neutron_trap_fix

Don't know what the drop in coverage is due to... merging this! thanks James

festim/concentration/traps/neutron_induced_trap.py

@@ -7,7 +7,7 @@ class NeutronInducedTrap(ExtrinsicTrapBase):
     Class for neutron induced trap creation with annealing.
     The temporal evolution of the trap density is given by
 
-    dn_t/dt = phi*K*(1 - n_t/n_max) + A_0*exp(-E_A/(k_B*T))*n_t
+    dn_t/dt = phi*K*(1 - n_t/n_max) - A_0*exp(-E_A/(k_B*T))*n_t
 
     Args:
         k_0 (float, list): trapping pre-exponential factor (m3 s-1)
@@ -55,6 +55,7 @@ def __init__(
             A_0=A_0,
             E_A=E_A,
             id=id,
+            **kwargs,
         )
 
     def create_form_density(self, dx, dt, T):

test/unit/test_traps/test_neutron_induced_trap.py

@@ -124,3 +124,48 @@ def test_create_form_density(self):
         print(expected_form)
         print(self.my_trap.form_density)
         assert self.my_trap.form_density.equals(expected_form)
+
+
+class TestNeutronInducedTrapSolverParameters:
+    """
+    Test for NeutronInducedTrap class, with defined ExtrinsicTrapBase
+    solver parameters
+    """
+
+    my_trap = festim.NeutronInducedTrap(
+        1,
+        1,
+        1,
+        1,
+        "mat_name",
+        phi=1,
+        K=2,
+        n_max=3,
+        A_0=4,
+        E_A=5,
+        absolute_tolerance=2.5,
+        relative_tolerance=1.2e-10,
+        maximum_iterations=13,
+        linear_solver="mumps",
+    )
+
+    def test_attributes_from_instanciation(self):
+        """
+        Tests the solver paramters are assigned and ensures that
+        the default values have been updated
+        """
+
+        assert self.my_trap.absolute_tolerance == 2.5
+        assert self.my_trap.relative_tolerance == 1.2e-10
+        assert self.my_trap.maximum_iterations == 13
+        assert self.my_trap.linear_solver == "mumps"
+
+    def test_attributes_change_since_instanciation(self):
+        """
+        Test to ensure values can be updated after instanciation
+        """
+
+        expected_tolerance = 3.6
+        self.my_trap.absolute_tolerance = 3.6
+
+        assert self.my_trap.absolute_tolerance == expected_tolerance