Fixed cython interface to c++ energy classes

Author: davidcortesortuno

fidimag/common/c_clib.pyx

@@ -285,12 +285,35 @@ 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 PyExchangeEnergy:
-    cdef ExchangeEnergy *thisptr
+cdef class PyEnergy:
+    cdef Energy *thisptr
     # Try cinit:
-    def __cinit__(self, double [:] A):
+    def __cinit__(self):
+        # Should we allocate?
         # self.thisptr = new ExchangeEnergy()
-        self.thisptr.init(&A[0])
+        print("In Python A")
+
+# We need to inherit from a cdef-ined base class to make the inheritance to
+# work. This way the constructors are called properly
+cdef class PyExchangeEnergy(PyEnergy):
+    cdef ExchangeEnergy *derivedptr
+    # Try cinit:
+    def __cinit__(self, double [:] A):
+        print("In Python B")
+
+        self.derivedptr = new ExchangeEnergy()
+        self.derivedptr.init(&A[0])
+
+        if self.thisptr:
+            print("in B: deallocating old A")
+            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)
 
     # We could use another constructor if we use this method:
     # def __cinit__(self):
@@ -299,13 +322,14 @@ cdef class PyExchangeEnergy:
     # def __dealloc__(self):
     #     if type(self) is PyExchangeEnergy:
     #         del self.thisptr
-    # Necessary?
+
+    # Necessary?:
     def compute_field(self, t):
-        self.thisptr.compute_field(t)
+        self.derivedptr.compute_field(t)
     def compute_energy(self, time):
-        return self.thisptr.compute_energy()
+        return self.derivedptr.compute_energy()
     def setup(self, nx, ny, nz, dx, dy, dz, unit_length,
               double [:] spin, double [:] Ms, double [:] Ms_inv):
-        return self.thisptr.setup(nx, ny, nz, dx, dy, dz, unit_length,
-                                  &spin[0], &Ms[0], &Ms_inv[0])
+        return self.derivedptr.setup(nx, ny, nz, dx, dy, dz, unit_length,
+                                     &spin[0], &Ms[0], &Ms_inv[0])
 

native/include/c_energy.h

@@ -3,7 +3,8 @@
 
 class Energy {
 public:
-    Energy();
+    Energy() {std::cout << "In A; at " << this << "\n";};
+    ~Energy() {std::cout << "Killing A\n";};
     bool set_up;
     int nx, ny, nz, n;
     double dx, dy, dz;
@@ -16,17 +17,20 @@ class Energy {
     double *coordinates;
     int *ngbs;
     double compute_energy();
-    void setup(int nx, int ny, int nz, double dx, double dy, double dz, double unit_length, double *spin, double *Ms, double *Ms_inv);
-    virtual void compute_field(double t) = 0;
+    void setup(int nx, int ny, int nz, double dx, double dy, double dz,
+               double unit_length, double *spin, double *Ms, double *Ms_inv,
+               double *coordinates, double *ngbs, 
+               double *energy, double *field
+               );
+    virtual void compute_field(double t) {};
 };
 
 class ExchangeEnergy : public Energy {
 public:
-    ExchangeEnergy() {};
+    ExchangeEnergy() {std::cout << "In B; at " << this << "\n";};
     void init(double *A) {
-        std::cout << "Here A[0] = " << A[0] << "\n";
         this->set_up = false;
-        // this->A = A;
+        this->A = A;
     }
     double *A;
     void compute_field(double t);

native/src/c_energy.cpp

@@ -10,21 +10,28 @@ double Energy::compute_energy() {
 }
 
 
-void Energy::setup(int nx, int ny, int nz,
-                   double dx, double dy, double dz,
-                   double unit_length,
-                   double *spin, double *Ms,
-                   double *Ms_inv) {
+void Energy::setup(int nx, int ny, int nz, double dx, double dy, double dz,
+                   double unit_length, double *spin, double *Ms, double *Ms_inv,
+                   double *coordinates, double *ngbs, 
+                   double *energy, double *field
+                   ); {
     this->nx = nx;
     this->ny = ny;
     this->nz = nz;
     this->dx = dx;
     this->dy = dy;
     this->dz = dz;
     this->unit_length = unit_length;
+
+    // Arrays
     this->spin = spin;
     this->Ms = Ms;
     this->Ms_inv = Ms_inv;
+    this->coordinates = coordinates;
+    this->ngbs = ngbs;
+    this ->energy->energy;
+    this->field = field;
+
     set_up = true;
 }