From 610561ca8a574816e93550fee907296231461311 Mon Sep 17 00:00:00 2001
From: Juan ESCOBAR <juan.escobar@aero.obs-mip.fr>
Date: Thu, 10 Feb 2022 15:26:56 +0100
Subject: [PATCH] Juan 10/02/2022:Rules.LXcray.mk, remove spll_ground_param_n.o
from OBJS_O0 & add OpenMPI=MPIAUTO rules
---
src/Rules.LXcray.mk | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index 7aa474a21..fedb41a77 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -11,7 +11,7 @@
#
OPT_BASE = -hpic -emf
OPT_PERF0 = -O0 -g
-OPT_PERF1 = -O1 -hflex_mp=intolerant -Ofp0 -hnoomp -hcpu=istanbul -hfp0 -K trap=fp
+OPT_PERF1 = -O1 -hflex_mp=intolerant -Ofp0 -hnoomp -K trap=fp
OPT_PERF2 = -O2 -hflex_mp=intolerant -Ofp0 -hnoomp
#
OPT_NOOPENACC = -hnoacc
@@ -68,9 +68,9 @@ endif
#
ifeq "$(OPTLEVEL)" "OPENACCDEFONLY"
CPPFLAGS += -DMNH_OPENACC -D_FAKEOPENACC
-OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC)
-OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_NOOPENACC)
-OPT_NOCB = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC)
+OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) -G1
+OPT0 = $(OPT_BASE) $(OPT_PERF0) $(OPT_NOOPENACC) -G1
+OPT_NOCB = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) -G1
#CXXFLAGS = -Kieee -Mnofma $(OPT_NOOPENACC)
#OBJS_REPROD= spll_mode_sum_ll.o
#$(OBJS_REPROD) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_NOOPENACC) -Mvect=nosimd -Minfo=all -g
@@ -106,7 +106,13 @@ FC = ftn
FCFLAGS = -emf
CC=cc
export FC CC FCFLAGS
+ifeq "$(VER_MPI)" "MPIAUTO"
+F90 = mpif90
+#CPPFLAGS_SURCOUCHE = -DUSE_MPI
+else
F90 = ftn
+CPPFLAGS_SURCOUCHE = -DUSE_MPI
+endif
F90FLAGS = $(OPT)
F77 = $(F90)
F77FLAGS = $(OPT)
@@ -125,10 +131,10 @@ CPP = cpp -P -Wcomment
#
CPPFLAGS_C = -DLITTLE_endian
CPPFLAGS_SURFEX = -traditional
-CPPFLAGS_SURCOUCHE = -traditional -DDEV_NULL -DUSE_MPI -DMNH_COMPILER_CCE
+CPPFLAGS_SURCOUCHE += -traditional -DDEV_NULL -DMNH_COMPILER_CCE
CPPFLAGS_RAD = -traditional
CPPFLAGS_NEWLFI = -traditional -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
-CPPFLAGS_MNH = -traditional -DMNH -DSFX_MNH -DMNH_NO_MPI_LOGICAL48 -DUSE_MPI -DMNH_COMPILER_CCE
+CPPFLAGS_MNH = -traditional -DMNH -DSFX_MNH -DMNH_NO_MPI_LOGICAL48 -DMNH_COMPILER_CCE
ifdef VER_GA
CPPFLAGS_SURCOUCHE += -DMNH_GA
INC += -I${GA_ROOT}/include
@@ -193,9 +199,10 @@ include Makefile.MESONH.mk
##########################################################
# Juan & Maud 20/03/2008 --> Ifort 10.1.008 Bug O2 optimization
#OPT_PERF1 = -O1
-OBJS_O1= spll_schu.o spll_ps2str.o spll_p_abs.o spll_ini_one_way_n.o spll_urban_solar_abs.o
+OBJS_O1= spll_schu.o spll_ps2str.o spll_p_abs.o spll_ini_one_way_n.o spll_urban_solar_abs.o spll_mode_ekf.o
$(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1)
-OBJS_O0= spll_mode_gridproj.o spll_ini_dynamics.o spll_sunpos_n.o spll_ground_param_n.o
+OBJS_O0= spll_mode_gridproj.o spll_ini_dynamics.o spll_sunpos_n.o spll_average_diag.o
+# spll_ground_param_n.o
$(OBJS_O0) : OPT = $(OPT_BASE) $(OPT_PERF0)
--
GitLab