From 778eb925bf59c6c9c1afbf953e1a5500ccb55e16 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 26 Jun 2020 15:34:06 +0200
Subject: [PATCH] Philippe 26/06/2020: remove grib_api and GRIBEX in scripts
---
conf/profile_mesonh.ihm | 5 ---
src/Makefile | 51 ++----------------------------
src/Makefile.MESONH.mk | 34 +-------------------
src/Rules.AIX64.mk | 7 ----
src/Rules.BG.mk | 7 ----
src/Rules.BGQ.mk | 10 ------
src/Rules.LXNAGfor.mk | 6 ----
src/Rules.LXarm.mk | 5 ---
src/Rules.LXcray.mk | 10 ------
src/Rules.LXg95.mk | 5 ---
src/Rules.LXgfortran.mk | 8 +----
src/Rules.LXifort.mk | 5 ---
src/Rules.LXpathf95.mk | 5 ---
src/Rules.LXpgi.mk | 5 ---
src/Rules.SX8.mk | 6 ----
src/configure | 5 ---
src/job_make_mesonh_BGQ | 43 ++-----------------------
src/job_make_mesonh_IBM_sp6_vargas | 5 ++-
18 files changed, 10 insertions(+), 212 deletions(-)
diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm
index 35932ce44..2db28c701 100755
--- a/conf/profile_mesonh.ihm
+++ b/conf/profile_mesonh.ihm
@@ -76,11 +76,6 @@ export VERSION_LIBAEC=${VERSION_LIBAEC}
#
export MNH_IOCDF4=${MNH_IOCDF4}
#
-# Version of GRIBAPI
-#
-export VER_GRIBAPI=${VER_GRIBAPI}
-export VERSION_GRIBAPI=${VERSION_GRIBAPI}
-#
# Version of ecCodes
#
export VERSION_ECCODES=${VERSION_ECCODES}
diff --git a/src/Makefile b/src/Makefile
index ab18d0745..8d7244994 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -288,51 +288,6 @@ installuser :
cleanproguser :
test -d $(OBJDIR_USER) && cd $(OBJDIR_USER) && rm -f $(PROG_LIST)
-
-##########################################################
-# #
-# EXTRA LIB : GRIBEX #
-# #
-##########################################################
-ifneq "$(findstring 64,$(shell uname -m))" ""
-A64=A64
-endif
-#$(LIB_GRIBEX) : libmaster
-$(LIB_GRIBEX) :
-ifneq "$(ARCH)" "SX8"
- - [ ! -d $(DIR_GRIBEX)_$(ARCH) ] && cp -Rp $(DIR_GRIBEX) $(DIR_GRIBEX)_$(ARCH)
- cd $(DIR_GRIBEX)_$(ARCH) && $(MAKE) -j 1 ARCH=$(TARGET_GRIBEX) R64=$(R64_GRIBEX) CNAME=$(CNAME_GRIBEX) A64=$(A64)
-else
-ifneq "$(findstring brodie,$(shell uname -n))" ""
-#brodie
- - [ ! -d $(DIR_GRIBEX)_$(ARCH) ] && mkdir -p ${workdir}/$(DIR_GRIBEX)_$(ARCH) \
- && ln -s ${workdir}/$(DIR_GRIBEX)_$(ARCH) $(DIR_GRIBEX)_$(ARCH)
- cp /home/rech/mnh/rmnh007/aeronec/mesonh/binaries/libemosR64.a $(DIR_GRIBEX)_$(ARCH)/libgribexR64.a
-else
-#tori & yuki
- - [ ! -d $(DIR_GRIBEX)_$(ARCH) ] && mkdir -p $(DIR_GRIBEX)_$(ARCH)
- cp /usr/local/SX/lib/libgribex.a $(DIR_GRIBEX)_$(ARCH)/libgribexR64.a
-endif
-endif
-
-gribex_clean :
- - [ -d $(DIR_GRIBEX)_$(ARCH) ] && rm -fr $(DIR_GRIBEX)_$(ARCH)
-##########################################################
-# #
-# EXTRA LIB : GRIBAPI #
-# #
-##########################################################
-ifneq "$(findstring 64,$(shell uname -m))" ""
-A64=A64
-endif
-gribapi : $(GRIBAPI_INC)
-$(GRIBAPI_INC) :
- cd ${DIR_GRIBAPI} && ./configure --disable-shared --disable-jpeg --prefix=${GRIBAPI_PATH} CC="$(CC)" \
- FC="$(FC)" FCFLAGS="$(GRIB_FLAGS)" ${GRIBAPI_CONF} && $(MAKE) -j 1 clean && \
- $(MAKE) -j 1 && $(MAKE) -j 1 install && $(MAKE) -j 1 clean
-
-gribapi_clean :
- - [ -d ${GRIBAPI_PATH} ] && rm -fr ${GRIBAPI_PATH}
##########################################################
# #
# EXTRA LIB : ecCodes #
@@ -435,7 +390,7 @@ endif
##########################################################
ifdef PROG_LIST
-prog : lib $(LIB_GRIBEX)
+prog : lib
@$(MAKE) -I$(B)$(OBJDIR) DEP=YES $(PROG_LIST)
install : $(patsubst %,%-${ARCH_XYZ},$(PROG_LIST))
@@ -445,7 +400,7 @@ $(PROG_LIST) : OBJ_PROG=$(shell find $(PROG_DIR) -follow -type f -name "spll_*.f
| xargs grep -l -E -i "^[[:space:]]*program *$@" | sed -e 's/\.f.*/.o/g' | head -1 \
| xargs basename | xargs -I{} find $(PROG_DIR) -follow -name {} -print | head -1 )
-$(PROG_LIST) : $(LIB_MNH) $(LIB_GRIBEX)
+$(PROG_LIST) : $(LIB_MNH)
# echo OBJ_PROG=$(OBJ_PROG)
$(F90) $(LDFLAGS) -o $(OBJDIR)/$@ $(OBJ_PROG) $(LIB_MNH) $(LIBS)
@@ -529,7 +484,7 @@ endif
cleanuser :
test -d $(OBJDIR_USER) && rm -fr $(OBJDIR_USER)
-clean : examplesclean gribex_clean
+clean : examplesclean eccodes_lib_clean
rm -fr $(OBJDIR_ROOT)
cleanprog :
cd $(OBJDIR_ROOT) ; rm -f $(PROG_LIST)
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index 969685b23..9ad6ff289 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -414,40 +414,8 @@ INC += $(INC_MPI)
LIBS += $(LIB_MPI)
endif
-
ARCH_XYZ := $(ARCH_XYZ)-$(VER_MPI)
-##########################################################
-# Librairie GRIBEX #
-##########################################################
-#ifneq "$(ARCH)" "BG"
-# Gribex bypass on BG for the moment
-#DIR_GRIBEX += LIB/GRIBEX
-#endif
-#
-#ifdef DIR_GRIBEX
-#LIB_GRIBEX = $(DIR_GRIBEX)_$(ARCH)/libgribexR64.a
-#LIBS += $(LIB_GRIBEX)
-#R64_GRIBEX=R64
-#endif
-##########################################################
-# Librairie GRIBAPI #
-##########################################################
-#ifneq "$(ARCH)" "BG"
-# Gribapi bypass on BG for the moment
-DIR_GRIBAPI?=${SRC_MESONH}/src/LIB/grib_api-${VERSION_GRIBAPI}
-GRIBAPI_PATH?=${OBJDIR_MASTER}/GRIBAPI-${VERSION_GRIBAPI}
-#GRIBAPI_PATH?=${DIR_GRIBAPI}-${ARCH}${MNH_INT}
-GRIBAPI_INC?=${GRIBAPI_PATH}/include/grib_api.mod
-#endif
-#
-ifdef DIR_GRIBAPI
-INC_GRIBAPI ?= -I${GRIBAPI_PATH}/include
-LIB_GRIBAPI ?= -L${GRIBAPI_PATH}/lib -L${GRIBAPI_PATH}/lib64 -lgrib_api_f90 -lgrib_api
-INC += $(INC_GRIBAPI)
-LIBS += $(LIB_GRIBAPI)
-VPATH += $(GRIBAPI_PATH)/include
-R64_GRIBAPI=R64
-endif
+
##########################################################
# ecCodes library #
##########################################################
diff --git a/src/Rules.AIX64.mk b/src/Rules.AIX64.mk
index 88f2cd2c4..a6903634a 100644
--- a/src/Rules.AIX64.mk
+++ b/src/Rules.AIX64.mk
@@ -86,13 +86,6 @@ CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DLINUX -DLFI_INT=${LFI_INT}
CPPFLAGS_MNH = -DAMAX1=MAX -DMNH -DSFX_MNH
#
-# Gribex flags
-#
-#TARGET_GRIBEX=rs6000
-TARGET_GRIBEX=ibm_power4
-CNAME_GRIBEX=""
-#A64=A64
-#
# LIBTOOLS flags
#
#if MNH_TOOLS exists => compile the tools
diff --git a/src/Rules.BG.mk b/src/Rules.BG.mk
index 802ddba3f..7e66bdb4a 100644
--- a/src/Rules.BG.mk
+++ b/src/Rules.BG.mk
@@ -97,13 +97,6 @@ CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DLINUX -DLFI_INT=${LFI_INT}
CPPFLAGS_MNH = -DAMAX1=MAX -DMNH -DSFX_MNH
#
-# Gribex flags
-#
-#TARGET_GRIBEX=rs6000
-TARGET_GRIBEX=ibm_power4
-CNAME_GRIBEX=""
-#A64=A64
-#
# LIBTOOLS flags
#
#if MNH_TOOLS exists => compile the tools
diff --git a/src/Rules.BGQ.mk b/src/Rules.BGQ.mk
index 3500dde67..28744cc11 100644
--- a/src/Rules.BGQ.mk
+++ b/src/Rules.BGQ.mk
@@ -121,7 +121,6 @@ F77FLAGS = $(OPT) -qfixed
FX90 = $(F90)
FX90FLAGS = $(OPT) -qfixed
#
-# compiler & flags for compilation of grib_api
# for reproductibility need : -qfloat=nomaf
#
FC = mpixlf95_r
@@ -154,15 +153,6 @@ INC += -I${GA_ROOT}/include
LIBS += -L${GA_ROOT}/lib -larmci -lga -lgfortran
endif
#
-# Gribex flags
-#
-#TARGET_GRIBEX=rs6000
-TARGET_GRIBEX=ibm_power4
-CNAME_GRIBEX=""
-#A64=A64
-# Gribapi flags
-GRIBAPI_CONF= --host=powerpc64-bgq-linux
-#
# LIBTOOLS flags
#
#if MNH_TOOLS exists => compile the tools
diff --git a/src/Rules.LXNAGfor.mk b/src/Rules.LXNAGfor.mk
index 5ccc4a7b1..28e64bd5c 100644
--- a/src/Rules.LXNAGfor.mk
+++ b/src/Rules.LXNAGfor.mk
@@ -73,12 +73,6 @@ CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
CPPFLAGS_MNH = -DMNH -DSFX_MNH
-#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=_nagfor
-GRIB_FLAGS = -dusty -kind=byte
#
# Netcdf/HDF5 flags
#
diff --git a/src/Rules.LXarm.mk b/src/Rules.LXarm.mk
index 64f5e01db..539936b92 100644
--- a/src/Rules.LXarm.mk
+++ b/src/Rules.LXarm.mk
@@ -94,11 +94,6 @@ INC += -I${GA_ROOT}/include
LIBS += -L${GA_ROOT}/lib -larmci -lga
endif
#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=_gfortran
-#
# Netcdf/HDF5 flags
#
HDF_CONF= CFLAGS=-std=c99
diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index 20b92e599..c6c34f133 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -90,16 +90,6 @@ CPPFLAGS_SURCOUCHE += -DMNH_GA
INC += -I${GA_ROOT}/include
LIBS += -L${GA_ROOT}/lib -larmci -lga -lgfortran
endif
-#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=_gfortran
-#
-# GRIB_API
-#
-GRIBAPI_CONF="FCFLAGS= -em -ef "
-
#
# LIBTOOLS flags
#
diff --git a/src/Rules.LXg95.mk b/src/Rules.LXg95.mk
index 8b3da6758..b147aeeb2 100644
--- a/src/Rules.LXg95.mk
+++ b/src/Rules.LXg95.mk
@@ -67,11 +67,6 @@ CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
CPPFLAGS_MNH = -DAINT=INT -DAMOD=MOD -DMNH -DSFX_MNH
#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=g95
-#
# LIBTOOLS flags
#
#if MNH_TOOLS exists => compile the tools
diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk
index 8701327e7..2c4401b01 100644
--- a/src/Rules.LXgfortran.mk
+++ b/src/Rules.LXgfortran.mk
@@ -86,11 +86,6 @@ INC += -I${GA_ROOT}/include
LIBS += -L${GA_ROOT}/lib -larmci -lga
endif
#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=_gfortran
-#
# Netcdf/HDF5 flags
#
HDF_CONF= CFLAGS=-std=c99
@@ -125,11 +120,10 @@ MNH_COMPRESS=yes
# Force -fallow-argument-mismatch option for gcc >= 10.1
# Necessary because some subroutines may be called with different datatypes
# Known list: MPI_Allgatherv,MPI_Allreduce,MPI_Bcast,MPI_Bsend,MPI_Gather,MPI_Gatherv,MPI_Recv,LEPOLY,EXTRACT_BBUFF,FILL_BBUFF
-# + gribapi + netCDF-fortran < 4.5.3
+# + ecCodes + netCDF-fortran < 4.5.3
#
ifeq ($(shell test $(GFV) -ge 1010 ; echo $$?),0)
OPT_BASE += -fallow-argument-mismatch
-GRIB_FLAGS += -fallow-argument-mismatch
NETCDF_SUPPFLAGS += -fallow-argument-mismatch
ECCODES_FFLAGS += -fallow-argument-mismatch
endif
diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk
index 41d28547b..903e4d236 100644
--- a/src/Rules.LXifort.mk
+++ b/src/Rules.LXifort.mk
@@ -183,11 +183,6 @@ INC += -I${GA_ROOT}/include
LIBS += -L${GA_ROOT}/lib -lga -larmci
endif
#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=ifort
-#
# Netcdf/HDF5 flags
#
HDF_CONF= CFLAGS=-std=c99
diff --git a/src/Rules.LXpathf95.mk b/src/Rules.LXpathf95.mk
index 22f984d5d..a59f82f16 100644
--- a/src/Rules.LXpathf95.mk
+++ b/src/Rules.LXpathf95.mk
@@ -47,11 +47,6 @@ CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX
CPPFLAGS_MNH = -DAINT=INT -DAMOD=MOD -DMNH -DSFX_MNH
#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=pathf95
-#
# LIBTOOLS flags
#
#if MNH_TOOLS exists => compile the tools
diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk
index 697a802cd..21aea204e 100644
--- a/src/Rules.LXpgi.mk
+++ b/src/Rules.LXpgi.mk
@@ -101,11 +101,6 @@ CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT}
CPPFLAGS_MNH = -DMNH -DMNH_PGI -DSFX_MNH
-#
-# Gribex flags
-#
-TARGET_GRIBEX=linux
-CNAME_GRIBEX=_pgf77
#
# LIBTOOLS flags
#
diff --git a/src/Rules.SX8.mk b/src/Rules.SX8.mk
index 332661185..085a11728 100644
--- a/src/Rules.SX8.mk
+++ b/src/Rules.SX8.mk
@@ -89,12 +89,6 @@ CPPFLAGS_RAD =
CPPFLAGS_NEWLFI = -DMNH_SX5 -DLFI_INT=${LFI_INT}
CPPFLAGS_MNH = -DMNH -DSFX_MNH
#
-# Gribex flags
-#
-#ARCH_GRIBEX=NEC
-TARGET_GRIBEX=NEC
-CNAME_GRIBEX=sxmpif90
-#
# LIBTOOLS flags
#
#if MNH_TOOLS exists => compile the tools
diff --git a/src/configure b/src/configure
index b8ddb6441..45c0474c6 100755
--- a/src/configure
+++ b/src/configure
@@ -18,7 +18,6 @@ export VERSION_CDFC=${VERSION_CDFC:-"4.7.4"}
export VERSION_CDFCXX=${VERSION_CDFCXX:-"4.3.1"}
export VERSION_CDFF=${VERSION_CDFF:-"4.5.3"}
export VERSION_ECCODES=${VERSION_ECCODES:-"2.18.0"}
-export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.26.0-Source"}
export MNH_INT=${MNH_INT:-"4"}
export LFI_INT=${LFI_INT:-8}
export MNH_REAL=${MNH_REAL:-"8"}
@@ -551,10 +550,6 @@ if [ "x${MNH_MEGAN}" == "x1" ] ; then
( cd $LOCAL/src/LIB ; [ ! -d MEGAN ] && tar xvfz megan.tar.gz )
fi
#
-# Install GRIBAPI
-#
-# cd $LOCAL/src/LIB ; [ ! -d grib_api-${VERSION_GRIBAPI} ] && [ -f grib_api-${VERSION_GRIBAPI}.tar.gz ] && gunzip -c grib_api-${VERSION_GRIBAPI}.tar.gz |tar -xvf -
-#
# Install ecCodes
#
cd $LOCAL/src/LIB ; [ ! -d eccodes-${VERSION_ECCODES}-Source ] && [ -f eccodes-${VERSION_ECCODES}-Source.tar.gz ] && gunzip -c eccodes-${VERSION_ECCODES}-Source.tar.gz |tar -xvf -
diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ
index de9517f32..a8e332a69 100755
--- a/src/job_make_mesonh_BGQ
+++ b/src/job_make_mesonh_BGQ
@@ -1,8 +1,8 @@
-#MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+#MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
-#=========== Global directives ===========
+
# @ shell = /bin/bash
# Nom du travail LoadLeveler
# @ job_name = Sortie_MakeMesonh
@@ -10,21 +10,7 @@
# @ output = $(job_name).$(step_name).$(jobid)
# Fichier de sortie d'erreur du travail
# @ error = $(job_name).$(step_name).$(jobid)
-
-#=========== Step 1 directives ===========
-# ======= CompIlation step of grib_api ========
-# @ step_name = make_gribapi
-# @ job_type = serial
-# Temps CPU max. en seconde (d'un processus)
-# @ wall_clock_limit = 3600
-# @ queue
-
-#=========== Step 2 directives ===========
-#============= CompIlation step of MESONH =============
-# @ step_name = make_mesonh
# @ job_type = serial
-# @ dependency = (make_gribapi == 0)
-# (submit only if previous step completed without error)
# @ wall_clock_limit = 9000
# @ queue
@@ -36,29 +22,6 @@ cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-5-0-MPIAUTO-O2NAN
-case $LOADL_STEP_NAME in
-
-#=========== Step 1 directives ===========
-#======= CompIlation step of grib_api ========
-make_gribapi )
-
-#time gmake gribapi_clean
-time gmake gribapi
-
-;;
-
-#=========== Step 2 directives ===========
-#============= CompIlation step of MESONH =============
-make_mesonh )
-
time gmake -j8
time gmake -j8
time gmake installmaster
-
-;;
-#=================================================
-esac
-
-
-
-
diff --git a/src/job_make_mesonh_IBM_sp6_vargas b/src/job_make_mesonh_IBM_sp6_vargas
index 991b70ff4..b5f606d63 100755
--- a/src/job_make_mesonh_IBM_sp6_vargas
+++ b/src/job_make_mesonh_IBM_sp6_vargas
@@ -1,6 +1,6 @@
-#MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+#MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
# Temps CPU max. en seconde (d'un processus)
# @ wall_clock_limit = 7200
@@ -26,7 +26,6 @@ cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-5-0-MPIAUTO-O2
-time gmake -j1 gribapi
time gmake -r -j8
time gmake installmaster
--
GitLab