Merge branch 'MNH-53-branch' of...

Merge branch 'MNH-53-branch' of mesonh2.aero.obs-mip.fr:/gitrepos/MNH-git_open_source-lfs into MNH-53-branch

LIBTOOLS/tools/lfi2cdf/src/mode_util.f90

@@ -276,8 +276,8 @@ CONTAINS
                 END DO
               END IF
             END IF
-           !Add maximum comment size (necessary when writing LFI files because the comment is stored with the field)
-           ileng = ileng + MAXLFICOMMENTLENGTH
+            !Add maximum comment size (necessary when writing LFI files because the comment is stored with the field)
+            leng = leng + MAXLFICOMMENTLENGTH
           END IF
 
           IF (.NOT.tpreclist(ji)%found) THEN

src/Makefile

@@ -378,7 +378,7 @@ ifdef PROG_LIST
 prog :   lib $(LIB_GRIBEX)
 	@$(MAKE) -I$(B)$(OBJDIR) DEP=YES  $(PROG_LIST)  
 
-install : $(patsubst %,%-${ARCH_XYZ},$(PROG_LIST))
+install : $(patsubst %,%-${ARCH_XYZ},$(PROG_LIST)) install_tools
 
 
 $(PROG_LIST) : OBJ_PROG=$(shell find $(PROG_DIR) -follow -type f -name "spll_*.f*" \
@@ -396,12 +396,14 @@ else
 #	ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)-${ARCH_XYZ}-${VER_USER}
 	ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)${XYZ}
 endif
+	rm -f $(SRC_MESONH)/exe/$(*F)_${ARCH_XYZ}~
+
+install_tools :
 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/configure

@@ -148,6 +148,8 @@ module load ga/\${VER_GA}
                 export MNHENV=${MNHENV:-"
 #export OBJDIR_PATH=$WORKDIR/DIR_OBJ_ADA
 export MP_MPILIB=pempi
+module purge
+module load intel/2013.1
 module load netcdf/seq/4.1.3
 "}
               ;;