fix the tests

Author: Weiwei Wang

fidimag/atomistic/llg.py

@@ -86,6 +86,7 @@ def set_default_options(self, gamma=1, mu_s=1, alpha=0.1):
         self.default_c = -1
         self._alpha[:] = alpha
         self._mu_s[:] = mu_s
+        self.mu_s_const = mu_s
         self.gamma = gamma
         self.do_precession = True
 

fidimag/atomistic/llg_stt.py

@@ -30,7 +30,8 @@ def __init__(self, mesh, name='unnamed'):
         self.update_j_fun = None
 
         # FIXME: change the u0 to spatial
-        self.u0 = const.g_e * const.mu_B / (2 * const.c_e)
+        v = self.mesh.dx* self.mesh.dy * self.mesh.dz * (self.mesh.unit_length**3)
+        self.u0 = const.g_e * const.mu_B / (2 * const.c_e) * v
 
     def get_jx(self):
         return self._jx
@@ -84,6 +85,6 @@ def sundials_rhs(self, t, y, ydot):
                                  self.field_stt,
                                  self.alpha,
                                  self.beta,
-                                 self.u0 * self.p / self.Ms_const,
+                                 self.u0 * self.p / self.mu_s_const,
                                  self.gamma,
                                  self.n)

fidimag/atomistic/sim.py

@@ -6,7 +6,7 @@
 
 KNOWN_DRIVERS = {'llg': LLG,
                  'sllg': SLLG,
-                 'llg_stt': SLLG_STT,
+                 'llg_stt': LLG_STT,
                  'llg_stt_cpp': LLG_STT_CPP
 		}
 

fidimag/micro/llg_stt.py

@@ -30,8 +30,7 @@ def __init__(self, mesh, name='unnamed'):
         self.update_j_fun = None
 
         # FIXME: change the u0 to spatial
-        v = self.mesh.dx* self.mesh.dy * self.mesh.dz * (self.mesh.unit_length**3)
-        self.u0 = const.g_e * const.mu_B / (2 * const.c_e) * v
+        self.u0 = const.g_e * const.mu_B / (2 * const.c_e)
 
     def get_jx(self):
         return self._jx
@@ -85,6 +84,6 @@ def sundials_rhs(self, t, y, ydot):
                                  self.field_stt,
                                  self.alpha,
                                  self.beta,
-                                 self.u0 * self.p / self.mu_s_constant,
+                                 self.u0 * self.p / self.Ms_const,
                                  self.gamma,
                                  self.n)

tests/test_stt_slonczewski.py

@@ -9,7 +9,7 @@ def test_dynamic():
 
     mesh = CuboidMesh(nx=1, ny=1, nz=1)
 
-    sim = Sim(mesh, name='dyn_spin', driver='slonczewski')
+    sim = Sim(mesh, name='dyn_spin', driver='llg_stt_cpp')
     # sim.set_options(rtol=1e-10,atol=1e-14)
     sim.gamma = 1.0
     sim.mu_s = 1.0