Remove the Zeeman classes

Author: rpep

fidimag/micro/zeeman.py

@@ -112,194 +112,21 @@ def compute_energy(self):
 
 
 class TimeZeeman(Zeeman):
-    """
-    The time dependent external field, also can vary with space
-
-    The function time_fun must be a function which takes two arguments:
-
-    def time_fun(pos, t):
-        x, y, z = pos
-        # compute Bx, By, Bz as a function of x y, z and t.
-        Bx = ...
-        By = ...
-        Bz = ...
-        return (Bx, By, Bz)
-
-    Extra arguments can be passed to the function to allow more
-    general code. These must be set when initialising the TimeZeeman class. For
-    example:
-
-    freq = 10e9
-
-    def time_fun(pos, t, frequency):
-        x, y, z = pos
-        if x < 50:
-            return (0.0, 0.0, np.sin(frequency*t))
-        else:
-            return (0.0, 0.0, 0.0)
-
-    zee = TimeZeeman(time_fun, extra_args=[freq])
-
-    These arguments are then passed into the time_fun code function in
-    order.
 
     """
-
-    def __init__(self, time_fun, extra_args=[], name='TimeZeeman'):
-        self.time_fun = time_fun
-        self.name = name
-        self.jac = True
-        self.extra_args = extra_args
-
-    def setup(self, mesh, spin, Ms):
-        self.mesh = mesh
-        self.spin = spin
-        self.n = mesh.n
-
-        self.Ms = Ms
-        self.Ms_long = np.zeros(3 * mesh.n)
-
-        # TODO: Check if it is necessary to define a 3D matrix for
-        # the Ms vectors. Maybe there is a way that uses less memory
-        # (see the calculation in the *compute_energy* function)
-        self.Ms_long.shape = (3, -1)
-        for i in range(mesh.n):
-            self.Ms_long[:, i] = Ms[i]
-
-        self.Ms_long.shape = (-1,)
-        self.field = np.zeros(3 * self.n)
-
-    def compute_field(self, t=0, spin=None):
-        self.field[:] = helper.init_vector(self.time_fun,
-                                           self.mesh,
-                                           False,
-                                           t, *self.extra_args)
-        return self.field
-
-
-class TimeZeemanSimple(Zeeman):
-
-    """
-    Time Dependent Zeeman Interaction with no spatial dependence.
-
-    The function time_fun must be a function which takes one argument:
-
-    def time_fun(t):
-        x, y, z = pos
-        # compute Bx, By, Bz as a function of x y, z and t.
-        Bx = ...
-        By = ...
-        Bz = ...
-        return (Bx, By, Bz)
-
-
-    Extra arguments can be passed to the function to allow more
-    general code. These must be set when initialising the TimeZeeman class. For
-    example:
-
-    freq = 10e9
-
-    def time_fun(t, frequency):
-        return (0.0, 0.0, np.sin(frequency*t))
-
-    zee = SimpleTimeZeeman(time_fun, extra_args=[freq])
-
-    These arguments are then passed into the time_fun code function in
-    order.
-
-
-    """
-
-    def __init__(self, time_fun, extra_args=[], name='TimeZeemanFast'):
-        self.time_fun = time_fun
-        self.name = name
-        self.jac = True
-        self._v = np.zeros(3)
-        self.extra_args = extra_args
-
-    def setup(self, mesh, spin, Ms):
-        self.mesh = mesh
-        self.spin = spin
-        self.n = mesh.n
-
-        self.Ms = Ms
-        self.Ms_long = np.zeros(3 * mesh.n)
-
-        # TODO: Check if it is necessary to define a 3D matrix for
-        # the Ms vectors. Maybe there is a way that uses less memory
-        # (see the calculation in the *compute_energy* function)
-        self.Ms_long.shape = (3, -1)
-        for i in range(mesh.n):
-            self.Ms_long[:, i] = Ms[i]
-
-        self.Ms_long.shape = (-1,)
-        self.field = np.zeros(3 * self.n)
-
-    def compute_field(self, t=0, spin=None):
-        v = self.time_fun(t, *self.extra_args)
-        self.field[0::3] = v[0]
-        self.field[1::3] = v[1]
-        self.field[2::3] = v[2]
-        #self.field[::3] = v
-        return self.field
-
-
-class TimeZeemanFast(Zeeman):
-
-    """
-    The time dependent external field, also can vary with space. This uses
-    an unsafe setting function. Should not be used except by advanced users.
-
-    The function must handle coordinates
-
-    The function time_fun must be a function which takes three or more arguments. The time variable is always passed in as the first argument
-    in params.
-
-    e.g.
-
-    from libc.math cimport sin
-
-    def fast_sin_init(mesh, double[:] field, *params):
-        t, axis, Bmax, fc = params
-        for i in range(mesh.n):
-            x, y, z = mesh.coordinates[i]
-            if x < 10:
-                field[3*i+0] = Bmax * axis[0] * sin(fc*t)
-                field[3*i+1] = Bmax * axis[1] * sin(fc*t)
-                field[3*i+2] = Bmax * axis[2] * sin(fc*t)
-
-    Add the function to a user Cython module in fidimag/user/ and recompile.
-
+    The time dependent external field, also can vary with space
     """
 
-    def __init__(self, time_fun, extra_args=[], name='TimeZeemanFast'):
+    def __init__(self, H0, time_fun, extra_args=[], name='TimeZeeman'):
+        self.H0 = H0
         self.time_fun = time_fun
         self.name = name
         self.jac = True
-        self.extra_args = extra_args
 
     def setup(self, mesh, spin, Ms):
-        self.mesh = mesh
-        self.spin = spin
-        self.n = mesh.n
-
-        self.Ms = Ms
-        self.Ms_long = np.zeros(3 * mesh.n)
-
-        # TODO: Check if it is necessary to define a 3D matrix for
-        # the Ms vectors. Maybe there is a way that uses less memory
-        # (see the calculation in the *compute_energy* function)
-        self.Ms_long.shape = (3, -1)
-        for i in range(mesh.n):
-            self.Ms_long[:, i] = Ms[i]
-
-        self.Ms_long.shape = (-1,)
-        self.field = np.zeros(3 * self.n)
+        super(TimeZeeman, self).setup(mesh, spin, Ms)
+        self.H_init = self.field.copy()
 
     def compute_field(self, t=0, spin=None):
-        helper.init_vector_func_fast(self.time_fun,
-                                     self.mesh,
-                                     self.field,
-                                     False,
-                                     t, *self.extra_args)
-        return self.field
+        self.field[:] = self.H_init[:] * self.time_fun(t, *extra_args)
+        return self.field