Skip to content

Commit

Permalink
fix cmake default no hdf5, no subcycling printing in mover
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivy committed Sep 24, 2016
1 parent 8206bb5 commit e7f8a00
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
24 changes: 11 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions particles/Particles3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down

0 comments on commit e7f8a00

Please sign in to comment.