more intel crap

Author: pcarruscag

Common/include/containers/C2DContainer.hpp

@@ -584,7 +584,7 @@ class C2DContainer :
     static_assert(Size, "This method requires a static output type.");
     assert(Size <= cols()-start);
     StaticContainer ret;
-    SU2_OMP_SIMD_IF_NOT_AD
+    SU2_OMP_SIMD
     for (size_t i=0; i<Size; ++i)
       ret.data()[i] = m_data[IsRowMajor? row*cols()+i+start : row+(i+start)*rows()];
     return ret;
@@ -601,7 +601,7 @@ class C2DContainer :
     assert(Size <= cols()-start);
     StaticContainer ret;
     for (size_t k=0; k<N; ++k) {
-      SU2_OMP_SIMD_IF_NOT_AD
+      SU2_OMP_SIMD
       for (size_t i=0; i<Size; ++i)
         ret.data()[i][k] = m_data[IsRowMajor? row[k]*cols()+i+start : row[k]+(i+start)*rows()];
     }

Common/include/linear_algebra/CSysVector.hpp

@@ -90,7 +90,7 @@ class CSysVector : public VecExpr::CVecExpr<CSysVector<ScalarType>, ScalarType>
   FORCEINLINE static void UnpackBlock(const VecTypeSIMD& in, simd::Array<F, N> mask, ScalarType out[][nVar]) {
     static_assert(VecTypeSIMD::StaticSize, "This method requires static size vectors.");
     for (size_t i = 0; i < nVar; ++i) {
-      SU2_OMP_SIMD_IF_NOT_AD
+      SU2_OMP_SIMD
       for (size_t k = 0; k < N; ++k) out[k][i] = mask[k] * in[i][k];
     }
   }
@@ -413,7 +413,7 @@ class CSysVector : public VecExpr::CVecExpr<CSysVector<ScalarType>, ScalarType>
     /*--- Update one by one skipping if mask is 0. ---*/
     for (size_t k = 0; k < N; ++k) {
       if (mask[k] == 0) continue;
-      SU2_OMP_SIMD_IF_NOT_AD
+      SU2_OMP_SIMD
       for (size_t i = 0; i < nVar; ++i) vec_val[iPoint[k] * nVar + i] = vec[k][i];
     }
   }
@@ -434,7 +434,7 @@ class CSysVector : public VecExpr::CVecExpr<CSysVector<ScalarType>, ScalarType>
     /*--- Update one by one skipping if mask is 0. ---*/
     for (size_t k = 0; k < N; ++k) {
       if (mask[k] == 0) continue;
-      SU2_OMP_SIMD_IF_NOT_AD
+      SU2_OMP_SIMD
       for (size_t i = 0; i < nVar; ++i) {
         vec_val[iPoint[k] * nVar + i] += vec[k][i];
         vec_val[jPoint[k] * nVar + i] -= vec[k][i];

Common/include/omp_structure.hpp

@@ -117,12 +117,6 @@ inline void omp_destroy_lock(omp_lock_t*){}
 #define SU2_OMP_SIMD
 #endif
 
-#if defined(CODI_FORWARD_TYPE) || defined(CODI_REVERSE_TYPE)
-#define SU2_OMP_SIMD_IF_NOT_AD
-#else
-#define SU2_OMP_SIMD_IF_NOT_AD SU2_OMP_SIMD
-#endif
-
 /*--- Convenience macros (do not use excessive nesting). ---*/
 
 #define SU2_OMP_MASTER SU2_OMP(master)

externals/metis/meson.build

@@ -1,9 +1,11 @@
 metis_c_args = ['-D_FILE_OFFSET_BITS=64', '-DNDEBUG', '-DNDEBUG2', '-DHAVE_GETLINE', '-DUSE_GKREGEX']
 
-if build_machine.system() == 'windows'
-  metis_default_warnings = []
-else
-  metis_default_warnings = ['-Wno-implicit-function-declaration', '-Wno-unused-result', '-Wno-macro-redefined']
+metis_default_warnings = []
+if build_machine.system() != 'windows'
+  metis_default_warnings += ['-Wno-implicit-function-declaration']
+  if meson.get_compiler('cpp').get_id() != 'intel'
+    metis_default_warnings += ['-Wno-unused-result', '-Wno-macro-redefined']
+  endif
 endif
 
 metis_src = ['GKlib/pqueue.c',