From e7f8a002063ed0d08fda13ec83353525584a6897 Mon Sep 17 00:00:00 2001
From: Ivy <you@example.com>
Date: Sat, 24 Sep 2016 14:21:33 -0500
Subject: [PATCH] fix cmake default no hdf5, no subcycling printing in mover

---
 CMakeLists.txt            | 24 +++++++++++-------------
 particles/Particles3D.cpp |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e28c491..29f7018 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") ## Xeon
      set(CMAKE_CXX_COMPILER "icpc")  
    endif()
    #set(CMAKE_CXX_FLAGS "-O3 -openmp -g -xHost -fno-exceptions -vec-report")
-   set(CMAKE_CXX_FLAGS  "-O3 -DNO_HDF5  -DPRINTPCL") # -DPRINTPCL for printing particle subcycles  -DNO_HDF5 to disable output
+   set(CMAKE_CXX_FLAGS  "-O3 -h noomp -DNO_HDF5  ") # -DPRINTPCL for printing particle subcycles  -DNO_HDF5 to disable output
 else()
    set(CMAKE_CXX_FLAGS "-O3")
 endif()
@@ -49,23 +49,21 @@ else()
    set(EXTRA_LIBS "")   
 endif()
 
-SITE_NAME(myhostname)
-if (${myhostname} MATCHES "(.*)pdc(.*)")
-   set(HDF5_INCLUDE_DIRS /opt/cray/hdf5/1.8.7/cray/73/include)
-#elseif(${myhostname} MATCHES "localhost")
-#   set(CMAKE_CXX_COMPILER mpicc)  
-#   set(CMAKE_CXX_FLAGS "-O2")
-#   set(CMAKE_PREFIX_PATH /Users/Ivy/Software/install/hdf5-1.8.14/)
-#   find_package(HDF5 COMPONENTS HL C )
-#else()
-#    find_package(HDF5 COMPONENTS HL C )   
-endif()
 
+if(${CMAKE_CXX_FLAGS} MATCHES "(.*)-DNO_HDF5(.*)")
+#do nothing
+else()
+	SITE_NAME(myhostname)
+	if (${myhostname} MATCHES "(.*)pdc(.*)")
+   	   set(HDF5_INCLUDE_DIRS /opt/cray/hdf5/1.8.7/cray/73/include)
+	else()
+		find_package(HDF5 COMPONENTS HL C )   
+	endif()
+endif()
 
 #
 # include and lib directories
 #
-
 # include_directories: files there are accessible to the project
 include_directories(
         include
diff --git a/particles/Particles3D.cpp b/particles/Particles3D.cpp
index 74410d9..f1f3a8f 100644
--- a/particles/Particles3D.cpp
+++ b/particles/Particles3D.cpp
@@ -758,9 +758,9 @@ void Particles3D::mover_PC_AoS(Field * EMf)
 		  wavg_old = wavg;
 
 		}// end of iteration
-
+#ifdef PRINTPCL
 		sum_innter +=innter;
-
+#endif
 		// update the final position and velocity
 		if(cap_velocity())
 		{