Removed OMP in sapporo

Makefile

@@ -2,16 +2,15 @@
 # This is the unified Makefile for the hybrid code                             #
 ################################################################################
 
-RUNDIR       ?= phigrape
+RUNDIR       ?= run
 ETICS_LMAX   ?= 2
 ETICS_NMAX   ?= 10
 GPUARCH      ?= sm_75
 CUDAHOME     ?= /usr/local/cuda
 MPIHOME      ?= /home/meiron/local
 OPTIMIZATION ?= 3
-CFLAGS       += -mcmodel=large
 CXXFLAGS     += $(CFLAGS)
-CUDAFLAGS     =
+CUDAFLAGS    ?=
 
 CXX          ?= g++
 MPICC        ?= mpicc
@@ -23,18 +22,24 @@ default: hybrid-sapporo
 
 hybrid-yebisu: etics yebisu
 	make -C grapite yebisu
-	make -C $(RUNDIR) grapite
+	make -C phigrape grapite
+	mkdir -p $(RUNDIR)/
+	cp -rp phigrape/phigrape $(RUNDIR)/
 
 hybrid-sapporo: etics sapporo
 	make -C grapite sapporo
-	make -C $(RUNDIR) grapite
+	make -C phigrape grapite
+	cp -rp phigrape/phigrape $(RUNDIR)/
 
 plain-yebisu: yebisu
-	make -C $(RUNDIR) yebisu
+	make -C phigrape yebisu
+	mkdir -p $(RUNDIR)/
+	cp -rp phigrape/phigrape $(RUNDIR)/
 
 plain-sapporo: sapporo
 	cp -rp sapporo2/testCodes/src/g6lib.h sapporo2/lib/grape6.h
-	make -C $(RUNDIR) sapporo
+	make -C phigrape sapporo
+	cp -rp phigrape/phigrape $(RUNDIR)/
 
 etics:
 	make -C etics/src library
@@ -44,7 +49,9 @@ yebisu:
 
 sapporo:
 	make -C sapporo2/lib
-	cd $(RUNDIR) && ln -s ../sapporo2/lib/CUDAKernels CUDA
+	mkdir -p $(RUNDIR)/
+	rm -rf $(RUNDIR)/CUDA
+	cp -rp ../sapporo2/lib/CUDAKernels $(RUNDIR)/CUDA
 
 
 ##################
@@ -58,6 +65,6 @@ clean:
 	make -C yebisu clean
 	make -C sapporo2/lib clean
 	make -C grapite clean
-	make -C $(RUNDIR) clean
+	make -C phigrape clean
 
 .PHONY: default hybrid-yebisu hybrid-sapporo plain-yebisu plain-yebisu etics yebisu sapporo