From c60dd071fbc54bb912ccc44752fb4bb7437d9323 Mon Sep 17 00:00:00 2001
From: Juan Escobar <juan.escobar@aero.obs-mip.fr>
Date: Tue, 14 Apr 2015 12:59:15 +0000
Subject: [PATCH] Juan 14/04/2015: default LFI_INT=8
---
conf/profile_mesonh | 24 +++++++++++++++---------
src/LIB/MPIvide/mpivide.c | 4 ++--
src/Rules.AIX64.mk | 4 ++--
src/Rules.BG.mk | 4 ++--
src/Rules.BGQ.mk | 4 ++--
src/Rules.LXcray.mk | 4 ++--
src/Rules.LXg95.mk | 4 ++--
src/Rules.LXgfortran.mk | 4 ++--
src/Rules.LXifort.mk | 6 +++---
src/Rules.LXpgi.mk | 4 ++--
src/Rules.SX8.mk | 4 ++--
11 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/conf/profile_mesonh b/conf/profile_mesonh
index 1840dda13..fb1e27621 100755
--- a/conf/profile_mesonh
+++ b/conf/profile_mesonh
@@ -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
@@ -31,11 +31,11 @@ fi
# SRC_MESONH : default path to mesonh sources
# MUST BE SET TO YOUR OWN MESONH PATH
#
-export SRC_MESONH="/home/escj/DEV64/MNH-V5-1-3"
+export SRC_MESONH="/home/escj/DEV64/MNH-V5-2-0"
#
-# Version MESONH PACKAGE :: PACK-MNH-V5-1-3 : 20/11/2014
+# Version MESONH PACKAGE :: PACK-MNH-V5-2-0 : 15/04/2015
#
-export VERSION_XYZ=MNH-V5-1-3
+export VERSION_XYZ=MNH-V5-2-0
#
# Target Architecture/compiler Machine <=> Rules.*.mk files
#
@@ -65,12 +65,17 @@ export MNH_NCWRIT=
#
# 'Scandollar' Post Processing default variables
#
-export CONF_DOLLAR=/home/escj/DEV64/MNH-V5-1-3/conf/post/confdollar_aeropc_default
+export CONF_DOLLAR=/home/escj/DEV64/MNH-V5-2-0/conf/post/confdollar_aeropc_default
#
-# Version of NETCDF
+# Version of NETCDF / HDF
#
export VER_CDF=CDFAUTO
-export VERSION_CDF=3.6.3
+export VERSION_CDF=4.1.3
+export VERSION_HDF=1.8.9
+#
+# NETCDF4 INPUT/OUTPUT
+#
+export MNH_IOCDF4=1
#
# Version of GRIBAPI
#
@@ -79,7 +84,8 @@ export VERSION_GRIBAPI=1.9.9
#
# Version of Def integer
#
-export MNH_INT=I4
+export MNH_INT=4
+export LFI_INT=8
#
# Version of Def Real
#
@@ -103,7 +109,7 @@ export 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=X86_64
diff --git a/src/LIB/MPIvide/mpivide.c b/src/LIB/MPIvide/mpivide.c
index fb6981bf9..06740a208 100644
--- a/src/LIB/MPIvide/mpivide.c
+++ b/src/LIB/MPIvide/mpivide.c
@@ -20,7 +20,7 @@ MNH_LIC for details. version 1.
/* MPI_INTEGER is defined in mpi.h */
#ifdef FUJI
-#if LFI_INT == 8
+#if MNH_INT == 8
#define SIZEINTEGER 8
#else
#define SIZEINTEGER 4
@@ -36,7 +36,7 @@ MNH_LIC for details. version 1.
#define MPI_DOUBLEDOUBLE 999
#define SIZE_DOUBLEDOUBLE SIZE2PRECISION
-#if LFI_INT == 8
+#if MNH_INT == 8
#define int long long
#endif
diff --git a/src/Rules.AIX64.mk b/src/Rules.AIX64.mk
index a5ad2ffcd..8a909af32 100644
--- a/src/Rules.AIX64.mk
+++ b/src/Rules.AIX64.mk
@@ -24,10 +24,10 @@ OPT_I8 = -qintsize=8
#
# Integer 4/8 option
#
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
diff --git a/src/Rules.BG.mk b/src/Rules.BG.mk
index eed2533bf..0fb57bdaf 100644
--- a/src/Rules.BG.mk
+++ b/src/Rules.BG.mk
@@ -29,10 +29,10 @@ OPT_I4 = -qintsize=4
#
# Integer 4/8 option
#
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
diff --git a/src/Rules.BGQ.mk b/src/Rules.BGQ.mk
index 5191b64c8..03e15d571 100644
--- a/src/Rules.BGQ.mk
+++ b/src/Rules.BGQ.mk
@@ -32,10 +32,10 @@ OPT_I4 = -qintsize=4 -qxlf77=intarg
#
# Integer 4/8 option
#
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index e8663a71f..5c3efb0b4 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -21,10 +21,10 @@ OPT_I8 = -sdefault64
#
# Integer 4/8 option
#
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
#OPT_BASE += $(OPT_I8)
OPT_BASE = -sdefault64 -hpic -em -ef
LFI_INT ?=8
diff --git a/src/Rules.LXg95.mk b/src/Rules.LXg95.mk
index cdcdabcab..0c94f3181 100644
--- a/src/Rules.LXg95.mk
+++ b/src/Rules.LXg95.mk
@@ -17,10 +17,10 @@ OPT_I8 = -i8
#
# Integer 4/8 option
#
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk
index a391581d7..0641238a3 100644
--- a/src/Rules.LXgfortran.mk
+++ b/src/Rules.LXgfortran.mk
@@ -21,7 +21,7 @@ OPT_R8 = -fdefault-real-8 -fdefault-double-8
# Real/Integer 4/8 option
#
MNH_REAL ?=R8
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
#
@@ -30,7 +30,7 @@ OPT_BASE += $(OPT_R8)
CPPFLAGS_SURCOUCHE += -DMNH_MPI_DOUBLE_PRECISION
endif
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk
index ef172c419..5ad7ff56c 100644
--- a/src/Rules.LXifort.mk
+++ b/src/Rules.LXifort.mk
@@ -20,7 +20,7 @@ OPT_R8 = -r8
# Real/integer 4/8 option
#
MNH_REAL ?=R8
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
ifneq "$(MNH_REAL)" "R4"
@@ -28,7 +28,7 @@ OPT_BASE += $(OPT_R8)
CPPFLAGS_SURCOUCHE += -DMNH_MPI_DOUBLE_PRECISION
endif
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
@@ -77,7 +77,7 @@ endif
else
ifeq "$(VER_MPI)" "MPIINTEL"
F90 = mpiifort
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += -ilp64
endif
else
diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk
index d9cc04d2d..6b825a20b 100644
--- a/src/Rules.LXpgi.mk
+++ b/src/Rules.LXpgi.mk
@@ -29,7 +29,7 @@ IGNORE_OBJS += pgprof.o
# Real/integer 4/8 option
#
MNH_REAL ?=R8
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
ifneq "$(MNH_REAL)" "R4"
@@ -37,7 +37,7 @@ OPT_BASE += $(OPT_R8)
CPPFLAGS_SURCOUCHE += -DMNH_MPI_DOUBLE_PRECISION
endif
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
diff --git a/src/Rules.SX8.mk b/src/Rules.SX8.mk
index b1d655910..6dbdbe05f 100644
--- a/src/Rules.SX8.mk
+++ b/src/Rules.SX8.mk
@@ -23,10 +23,10 @@ OPT_I8 = -ew
#
# Integer 4/8 option
#
-MNH_INT ?=I4
+MNH_INT ?=4
LFI_RECL ?=512
#
-ifeq "$(MNH_INT)" "I8"
+ifeq "$(MNH_INT)" "8"
OPT_BASE += $(OPT_I8)
LFI_INT ?=8
MNH_MPI_RANK_KIND ?=8
--
GitLab