diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk index d90c8a9e91b37651c8bb5141dd8cc1ef1c819136..7aa474a21a57506f9a29b1155b64f53d10ba0105 100644 --- a/src/Rules.LXcray.mk +++ b/src/Rules.LXcray.mk @@ -9,7 +9,7 @@ ########################################################## #OBJDIR_PATH=/home/escj/azertyuiopqsdfghjklm/wxcvbn/azertyuiopqsdfghjklmwxcvbn # -OPT_BASE = -hpic -em -ef +OPT_BASE = -hpic -emf OPT_PERF0 = -O0 -g OPT_PERF1 = -O1 -hflex_mp=intolerant -Ofp0 -hnoomp -hcpu=istanbul -hfp0 -K trap=fp OPT_PERF2 = -O2 -hflex_mp=intolerant -Ofp0 -hnoomp @@ -56,33 +56,33 @@ endif # ifeq "$(OPTLEVEL)" "OPENACC" CPPFLAGS += -DMNH_OPENACC -OPT = $(OPT_BASE) $(OPT_OPENACC) $(OPT_PERF2) -OPT0 = $(OPT_BASE) $(OPT_OPENACC) $(OPT_PERF0) -OPT_NOCB = $(OPT_BASE) $(OPT_OPENACC) $(OPT_PERF2) +OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_OPENACC) +OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_OPENACC) +OPT_NOCB = $(OPT_BASE) $(OPT_PERF2) $(OPT_OPENACC) #CXXFLAGS = -acc -Kieee -Mnofma $(OPT_OPENACC) #OBJS_REPROD= spll_mode_sum_ll.o -#$(OBJS_REPROD) : OPT = $(OPT_BASE) $(OPT_OPENACC) $(OPT_PERF2) -Mvect=nosimd -Minfo=all -g +#$(OBJS_REPROD) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_OPENACC) -Mvect=nosimd -Minfo=all -g #OBJS_O1_OPENACC= spll_ice4_tendencies.o spll_turb_ver_thermo_flux.o -#$(OBJS_O1_OPENACC) : OPT = $(OPT_BASE) $(OPT_OPENACC) $(OPT_PERF1) +#$(OBJS_O1_OPENACC) : OPT = $(OPT_BASE) $(OPT_PERF1) $(OPT_OPENACC) endif # ifeq "$(OPTLEVEL)" "OPENACCDEFONLY" CPPFLAGS += -DMNH_OPENACC -D_FAKEOPENACC -OPT = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF2) -OPT0 = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF0) -OPT_NOCB = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF2) +OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) +OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_NOOPENACC) +OPT_NOCB = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) #CXXFLAGS = -Kieee -Mnofma $(OPT_NOOPENACC) #OBJS_REPROD= spll_mode_sum_ll.o -#$(OBJS_REPROD) : OPT = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF2) -Mvect=nosimd -Minfo=all -g +#$(OBJS_REPROD) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) -Mvect=nosimd -Minfo=all -g endif # ifeq "$(OPTLEVEL)" "NOOPENACC" -OPT = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF2) -OPT0 = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF0) -OPT_NOCB = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF2) +OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) +OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_NOOPENACC) +OPT_NOCB = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) #CXXFLAGS = -Kieee -Mnofma $(OPT_NOOPENACC) #OBJS_REPROD= spll_mode_sum_ll.o -#$(OBJS_REPROD) : OPT = $(OPT_BASE) $(OPT_NOOPENACC) $(OPT_PERF2) -Mvect=nosimd -Minfo=all -g +#$(OBJS_REPROD) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) -Mvect=nosimd -Minfo=all -g endif # ifeq "$(OPTLEVEL)" "O2NOVEC" @@ -103,7 +103,7 @@ endif # # FC = ftn -FCFLAGS = -em -ef +FCFLAGS = -emf CC=cc export FC CC FCFLAGS F90 = ftn @@ -138,7 +138,7 @@ endif # BITREP flags # #if MNH_BITREP exists => compile with the BITREP library -MNH_BITREP = YES +MNH_BITREP = NO ifeq "$(MNH_BITREP)" "YES" CPPFLAGS_MNH += -DMNH_BITREP endif @@ -169,8 +169,8 @@ MNH_COMPRESS=yes # MNH_GRIBAPI=no # -NETCDF_SUPPFLAGS='-em -ef' -ECCODES_FFLAGS='-em -ef' +NETCDF_SUPPFLAGS='-emf' +ECCODES_FFLAGS='-emf' ########################################################## # # # Source of MESONH PACKAGE Distribution #