From 06e7a77dcecaa7ded922f8c3aa6d4a07c9a15add Mon Sep 17 00:00:00 2001
From: Juan Escobar <juan.escobar@aero.obs-mip.fr>
Date: Tue, 14 Apr 2015 12:56:45 +0000
Subject: [PATCH] Juan 14/04/2015: add management of MNH_IOCDF4 & LFI_INT=8
---
conf/profile_mesonh.ihm | 12 +++++++++---
src/Makefile.MESONH.mk | 18 ++++++++++++------
src/configure | 18 +++++++++++-------
3 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm
index 128741d3b..8aa73ab4b 100755
--- a/conf/profile_mesonh.ihm
+++ b/conf/profile_mesonh.ihm
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/bash
#MNH_LIC Copyright 1994-2014 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
@@ -67,10 +67,15 @@ export MNH_NCWRIT=${MNH_NCWRIT}
#
export CONF_DOLLAR=${CONF_DOLLAR}
#
-# Version of NETCDF
+# Version of NETCDF / HDF
#
export VER_CDF=${VER_CDF}
export VERSION_CDF=${VERSION_CDF}
+export VERSION_HDF=${VERSION_HDF}
+#
+# NETCDF4 INPUT/OUTPUT
+#
+export MNH_IOCDF4=${MNH_IOCDF4}
#
# Version of GRIBAPI
#
@@ -80,6 +85,7 @@ export VERSION_GRIBAPI=${VERSION_GRIBAPI}
# Version of Def integer
#
export MNH_INT=${MNH_INT}
+export LFI_INT=${LFI_INT}
#
# Version of Def Real
#
@@ -103,7 +109,7 @@ export MNH_RTTOV=${MNH_RTTOV}
##########################################################
##########################################################
#
-export XYZ="-\${ARCH}\${MNH_REAL:+\${MNH_REAL}}\${MNH_INT}-\${VERSION_XYZ}\${VER_USER:+-\${VER_USER}}-\${VER_MPI}-\${OPTLEVEL}"
+export XYZ="-\${ARCH}\${MNH_REAL:+\${MNH_REAL}}I\${MNH_INT}-\${VERSION_XYZ}\${VER_USER:+-\${VER_USER}}-\${VER_MPI}-\${OPTLEVEL}"
#[ "x\${VER_USER}" != "x" ] && export XYZ="\${XYZ}-\${VER_USER}"
# PATH to find tools like "makegen, etc ..."
export BIN_TOOLS=${BIN_TOOLS}
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index e27d3dd9d..e411796b9 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -14,7 +14,7 @@ OBJDIR_ROOT=${PWD}/dir_obj
endif
LIB_OBJS_ROOT=lib
#
-ARCH_XYZ=${ARCH}${MNH_REAL}${MNH_INT}-${VERSION_XYZ}
+ARCH_XYZ=${ARCH}${MNH_REAL}I${MNH_INT}-${VERSION_XYZ}
##########################################################
# #
# Source DIRECTORY #
@@ -207,7 +207,7 @@ INC_MPI = -I$(B)$(DIR_MPI)
DIR_MASTER += $(DIR_MPI)
OBJS_LISTE_MASTER += mpivide.o
INC += $(INC_MPI)
-mpivide.o : CPPFLAGS += -DFUJI \
+mpivide.o : CPPFLAGS += -DFUJI -DMNH_INT=$(MNH_INT)\
-I$(DIR_MPI)/include
VPATH += $(DIR_MPI)
endif
@@ -352,21 +352,27 @@ VPATH += $(GRIBAPI_PATH)/include
R64_GRIBAPI=R64
endif
##########################################################
-# Librairie NETCDF #
+# Librairie NETCDF4 #
##########################################################
+# NETCDF4 INPUT/OUTPUT in MesoNH
+ifdef MNH_IOCDF4
+CPPFLAGS_MNH += -DMNH_IOCDF4
+endif
#
-# NetCDF : AUTO install of netcdf-3.6.X on PC linux to avoid problem with compiler
+# NetCDF : AUTO install of netcdf-4.X.X on PC linux to avoid problem with compiler
#
#
ifeq "$(VER_CDF)" "CDFAUTO"
DIR_CDF?=${SRC_MESONH}/src/LIB/netcdf-${VERSION_CDF}
-CDF_PATH?=${DIR_CDF}-${ARCH}${MNH_INT}
+CDF_PATH?=${DIR_CDF}-${ARCH}I${MNH_INT}
CDF_INC?=${CDF_PATH}/include/netcdf.inc
#
INC_NETCDF ?= -I${CDF_PATH}/include
-LIB_NETCDF ?= -L${CDF_PATH}/lib -L${CDF_PATH}/lib64 -lnetcdf_c++ -lnetcdf
+LIB_NETCDF ?= -L${CDF_PATH}/lib -L${CDF_PATH}/lib64 -lnetcdff -lnetcdf -lhdf5_hl -lhdf5
INC += $(INC_NETCDF)
LIBS += $(LIB_NETCDF)
+#
+DIR_HDF?=${SRC_MESONH}/src/LIB/hdf5-${VERSION_HDF}
endif
#
# NetCDF in beaufix (bull meteo-france)
diff --git a/src/configure b/src/configure
index c0f330856..665ab4873 100755
--- a/src/configure
+++ b/src/configure
@@ -8,13 +8,16 @@
if [ "x$XYZ" = "x" ]
then
#
-export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-1}
-export VERSION_BUG=${VERSION_BUG:-3}
+export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-2}
+export VERSION_BUG=${VERSION_BUG:-0}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}}
-export VERSION_DATE=${VERSION_DATE:-"20/11/2014"}
-export VERSION_CDF=${VERSION_CDF-"3.6.3"}
-export VERSION_GRIBAPI=${VERSION_GRIBAPI-"1.9.9"}
-export MNH_INT=${MNH_INT-"I4"}
+export VERSION_DATE=${VERSION_DATE:-"15/04/2015"}
+export VERSION_CDF=${VERSION_CDF:-"4.1.3"}
+export VERSION_HDF=${VERSION_HDF:-"1.8.9"}
+export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.9.9"}
+export MNH_INT=${MNH_INT:-"4"}
+export LFI_INT=${LFI_INT:-8}
+export MNH_IOCDF4=${MNH_IOCDF4:-1}
#
export NEED_TOOLS=YES
#
@@ -355,7 +358,7 @@ fi
#
${LOCAL}/bin/eval_dollar profile_mesonh.ihm > profile_mesonh
chmod +x profile_mesonh
-XYZ=${ARCH}${MNH_REAL}${MNH_INT}-${VERSION_XYZ}${VER_USER:+-${VER_USER}}-${VER_MPI}-${OPTLEVEL}
+XYZ=${ARCH}${MNH_REAL}I${MNH_INT}-${VERSION_XYZ}${VER_USER:+-${VER_USER}}-${VER_MPI}-${OPTLEVEL}
cp profile_mesonh profile_mesonh-${XYZ}
#
# Do some post-install stuff
@@ -390,6 +393,7 @@ fi
#
if [ "x${VER_CDF}" == "xCDFAUTO" ] ;then
( cd $LOCAL/src/LIB ; [ ! -d netcdf-${VERSION_CDF} ] && tar xvfz netcdf-${VERSION_CDF}.tar.gz )
+( cd $LOCAL/src/LIB ; [ ! -d hdf5-${VERSION_HDF} ] && tar xvfz hdf5-${VERSION_HDF}.tar.gz )
fi
#
# Install GRIBAPI
--
GitLab