From c8bb5cd314e176f34616d65578b6b3de19ca7a2b Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 8 Jul 2016 09:25:52 +0200
Subject: [PATCH] Philippe 08/07/2016: it is now possible to compile the
bin_tools directly with MESONH using the MNH_TOOLS key. For the moment, only
LFI2CDF is available. The executable are linked to bin_tools/
---
conf/profile_mesonh.ihm | 2 +-
src/Makefile | 7 ++++++-
src/Makefile.MESONH.mk | 14 ++++++++++++++
src/Rules.AIX64.mk | 6 ++++++
src/Rules.BG.mk | 6 ++++++
src/Rules.BGQ.mk | 5 +++++
src/Rules.LXNAGf95.mk | 6 ++++++
src/Rules.LXcray.mk | 6 ++++++
src/Rules.LXg95.mk | 6 ++++++
src/Rules.LXgfortran.mk | 6 ++++++
src/Rules.LXifort.mk | 6 ++++++
src/Rules.LXpathf95.mk | 6 ++++++
src/Rules.LXpgi.mk | 7 ++++++-
src/Rules.SX8.mk | 6 ++++++
14 files changed, 86 insertions(+), 3 deletions(-)
diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm
index 8aa73ab4b..5e95bd6fa 100755
--- a/conf/profile_mesonh.ihm
+++ b/conf/profile_mesonh.ihm
@@ -113,7 +113,7 @@ export XYZ="-\${ARCH}\${MNH_REAL:+\${MNH_REAL}}I\${MNH_INT}-\${VERSION_XYZ}\${VE
#[ "x\${VER_USER}" != "x" ] && export XYZ="\${XYZ}-\${VER_USER}"
# PATH to find tools like "makegen, etc ..."
export BIN_TOOLS=${BIN_TOOLS}
-export PATH=.:\$SRC_MESONH/bin:\$SRC_MESONH/exe:\$SRC_MESONH/bin_tools/\${BIN_TOOLS}:\$PATH
+export PATH=.:\$SRC_MESONH/bin:\$SRC_MESONH/exe:\$SRC_MESONH/bin_tools:\$SRC_MESONH/bin_tools/\${BIN_TOOLS}:\$PATH
#
# NCARG_ROOT : for use of graphic tools : diaprog
#
diff --git a/src/Makefile b/src/Makefile
index f96e03017..c826d9cce 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -340,7 +340,7 @@ cdf : $(CDF_INC)
$(CDF_INC) :
cd ${DIR_HDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --with-zlib=no \
FC="$(FC)" FCFLAGS="$(HDF_OPT)" CPPFLAGS="-DpgiFortran" ${HDF_CONF} && make && make install && $(MAKE) -j 1 clean
- cd ${DIR_CDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-cxx --disable-f90 --disable-dap \
+ cd ${DIR_CDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-cxx --enable-f90 --disable-dap \
FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" CPPFLAGS="-DpgiFortran ${INC_NETCDF}" ${CDF_CONF} LDFLAGS=" -L${CDF_PATH}/lib64" && make && make install && $(MAKE) -j 1 clean
cleanmaster : cleancdf
@@ -374,6 +374,11 @@ ifndef DO_COMP_USER
else
# ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)-${ARCH_XYZ}-${VER_USER}
ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)${XYZ}
+endif
+ifdef MNH_TOOLS
+ ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/lfi2cdf
+ ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2cdf
+ ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2lfi
endif
rm -f $(SRC_MESONH)/exe/$(*F)_${ARCH_XYZ}~
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index 8ba6fff00..f60e95789 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -195,6 +195,17 @@ VPATH += $(DIR_FOREFIRE)
CPPFLAGS += -DMNH_FOREFIRE
endif
##########################################################
+# Source TOOLS #
+##########################################################
+ifdef MNH_TOOLS
+DIR_TOOLS += ../LIBTOOLS/tools/lfi2cdf/src
+INC_TOOLS += -I$(B)$(DIR_TOOLS)
+DIR_MASTER += $(DIR_TOOLS)
+INC += $(INC_TOOLS)
+VPATH += $(DIR_TOOLS)
+#CPPFLAGS += -DLOWMEM
+endif
+##########################################################
# Source MPIVIDE #
##########################################################
#
@@ -502,6 +513,9 @@ NSOURCE=8
PROG_LIST += MESONH LATLON_TO_XY PREP_IDEAL_CASE PREP_REAL_CASE PREP_PGD \
PREP_NEST_PGD SPAWNING DIAG PREP_SURFEX ZOOM_PGD SPECTRE \
MNH2LPDM
+ifdef MNH_TOOLS
+PROG_LIST += LFI2CDF
+endif
#endif
##########################################################
# #
diff --git a/src/Rules.AIX64.mk b/src/Rules.AIX64.mk
index 3b3f35dd9..2f01b1fee 100644
--- a/src/Rules.AIX64.mk
+++ b/src/Rules.AIX64.mk
@@ -95,6 +95,12 @@ CPPFLAGS_MNH = -DAMAX1=MAX -DMNH
TARGET_GRIBEX=ibm_power4
CNAME_GRIBEX=""
#A64=A64
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.BG.mk b/src/Rules.BG.mk
index a89108248..0550b9115 100644
--- a/src/Rules.BG.mk
+++ b/src/Rules.BG.mk
@@ -106,6 +106,12 @@ CPPFLAGS_MNH = -DAMAX1=MAX -DMNH
TARGET_GRIBEX=ibm_power4
CNAME_GRIBEX=""
#A64=A64
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+#MNH_TOOLS = no
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.BGQ.mk b/src/Rules.BGQ.mk
index 27073eda6..5f2c55f9e 100644
--- a/src/Rules.BGQ.mk
+++ b/src/Rules.BGQ.mk
@@ -165,6 +165,11 @@ CNAME_GRIBEX=""
# Gribapi flags
GRIBAPI_CONF= --host=powerpc64-bgq-linux
#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+#MNH_TOOLS = no
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXNAGf95.mk b/src/Rules.LXNAGf95.mk
index ce5e5a0e6..dcafcbf7e 100644
--- a/src/Rules.LXNAGf95.mk
+++ b/src/Rules.LXNAGf95.mk
@@ -51,6 +51,12 @@ CPPFLAGS_MNH = -DMNH
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=f95
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index cb25144a8..30fe86828 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -98,6 +98,12 @@ endif
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=_gfortran
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXg95.mk b/src/Rules.LXg95.mk
index fc00eceed..853c252d5 100644
--- a/src/Rules.LXg95.mk
+++ b/src/Rules.LXg95.mk
@@ -75,6 +75,12 @@ CPPFLAGS_MNH = -DAINT=INT -DAMOD=MOD -DMNH
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=g95
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk
index 7cb87b2ba..6be97fa9e 100644
--- a/src/Rules.LXgfortran.mk
+++ b/src/Rules.LXgfortran.mk
@@ -91,6 +91,12 @@ CNAME_GRIBEX=_gfortran
# Netcdf/HDF5 flags
#
HDF_CONF= CFLAGS=-std=c99
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk
index 20156c3de..b218ca7aa 100644
--- a/src/Rules.LXifort.mk
+++ b/src/Rules.LXifort.mk
@@ -126,6 +126,12 @@ endif
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=ifort
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXpathf95.mk b/src/Rules.LXpathf95.mk
index dc27a1248..4f1bc5623 100644
--- a/src/Rules.LXpathf95.mk
+++ b/src/Rules.LXpathf95.mk
@@ -51,6 +51,12 @@ CPPFLAGS_MNH = -DAINT=INT -DAMOD=MOD -DMNH
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=pathf95
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk
index e1ab3e7e7..abe9db612 100644
--- a/src/Rules.LXpgi.mk
+++ b/src/Rules.LXpgi.mk
@@ -109,7 +109,12 @@ CPPFLAGS_MNH = -DMNH -DMNH_PGI
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=_pgf77
-
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.SX8.mk b/src/Rules.SX8.mk
index 48fd2ab69..959e93083 100644
--- a/src/Rules.SX8.mk
+++ b/src/Rules.SX8.mk
@@ -97,6 +97,12 @@ CPPFLAGS_MNH = -DMNH
#ARCH_GRIBEX=NEC
TARGET_GRIBEX=NEC
CNAME_GRIBEX=sxmpif90
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+#MNH_TOOLS = no
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
--
GitLab