Merge pull request #140 from computationalmodelling/fmm

FMM Code

Author: rpep

.gitignore

@@ -6,6 +6,8 @@
 *.pdf
 *.tmp
 *.so
+*.o
+
 local/
 *~
 *.bak
@@ -51,3 +53,4 @@ test-reports
 
 *.npz
 *.npy
+fmm.cpp

.travis.yml

@@ -7,7 +7,7 @@ services:
   - docker
 
 before_install:
-  - docker build -t fidimag -f ./docker/travis/Dockerfile .
+  - travis_wait 90 docker build -t fidimag -f ./docker/travis/Dockerfile .
   - docker run -ti -d --name fidimag fidimag
 
 jobs:

Makefile

@@ -8,7 +8,7 @@ PYTEST = ${PYTHON} -m pytest
 #####################
 
 build:
-	${PYTHON} setup.py build_ext --inplace
+	${PYTHON} setup.py build_ext --inplace -j2
 
 clean:
 	rm -rf ${EXTENSIONS_DIR}/*

bin/install-fftw.sh

@@ -36,7 +36,7 @@ download_and_install() {
         ./configure --quiet --enable-shared --enable-openmp --enable-sse2 --enable-avx --prefix=${LIBS_DIR}
         echo "Compiling and installing "${1}"."
         {
-            make
+            make -j2
             make install
         } > /dev/null
         echo "Done."

bin/install-sundials.sh

@@ -39,7 +39,7 @@ download_and_cmake_install() {
 
         echo "Compiling and installing "${1}"."
         {
-            make
+            make -j2
             make install
         } > /dev/null
 

docker/travis/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # To build this image `docker build -t fidimag .`
 # Then you can drop into a live bash shell with `docker run -it fidimag`.

fidimag/atomistic/__init__.py

@@ -2,7 +2,7 @@
 from .exchange import UniformExchange, Exchange
 from .anisotropy import Anisotropy, CubicAnisotropy
 from .zeeman import Zeeman, TimeZeeman
-from .demag import Demag
+from .demag import Demag, DemagFMM
 from .demag_hexagonal import DemagHexagonal
 from .hexagonal_mesh import HexagonalMesh
 from .demag_full import DemagFull

fidimag/atomistic/demag.py

@@ -1,6 +1,12 @@
 import fidimag.extensions.dipolar as clib
 import numpy as np
 from .energy import Energy
+import numpy as np
+import fidimag
+from fidimag.atomistic.energy import Energy
+import fidimag.extensions.fmm as fmm
+import time
+import sys
 
 
 class Demag(Energy):
@@ -41,7 +47,7 @@ def __init__(self, calc_every=0, name='Demag'):
 
     def setup(self, mesh, spin, mu_s, mu_s_inv):
         super(Demag, self).setup(mesh, spin, mu_s, mu_s_inv)
-        
+
         # Ryan Pepper 04/04/2019
         # We *do not* need to scale by mesh.unit_length**3 here!
         # This is because in the base energy class, dx, dy and dz
@@ -94,3 +100,39 @@ def compute_energy(self):
         self.energy /= self.scale
 
         return energy / self.scale
+
+
+class DemagFMM(Energy):
+    def __init__(self, order, ncrit, theta, name="DemagFMM", type='fmm'):
+        self.type = type
+        if self.type == 'fmm':
+            self._type = 0
+        elif self.type == 'bh':
+            self._type = 1
+
+        self.name = name
+        assert order > 0, "Order must be 1 or higher"
+        assert order < 11, "Order bust be < 11"
+        self.order = order
+        assert ncrit >= 2, "ncrit must be greater than 1."
+        self.ncrit = ncrit
+        assert theta >= 0.0, "theta must be >= 0.0"
+        self.theta = theta
+
+    def setup(self, mesh, spin, mu_s, mu_s_inv):
+        super(DemagFMM, self).setup(mesh, spin, mu_s, mu_s_inv)
+        self.coords = mesh.coordinates * mesh.unit_length
+        self.m_temp = np.zeros_like(spin)
+        self.fmm = fmm.FMM(self.n, self.ncrit, self.theta,
+                           self.order,
+                           self.coords,
+                           self.m_temp,
+                           self.mu_s, self._type
+                           )
+
+    def compute_field(self, t=0, spin=None):
+        print('computing field')
+        self.m_temp[:] = spin if spin is not None else self.spin
+        self.fmm.compute_field(self.field)
+        self.field *= -1e-7
+        return self.field