Merge branch 'mpi' of gitlab.com:aduprop/aduprop into mpi

exanauts · Mar 20, 2018 · f763e2d · f763e2d
2 parents 491e0ea + 8b588c0
commit f763e2d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/include/ad.hpp b/include/ad.hpp
@@ -35,6 +35,13 @@ original variable.
 #include <stdlib.h>
 #include "parallel.hpp"
 //#include "linsolve.hpp"
+//
+#ifdef __INTEL_COMPILER
+#define RESTRICT restrict
+#else
+#define RESTRICT __restrict__
+#endif
+
 
 using namespace std;
 using namespace alg;
@@ -859,12 +866,6 @@ void propagateAD(pVector<double>& m0, pMatrix<double>& cv0, System& sys,
 
     double aux, kurt;
 
-#ifdef __INTEL_COMPILER
-#define RESTRICT restrict
-#else
-#define RESTRICT __restrict__
-#endif
-
     double * RESTRICT ptr_cv0 = cv0.get_datap();
     double * RESTRICT ptr_cv_temp2 = cv_temp2.get_datap();
     double * RESTRICT ptr_J = J.get_datap();

diff --git a/include/alg.hpp b/include/alg.hpp
@@ -13,6 +13,12 @@
 #include <vector>       // std::vector
 #include "tensor.hpp"
 
+#ifdef __INTEL_COMPILER
+#define RESTRICT restrict
+#else
+#define RESTRICT __restrict__
+#endif
+
 namespace alg {
 
 // First, second and third order AD datatype
@@ -108,7 +114,7 @@ template <typename T> class pVector {
 
  private:
   size_t n;
-  T* data = NULL;
+  T* RESTRICT data = NULL;
 };
 
 template <typename T> inline size_t pVector<T>::dim() const {