Move micro C++ files to native directory and resolve duplicate function names

rpep · rpep · commit 7e42a9452d95 · 2019-05-09T23:35:59.000+01:00
diff --git a/fidimag/common/lib/helper_cython.cpp b/fidimag/common/lib/helper_cython.cpp
diff --git a/fidimag/micro/lib/anis.cpp b/fidimag/micro/lib/anis.cpp
diff --git a/fidimag/micro/lib/baryakhtar_clib.pyx b/fidimag/micro/lib/baryakhtar_clib.pyx
diff --git a/native/Makefile b/native/Makefile
@@ -0,0 +1,32 @@
+.PHONY : clean
+
+FFTW_INC=../local/include
+FFTW_LIB=../local/lib
+
+SUNDIALS_INC=../local/include
+SUNDIALS_LIB=../local/lib
+
+CPPFLAGS = -fPIC -g -Iinclude/ \
+           -I${FFTW_INC} -L${FFTW_LIB} \
+           -I${SUNDIALS_INC} -L${SUNDIALS_LIB} \
+           -lm \
+           -lfftw3_omp -lfftw3 \
+           -lsundials_cvodes -lsundials_nvecserial -lsundials_nvecopenmp \
+           -lblas -llapack \
+           -fopenmp
+
+LDFLAGS = -shared
+
+SOURCES = $(shell echo src/*.cpp)
+
+OBJECTS = $(SOURCES:.cpp=.o)
+
+TARGET = libfidimag.so
+
+all: $(TARGET)
+
+clean:
+	rm -rf $(OBJECTS) $(TARGET) *.dSYM
+
+$(TARGET) : $(OBJECTS)
+	$(CXX) $(CPPFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
diff --git a/native/include/m_baryakhtar_clib.h b/native/include/m_baryakhtar_clib.h
@@ -5,10 +5,6 @@
 #define WIDE_PI 3.1415926535897932384626433832795L
 #define MU0 1.25663706143591728850e-6
 
-inline double cross_x(double a0, double a1, double a2, double b0, double b1, double b2) { return a1*b2 - a2*b1; }
-inline double cross_y(double a0, double a1, double a2, double b0, double b1, double b2) { return a2*b0 - a0*b2; }
-inline double cross_z(double a0, double a1, double a2, double b0, double b1, double b2) { return a0*b1 - a1*b0; }
-
 void compute_laplace_m(double *m, double *field, double *Ms, double dx, double dy, double dz,
 		int nx, int ny, int nz);
 
diff --git a/native/include/m_clib.h b/native/include/m_clib.h
@@ -1,17 +1,13 @@
 #include<math.h>
-
 #include<omp.h>
 
 #define WIDE_PI 3.1415926535897932384626433832795L
 #define MU0 1.25663706143591728850e-6
 #define MU0_INV 795774.71545947669074
 
-inline double cross_x(double a0, double a1, double a2,
-                      double b0, double b1, double b2) { return a1*b2 - a2*b1; }
-inline double cross_y(double a0, double a1, double a2,
-                      double b0, double b1, double b2) { return a2*b0 - a0*b2; }
-inline double cross_z(double a0, double a1, double a2,
-                      double b0, double b1, double b2) { return a0*b1 - a1*b0; }
+double cross_x(double a0, double a1, double a2, double b0, double b1, double b2);
+double cross_y(double a0, double a1, double a2, double b0, double b1, double b2);
+double cross_z(double a0, double a1, double a2, double b0, double b1, double b2);
 
 void compute_exch_field_micro(double * m, double * field, double * energy, double * Ms_inv,
                          double A, double dx, double dy, double dz, int n, int *ngbs);
diff --git a/native/src/m_anis.cpp b/native/src/m_anis.cpp
@@ -0,0 +1,29 @@
+#include "m_clib.h"
+
+void compute_uniaxial_anis(double * m, double * field, double * energy, double * Ms_inv, 
+			   double * Ku, double * axis, int nx, int ny, int nz) {
+  
+  int n = nx * ny * nz;
+  
+#pragma omp parallel for
+  for (int i = 0; i < n; i++) {
+    int j = 3 * i;
+    
+    if (Ms_inv[i] == 0.0){
+      field[j] = 0;
+      field[j + 1] = 0;
+      field[j + 2] = 0;
+      energy[i] = 0;
+      continue;
+    }
+    
+    double m_u = m[j] * axis[j] + m[j + 1] * axis[j + 1] + m[j + 2] * axis[j + 2];
+    
+    field[j]     = 2 * Ku[i] * m_u * Ms_inv[i] * MU0_INV * axis[j];
+    field[j + 1] = 2 * Ku[i] * m_u * Ms_inv[i] * MU0_INV * axis[j + 1];
+    field[j + 2] = 2 * Ku[i] * m_u * Ms_inv[i] * MU0_INV * axis[j + 2];
+    
+    energy[i] = Ku[i] * (1 - m_u * m_u); 
+  }
+}
+
diff --git a/native/src/m_baryakhtar_llg.cpp b/native/src/m_baryakhtar_llg.cpp
@@ -1,4 +1,6 @@
-#include "baryakhtar_clib.h"
+#include "m_clib.h"
+#include "m_baryakhtar_clib.h"
+
 
 void llg_rhs_baryakhtar(double *dm_dt, double *m, double *h, double *delta_h,
 		double *alpha, double beta, int *pins,
diff --git a/native/src/m_baryakhtar_util.cpp b/native/src/m_baryakhtar_util.cpp
@@ -1,4 +1,4 @@
-#include "baryakhtar_clib.h"
+#include "m_baryakhtar_clib.h"
 
 void compute_laplace_m(double *m, double *field, double *Ms, double dx,
 		double dy, double dz, int nx, int ny, int nz) {
diff --git a/native/src/m_dmi.cpp b/native/src/m_dmi.cpp
@@ -1,4 +1,4 @@
-#include "micro_clib.h"
+#include "m_clib.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/native/src/m_exch.cpp b/native/src/m_exch.cpp
@@ -1,4 +1,4 @@
-#include "micro_clib.h"
+#include "m_clib.h"
 
 void compute_exch_field_micro(double * m, double * field, double * energy,
 			      double * Ms_inv, double A, double dx, double dy, double dz,
diff --git a/native/src/m_util.cpp b/native/src/m_util.cpp
@@ -1,4 +1,17 @@
-#include "micro_clib.h"
+#include "m_clib.h"
+
+double cross_x(double a0, double a1, double a2, double b0, double b1, double b2) {
+  return a1*b2 - a2*b1;
+}
+
+double cross_y(double a0, double a1, double a2, double b0, double b1, double b2) {
+  return a2*b0 - a0*b2;
+}
+
+double cross_z(double a0, double a1, double a2, double b0, double b1, double b2) {
+  return a0*b1 - a1*b0;
+}
+
 
 // Compute: S \cdot (S_i \times S_j)
 inline double volume(double S[3], double Si[3], double Sj[3]) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "baryakhtar_clib.h"`
	`1`	`+#include "m_baryakhtar_clib.h"`
`2`	`2`
`3`	`3`	`void compute_laplace_m(double m, double field, double *Ms, double dx,`
`4`	`4`	`double dy, double dz, int nx, int ny, int nz) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "micro_clib.h"`
	`1`	`+#include "m_clib.h"`
`2`	`2`	`#include <stdlib.h>`
`3`	`3`	`#include <stdio.h>`
`4`	`4`	`#include <math.h>`