Updated exchange class and started sim c++ class

Author: davidcortesortuno

fidimag/common/c_clib.pyx

@@ -255,6 +255,7 @@ cdef extern from "c_energy.h":
                    double *energy, double *field
                    )
 
+        # # Not using these variables from Cython:
         # bool set_up
         # int nx, ny, nz, n
         # double dx, dy, dz
@@ -271,7 +272,6 @@ cdef extern from "c_energy.h":
         ExchangeEnergy() except +
 
         void init(double *A)
-
         # double *A
 
 # cdef extern from "c_energy.cpp":
@@ -287,49 +287,49 @@ cdef extern from "c_energy.h":
 # __cinit__ and __dealloc__ methods which are guaranteed to be called exactly
 # once upon creation and deletion of the Python instance.
 
-#cdef class PyEnergy:
-#    cdef Energy *thisptr
-#    # Try cinit:
-#    def __cinit__(self):
-#        # Should we allocate?
-#        # self.thisptr = new Energy()
-#        print("In Python A")
-
-# No need to replicate C++ class structure; we make the ExchangeEnergy a
-# base class in Python (which we know inherits from Energy in C++)
-cdef class PyExchangeEnergy(object):
-    cdef ExchangeEnergy *derivedptr
+cdef class PyEnergy:
+    cdef Energy *thisptr
+    def __cinit__(self):
+        # No need to allocate memory, we are not using the C++ base class
+        # self.thisptr = new Energy()
+        if type(self) != PyEnergy:
+            return
+        print("In Python A")
+
+    # Necessary?:
+    def compute_field(self, t):
+        self.thisptr.compute_field(t)
+
+    def compute_energy(self, time):
+        return self.thisptr.compute_energy()
+
+    def setup(self, nx, ny, nz, dx, dy, dz, unit_length,
+              double [:] spin, double [:] Ms, double [:] Ms_inv,
+              double [:, :] coordinates, int [:, :] neighbours,
+              double [:] energy, double [:] field):
+
+        return self.thisptr.setup(nx, ny, nz, dx, dy, dz, unit_length,
+                                  &spin[0], &Ms[0], &Ms_inv[0],
+                                  &coordinates[0, 0], &neighbours[0, 0],
+                                  &energy[0], &field[0]
+                                  )
+
+
+cdef class PyExchangeEnergy(PyEnergy):
+    cdef ExchangeEnergy *_thisptr
     # Try cinit:
     def __cinit__(self, double [:] A):
         print("In Python B")
 
-        self.derivedptr = new ExchangeEnergy()
-        self.derivedptr.init(&A[0])
+        self._thisptr = self.thisptr = new ExchangeEnergy()
+        self._thisptr.init(&A[0])
 
     def __dealloc__(self):
-        del self.derivedptr
+        del self.thisptr
 
     # DEBUG: check contents of the A array
     # def printA(self):
     #     lst = []
     #     for i in range(4):
     #         lst.append(self.derivedptr.A[i])
     #     print(lst)
-
-    # Necessary?:
-    def compute_field(self, t):
-        self.derivedptr.compute_field(t)
-
-    def compute_energy(self, time):
-        return self.derivedptr.compute_energy()
-
-    def setup(self, nx, ny, nz, dx, dy, dz, unit_length,
-              double [:] spin, double [:] Ms, double [:] Ms_inv,
-              double [:, :] coordinates, int [:, :] neighbours,
-              double [:] energy, double [:] field):
-
-        return self.derivedptr.setup(nx, ny, nz, dx, dy, dz, unit_length,
-                                     &spin[0], &Ms[0], &Ms_inv[0],
-                                     &coordinates[0, 0], &neighbours[0, 0],
-                                     &energy[0], &field[0]
-                                     )

fidimag/micro/exchange.py

@@ -1,6 +1,5 @@
 import fidimag.extensions.micro_clib as micro_clib
 from .energy import Energy
-#from constant import mu_0
 
 
 class UniformExchange(Energy):
@@ -9,12 +8,12 @@ class UniformExchange(Energy):
     UniformExchange(A, name='UniformExchange')
 
     Compute the exchange field in micromagnetics.
-    
+
     Inputs:
         A: float
-            A is the exchange stiffness constant measured in 
+            A is the exchange stiffness constant measured in
             Joules / Meter (J / M)
-    
+
     """
 
     def __init__(self, A, name='UniformExchange'):

native/include/c_micro_sim.h

@@ -0,0 +1,42 @@
+#include<cmath>
+#include<iostream>
+#include<vector>
+// #define MAX_ENERGY_TERMS 20
+
+class MicroSim {
+public:
+    MicroSim() {std::cout << "Instatiating MicroSim class; at " << this << "\n";};
+    virtual ~MicroSim() {std::cout << "Killing MicroSim\n";};
+    bool set_up;
+
+    // From the mesh
+    int nx, ny, nz, n;
+    double dx, dy, dz;
+    double unit_length;
+    double *coordinates;
+    int *ngbs;
+
+    // Arrays of material properties
+    double *spin;
+    double *Ms;
+    double *Ms_inv;
+    double *energy;
+    double *field;
+    double *pins;
+
+    // Array with interactions
+    // void * interactions;
+    // int interactions_id[MAX_ENERGY_TERMS];
+    std::vector<void *> interactions;
+    std::vector<int> interactions_id;
+
+    // Methods
+    void setup(int nx, int ny, int nz, double dx, double dy, double dz,
+               double unit_length, double *coordinates, int *ngbs, 
+               double *spin, double *Ms, double *Ms_inv, 
+               double *energy, double *field, double *pins
+               );
+
+    void add_interaction(void * interaction);
+
+};