From 354dd88707cde2c02c2731c7b313dabe427a4b68 Mon Sep 17 00:00:00 2001
From: Juan ESCOBAR <juan.escobar@aero.obs-mip.fr>
Date: Fri, 4 Nov 2022 15:15:23 +0100
Subject: [PATCH] Juan 04/11/2022:Rules.LXcray.mk, add flag for compilation CCE
> 1402 & compilation with CRAY_ACCEL_TARGET=nvidia70
---
src/Rules.LXcray.mk | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index 07801790a..dd63f6ae9 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -7,6 +7,10 @@
# Compiler Options #
# #
##########################################################
+#
+# craytfn version
+CFV=$(shell crayftn --version | grep -E -m1 -o ' [[:digit:]\.]{2,}( |$$)' | sed 's/\.//g' )
+#
#OBJDIR_PATH=/home/escj/azertyuiopqsdfghjklm/wxcvbn/azertyuiopqsdfghjklmwxcvbn
#
OPT_BASE = -hpic -emf -h acc_model=auto_async_none:no_fast_addr:no_deep_copy -halias=none
@@ -150,6 +154,9 @@ CPPFLAGS_SURCOUCHE += -DDEV_NULL -DMNH_COMPILER_CCE
CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
CPPFLAGS_MNH = -DMNH -DSFX_MNH -DMNH_NO_MPI_LOGICAL48 -DMNH_COMPILER_CCE
+ifeq ($(shell test $(CFV) -ge 1402 ; echo $$?),0)
+CPPFLAGS_MNH += -DMNH_COMPILER_CCE_1403
+endif
CPPFLAGS_MNH += -DMNH_EXPAND -DMNH_EXPAND_LOOP -DMNH_EXPAND_OPENACC
CPPFLAGS_MNH += -imacros MNH_OPENACC_NV_CR.CPP
ifdef VER_GA
@@ -217,6 +224,14 @@ MNH_GRIBAPI=no
NETCDF_SUPPFLAGS='-emf'
ECCODES_FFLAGS='-emf'
ECCODES_CFLAGS=' -gdwarf-4 '
+EC_CONF='-DIEEE_LE=1'
+CDF_CONF= CPP=cpp
+HDF_CONF= CPP=cpp
+#
+# Bypat nvidia70 problème
+ifeq "$(CRAY_ACCEL_TARGET)" "nvidia70"
+CPPFLAGS_MNH += -DTARGET_NV70
+endif
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
@@ -278,7 +293,7 @@ OBJS_LST = spll_condensation.o spll_turb_ver_thermo_flux.o spll_rotate_wind.o sp
spll_mode_rain_ice.o spll_mode_rain_ice_warm.o \
spll_ground_param_n.o spll_advec_ppm_algo.o \
spll_turb_hor_sv_corr.o spll_rain_ice.o spll_mode_rain_ice_nucleation.o \
- spll_mode_prandtl.o spll_turb_ver.o
+ spll_mode_prandtl.o spll_turb_ver.o spll_mode_repro_sum.o
$(OBJS_LST) : OPT += -rdimo
--
GitLab