Philippe 08/07/2016: it is now possible to compile the bin_tools directly with...

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

@@ -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 
 # 

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}~
 

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
 ##########################################################
 #                                                        #

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                 #

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                 #

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                 #

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                 #

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                 #

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                 #

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                 #

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                 #

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                 #

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                 #

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                 #