Move common and atomistic to native directory

rpep · rpep · commit f8b61076f18a · 2019-05-09T23:54:47.000+01:00
diff --git a/fidimag/atomistic/lib/a_clib.pyx b/fidimag/atomistic/lib/a_clib.pyx
diff --git a/fidimag/atomistic/lib/fmmlib/fmmlib.cpp b/fidimag/atomistic/lib/fmmlib/fmmlib.cpp
diff --git a/native/include/a_clib.h b/native/include/a_clib.h
@@ -1,12 +1,11 @@
-#ifndef __CLIB__
-#define __CLIB__
+#pragma once
 
 #include <complex.h>
 #include <fftw3.h>
 #include <math.h>
-//#include<omp.h>
+#include<omp.h>
 
-#include "fidimag_random.h"
+#include "a_random.h"
 
 #define WIDE_PI 3.1415926535897932384626433832795L
 
@@ -118,5 +117,3 @@ void run_step_mc(mt19937_state *state, double *spin, double *new_spin,
                  int *ngbs, int *nngbs, int n_ngbs, double J, double J1, double D,
                  double D1, double *h, double Kc, int n, double T,
                  int hexagonal_mesh);
-
-#endif
diff --git a/native/include/a_random.h b/native/include/a_random.h
diff --git a/native/include/c_clib.h b/native/include/c_clib.h
@@ -1,8 +1,7 @@
-#ifndef __CLIB__
-#define __CLIB__
+#pragma once
 
 #include <math.h>
-//#include<omp.h>
+#include<omp.h>
 #define WIDE_PI 3.1415926535897932384626433832795L
 
 // ----------------------------------------------------------------------------
@@ -74,6 +73,3 @@ void sd_update_spin (double *spin, double *spin_last, double *magnetisation,
 void sd_compute_step (double *spin, double *spin_last, double *magnetisation, double *field, 
                       double *mxH, double *mxmxH, double *mxmxH_last, double tau,
                       int *pins, int n, int counter, double tmin, double tmax);
-
-
-#endif
diff --git a/native/include/c_demagcoef.h b/native/include/c_demagcoef.h
diff --git a/native/include/c_dipolar.h b/native/include/c_dipolar.h
diff --git a/native/include/c_nebm_geodesic_lib.h b/native/include/c_nebm_geodesic_lib.h
diff --git a/native/include/c_nebm_integrators.h b/native/include/c_nebm_integrators.h
diff --git a/native/include/c_nebm_lib.h b/native/include/c_nebm_lib.h
diff --git a/native/include/c_nebm_spherical_lib.h b/native/include/c_nebm_spherical_lib.h
diff --git a/native/include/c_tensor_2dpbc.h b/native/include/c_tensor_2dpbc.h
diff --git a/native/src/a_anis.cpp b/native/src/a_anis.cpp
@@ -1,4 +1,4 @@
-#include "clib.h"
+#include "a_clib.h"
 
 
 void compute_anis(double * spin, double * field,
diff --git a/native/src/a_demag_full.cpp b/native/src/a_demag_full.cpp
@@ -1,4 +1,4 @@
-#include "clib.h"
+#include "a_clib.h"
 #include "math.h"
 #include "stdlib.h"
 
diff --git a/native/src/a_dmi.cpp b/native/src/a_dmi.cpp
@@ -1,4 +1,4 @@
-#include "clib.h"
+#include "a_clib.h"
 #include "math.h"
 #include "stdlib.h"
 
diff --git a/native/src/a_exch.cpp b/native/src/a_exch.cpp
@@ -1,4 +1,4 @@
-#include "clib.h"
+#include "a_clib.h"
 
 /*
  compute the effective exchange field at site i
diff --git a/native/src/a_mc.cpp b/native/src/a_mc.cpp
@@ -1,5 +1,5 @@
-#include "clib.h"
-#include "fidimag_random.h"
+#include "a_clib.h"
+#include "a_random.h"
 
 inline double dot(double a[3], double b[3]) {
   return a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
diff --git a/native/src/a_random.cpp b/native/src/a_random.cpp
@@ -1,7 +1,7 @@
 #include <stdlib.h>  // rand(), srand()
 #include <time.h>
 #include <math.h>
-#include "fidimag_random.h"
+#include "a_random.h"
 
 mt19937_state *create_mt19937_state(void) {
     
diff --git a/native/src/a_sllg.cpp b/native/src/a_sllg.cpp
@@ -1,4 +1,4 @@
-#include "clib.h"
+#include "a_clib.h"
 
 /*
 * n is the spin number
diff --git a/native/src/a_util.cpp b/native/src/a_util.cpp
@@ -1,4 +1,4 @@
-#include "clib.h"
+#include "a_clib.h"
 #include "complex.h"
 #include "math.h"
 
diff --git a/native/src/c_demag.cpp b/native/src/c_demag.cpp
@@ -1,8 +1,8 @@
 #include <math.h>
 #include <stdlib.h>
 #include <omp.h>
-#include "dipolar.h"
-#include "demagcoef.h"
+#include "c_dipolar.h"
+#include "c_demagcoef.h"
 
 
 inline double Nxxdipole(double x, double y, double z) {
diff --git a/native/src/c_demag_oommf.cpp b/native/src/c_demag_oommf.cpp
@@ -42,8 +42,8 @@ to copyright protection within the United States.
 
 #include <math.h>
 #include <stdlib.h>
-#include "dipolar.h"
-#include "demagcoef.h"
+#include "c_dipolar.h"
+#include "c_demagcoef.h"
 
 
 /* FILE: demagcoef.cc            -*-Mode: c++-*-
diff --git a/native/src/c_llg.cpp b/native/src/c_llg.cpp
@@ -1,4 +1,4 @@
-#include "common_clib.h"
+#include "c_clib.h"
 
 /* The right hand side of the LLG equation for the CVOde solver.  This can be
  * used both for the micromagnetic and atomistic codes since m or S are unitless
diff --git a/native/src/c_nebm_geodesic_lib.cpp b/native/src/c_nebm_geodesic_lib.cpp
@@ -1,5 +1,5 @@
-#include "nebm_geodesic_lib.h"
-#include "nebm_lib.h"
+#include "c_nebm_geodesic_lib.h"
+#include "c_nebm_lib.h"
 #include "math.h"
 
 double compute_geodesic_Vincenty(double * A, double * B,
diff --git a/native/src/c_nebm_integrators.cpp b/native/src/c_nebm_integrators.cpp
@@ -1,5 +1,5 @@
 #include "math.h"
-#include "nebm_lib.h"
+#include "c_nebm_lib.h"
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -17,8 +17,6 @@ double step_Verlet_C(double * forces,
                       
                      ) {
 
-    printf("Hellooooooo\n");
-
     update_field(t, y);
 
     int im_idx;
diff --git a/native/src/c_nebm_lib.cpp b/native/src/c_nebm_lib.cpp
@@ -1,4 +1,4 @@
-#include "nebm_lib.h"
+#include "c_nebm_lib.h"
 #include "math.h"
 #include <stdlib.h>
 
diff --git a/native/src/c_nebm_spherical_lib.cpp b/native/src/c_nebm_spherical_lib.cpp
@@ -1,5 +1,5 @@
-#include "nebm_spherical_lib.h"
-#include "nebm_lib.h"
+#include "c_nebm_spherical_lib.h"
+#include "c_nebm_lib.h"
 #include "math.h"
 
 double compute_norm_spherical(double * a, int n, int scale) {
diff --git a/native/src/c_steepest_descent.cpp b/native/src/c_steepest_descent.cpp
@@ -1,4 +1,4 @@
-#include "common_clib.h"
+#include "c_clib.h"
 #include "math.h"
 
 void sd_update_spin (double *spin, double *spin_last, double *magnetisation,
diff --git a/native/src/c_stt.cpp b/native/src/c_stt.cpp
@@ -1,4 +1,4 @@
-#include "common_clib.h"
+#include "c_clib.h"
 
 /* Calculation of the STT field using the Zhang Li formalism, which
  * is
diff --git a/native/src/c_tensor_2dpbc.cpp b/native/src/c_tensor_2dpbc.cpp
@@ -1,8 +1,8 @@
 #include <math.h>
 #include <stdlib.h>
-#include "dipolar.h"
-#include "demagcoef.h"
-#include "tensor_2dpbc.h"
+#include "c_dipolar.h"
+#include "c_demagcoef.h"
+#include "c_tensor_2dpbc.h"
 
 double DemagTensorNormal(enum Type_Nij comp,double x,double y,double z,double a,double b,double c)
 {
