Drobnosti

netbeans_build.sh

@@ -3,5 +3,5 @@
 module load gcc-5.3.0 cmake-3.4.3 intel_parallel_studio_ex-2016.1
 cd Debug
 #make -j 6 tnlMICArrayTest-dbg
-make -j 6 tnlMICVectorTest-dbg
-#make -j 6 tnl-heat-equation-dbg
\ No newline at end of file
+#make -j 6 tnlMICVectorTest-dbg
+make -j 6 tnl-heat-equation-dbg
\ No newline at end of file

netbeans_run_debug_satanexperimental.sh

@@ -116,5 +116,5 @@ module load gcc-5.3.0 cmake-3.4.3 intel_parallel_studio_ex-2016.1
 cd Debug/bin
  export OFFLOAD_REPORT=0
 #./tnlMICArrayTest-dbg
-./tnlMICVectorTest-dbg
-# heat_eq
+#./tnlMICVectorTest-dbg
+ heat_eq

src/TNL/Math.h

@@ -96,13 +96,13 @@ typename enable_if_same_base< T, int >::type
 max( const T& a, const T& b )
 {
 #ifdef __CUDA_ARCH__
-   return ::max( a, b );
+   
 #else
-   /*return std::max( a, b );*/
-   if(a>=b)
-       return a;
-   else
-       return b;
+    #ifdef __MIC__
+       return ::max( a, b );
+    #else
+       return std::max( a, b );
+    #endif
 #endif
 }