Now working as the hybrid code

Removed the need for the annoying ETICS_CEP flag; now dt_scf is read from the config file.
This commit is contained in:
Yohai Meiron 2020-04-13 23:08:42 -04:00
parent 75ad0f0e89
commit b51613695f
5 changed files with 140 additions and 95 deletions

View file

@ -2,8 +2,6 @@ CUDAHOME ?= /usr/local/cuda
CPPFLAGS += -DETICS
OPTIMIZATION ?= 3
ETICS_DTSCF ?= 0.015625
CUDAINC = -I$(CUDAHOME)/include -I$(CUDAHOME)/samples/common/inc/
CUDALIB = -L$(CUDAHOME)/lib64 -lcudart -lcudadevrt
@ -25,7 +23,7 @@ CPPFLAGS += -DHAS_HDF5
LIB += -lhdf5 -lz -ldl
default:
$(MPICXX) $(CPPFLAGS) $(CXXFLAGS) -DETICS_DTSCF=$(ETICS_DTSCF) $(INC) external.cpp io.cpp config.cpp phigrape.cpp -o $(EXECUTABLE) $(LIB)
$(MPICXX) $(CPPFLAGS) $(CXXFLAGS) $(INC) external.cpp io.cpp config.cpp phigrape.cpp -o $(EXECUTABLE) $(LIB)
yebisu: CPPFLAGS := $(filter-out -DETICS, $(CPPFLAGS))
yebisu: default