Merge branch 'MNH-52X-BUG2' into MNH-53X-BU2

Conflicts:
	MY_RUN/KTEST/002_3Drelief/005_ncl/run_ncl
	src/MNH/advection_metsv.f90
	src/MNH/ground_paramn.f90
	src/MNH/ini_lb.f90
	src/MNH/ini_modeln.f90
	src/MNH/modeln.f90
	src/MNH/ppm_met.f90
	src/MNH/ppm_scalar.f90
	src/MNH/read_exsegn.f90
	src/MNH/read_field.f90
	src/MNH/resolved_cloud.f90
	src/MNH/spawn_model2.f90
	src/MNH/write_aircraft_balloon.f90
	src/Makefile
	src/SURFEX/ch_init_depconst.F90
	src/SURFEX/ch_init_emissionn.F90
	src/SURFEX/ch_init_snapn.F90
	src/SURFEX/init_surf_atmn.F90
	src/SURFEX/modd_ch_surfn.F90
	src/SURFEX/pgd_surf_atm.F90
	src/SURFEX/write_surf_atmn.F90
	src/SURFEX/writesurf_snapn.F90
	src/SURFEX/zoom_pgd_surf_atm.F90
	src/configure

.gitignore

+conf/profile_mesonh-*
+pub/ncl_ncarg*/
+src/dir_obj-*
+src/LIB/grib_api*
+src/LIB/hdf5*
+src/LIB/netcdf*

LIBTOOLS/LIBTOOLS_CVS.TXT

+Libtools sources may be retrieved with the following commands.
+Choose a working directory to install the sources, then
+
+- To get the latest stable revision :
+
+         cvs co libtools
+
+- To get the latest development release :
+
+         cvs co -r LIBTOOLS-DEVEL-branch libtools
+
+- To get the latest CNRM development release :
+
+         cvs co -r LIBTOOLS-CNRM-branch libtools
+
+- to get the LIBTOOLS-DEVEL-1-0-2 release :
+   
+         cvs co -r LIBTOOLS-DEVEL-1-0-2 libtools
+
+
+
+
+Tags that may appear in this repository are explained below :
+
+       MAIN
+       ====
+        |               LIBTOOLS-DEVEL-branch              LIBTOOLS-CNRM-branch
+        |               =====================              ====================
+        |                         |                                 |
+        |                         |                                 |
+ LIBTOOLS-1-0-0 ------------------+---------------------------------+
+        |                         |                                 |
+        |                         |                                 |
+        |                         |                                 |
+        |                   DEV-SURC-7-4-1                          |
+        |                         |                                 |
+        |                         |                                 |
+        |                  DEV-SURC-7-4-1-1                         |
+        |                         |                                 |
+        |                         |                                 |
+        |                  DEV-SURC-7-4-1-2                         |
+        |                         |                                 |
+        |                         |                                 |
+        |                LIBTOOLS-DEVEL-1-0-1                       | 
+        |                         |                                 |
+        |                         |                                 |
+        |                         |                                 |
+        |                LIBTOOLS-DEVEL-1-0-2     merge             | 
+        |             merged_from_DEVEL_to_CNRM ---------> LIBTOOLS-CNRM-1-0-2
+        |                         |                                 |
+        .                         .                                 .
+        .                         .                                 .
+        .                         .                                 .
+
+
+
+Branch TAGS
+===========
+
+   MAIN : this branch contains official stable LibTools sources.
+  
+   LIBTOOLS-DEVEL-branch : this branch contains sources currently under 
+                           development that sooner or later are merged to
+                           main branch.
+
+   LIBTOOLS-CNRM-branch : this branch is reserved to CNRM development/tests.
+                          Sources may be merged to MAIN or LIBTOOLS-DEVEL-branch
+                          branch.
+
+
+Release TAGS
+============
+
+LIBTOOLS-x-y-z : this tag is applied to all sources of a stable LIBTOOLS release
+                 on the MAIN branch.
+
+LIBTOOLS-DEVEL-x-y-z : this tag is applied to all sources of a development LIBTOOLS 
+                       release on the LIBTOOLS-DEVEL-branch development branch.
+
+DEV-SURC-x-y... : this tag is only applied to the lib/SURCOUCHE sources on the
+                  LIBTOOLS-DEVEL-branch development branch.
+
+LIBTOOLS-CNRM-x-y... : this tag is applied to all sources of a development/test LIBTOOLS 
+                       release on the LIBTOOLS-CNRM-branch development branch.
+
+Note that all sources from LIBTOOLS-DEVEL-1-0-2 and LIBTOOLS-CNRM-1-0-2 release
+are strictly identical (except maybe for the README.TXT file).

LIBTOOLS/README.TXT

+Release tag : LIBTOOLS-CNRM-4-8-a  on September 24 2009
+
+Welcome to MESONH Libtools...
+
+Branch : LIBTOOLS-CNRM-branch
+TAG    : $Name$
+
+
+Support for gfortran ver > 4.3 and NCL/NCAR 5.1.1
+with :
+
+export ARCH=LXgfortran
+
+Documentation can be found in 'readme' directory.
+
+LaTeX sources of documentation can be found in 'readme/LATEX'
+directory : type make in the LATEX directory to build the 
+postscript documentation file : tools.ps
+
+
+How to compile ?
+
+ cd lib
+ export ARCH=LXgfortran
+ make COMPRESS
+ make NEWLFI
+ make SURCOUCHE
+ make MPIvide
+ make RAD2
+ make vis5d
+ cd gribex_1302b
+ export ARCH=linux
+ export CNAME=_gfortran
+ export A64=A64
+ make
+ 
+ cd ../../tools
+ cd diachro
+ export ARCH=LXgfortran
+ export MNH_LIBTOOLS= absolute path for libtools directory
+ make
+# The executables are in the directory LXgfortran_64 conv2dia and LXgfortran_32 for the others
+
+
+ cd ../fmmore
+ make
+
+# The executable is in the directory LXgfortran_64
+
+ cd ../lfiz
+ make
+
+# The executables ate in the directory LXgfortran
+

LIBTOOLS/conf/config.AIX32

+CPP = cc -C -E
+AR  = ar 
+F77 = xlf90 -q32 -qextname
+F90 = xlf90 -q32 -qextname
+F77FLAGS = -qfixed -O3 -qstrict
+F90FLAGS = -qfree=f90 -qsuffix=f=f90 -O3 -qstrict
+CPPFLAGS = 
+LDFLAGS = -bloadmap:map_ld

LIBTOOLS/conf/config.AIX64

+CPP = cc -C -E
+AR  = ar -X64
+F77 = xlf90_r -qarch=pwr4 -qzerosize -qautodbl=dbl4 -qmaxmem=-1
+F90 = xlf90_r -qarch=pwr4 -qzerosize -qautodbl=dbl4 -qmaxmem=-1
+F77FLAGS = -q64 -qfixed -O3 -qstrict
+F90FLAGS = -q64 -qfree=f90 -qsuffix=f=f90 -O3 -qstrict
+CFLAGS = -q64 
+CPPFLAGS = 
+LDFLAGS = -q64 -bloadmap:map_ld

LIBTOOLS/conf/config.HPNAGf95

+CPP = /usr/lib/cpp -P -C
+AR = ar
+CC = cc
+F77 = f95
+F90 = f95
+
+F90FLAGS = -f77 -kind=byte -w -mismatch_all
+F77FLAGS = -f77 -kind=byte -w -mismatch_all -dusty
+LDFLAGS  = -unsharedf95
+

LIBTOOLS/conf/config.HPf90

+CPP = /usr/lib/cpp -P -C
+AR  = ar
+F90 = f90 +DAportable
+F77 = f90 +DAportable
+
+CPPFLAGS = -DHP -DF90HP
+F90FLAGS = -w
+F77FLAGS = -w
+
+

LIBTOOLS/conf/config.LXNAGf95

+CPP = cpp -P -traditional -Wcomment
+AR = ar
+CC = cc
+F77 = f95
+F90 = f95
+
+CPPFLAGS = -DNAGf95
+#F90FLAGS = -kind=byte -w -C=all -gline
+F90FLAGS = -kind=byte -w -mismatch_all -gline
+F77FLAGS = -kind=byte -w -mismatch_all -dusty
+LDFLAGS = -unsharedf95 
+

LIBTOOLS/conf/config.LXg95

+CPP = cpp -P -traditional -Wcomment
+AR = ar
+CC = cc 
+F77 = g95
+F90 = g95
+
+CPPFLAGS = -DG95 
+F90FLAGS = -w -fno-second-underscore
+F77FLAGS = -w -fno-second-underscore
+
+LDFLAGS =  
+

LIBTOOLS/conf/config.LXgfortran

+CPP = cpp -P -traditional -Wcomment
+AR = ar
+CC = cc 
+F77 = gfortran
+F90 = gfortran
+
+CPPFLAGS = -DGFORTRAN
+F90FLAGS = -w -fno-second-underscore
+F77FLAGS = -w -fno-second-underscore
+
+LDFLAGS =  
+

LIBTOOLS/conf/config.LXifort

+CPP = cpp -P -traditional -Wcomment
+AR = ar
+CC = cc 
+F77 = ifort
+F90 = ifort
+
+CPPFLAGS = 
+F90FLAGS =
+F77FLAGS =
+
+LDFLAGS =
+

LIBTOOLS/conf/config.LXpgf90

+CPP = cpp -P -traditional -Wcomment
+AR = ar
+CC = cc
+F77 = pgf90
+F90 = pgf90
+
+CPPFLAGS = -Dpgf
+F90FLAGS = -w 
+F77FLAGS = -w 
+LDFLAGS = -Wl,-noinhibit-exec -Wl,-warn-once 
+

LIBTOOLS/conf/config.SGI32

+CPP = /usr/lib/cpp -P -C
+AR  = ar
+F90 = f90
+F77 = f90
+CC  = cc
+
+F90FLAGS = -n32 -w
+F77FLAGS = -n32 -w
+CFLAGS   = -c -O2
+CPPFLAGS =
+LDFLAGS  = -n32
+

LIBTOOLS/conf/config.SGI64

+CPP = /usr/lib/cpp -P -C
+AR  = ar
+F90 = f90
+F77 = f90
+
+F90FLAGS = -64 -w
+F77FLAGS = -64 -w
+CFLAGS   = -64
+CPPFLAGS =
+LDFLAGS  = -64
+

LIBTOOLS/conf/config.SP4Idris

+CPP = cc -C -E
+AR  = ar -X64
+F77 = xlf90_r -qarch=pwr4 -qzerosize -qautodbl=dbl4 -qmaxmem=-1
+F90 = xlf90_r -qarch=pwr4 -qzerosize -qautodbl=dbl4 -qmaxmem=-1
+F77FLAGS = -q64 -qfixed -qsave -O3 -qstrict
+F90FLAGS = -q64 -qfree=f90 -qsuffix=f=f90 -qsave -O3 -qstrict
+CPPFLAGS = 
+LDFLAGS = 

LIBTOOLS/conf/config.SX5

+CPP = /usr/lib/cpp -P -C 
+AR  = sxar
+F90 = sxf90
+F77 = sxf90
+CC  = sxcc
+
+F90FLAGS = -w -Cvsafe
+F77FLAGS = -w -Cvsafe
+
+LDFLAGS = 
+

LIBTOOLS/conf/config.SX8

+CPP = sxcpp -P -C 
+AR  = sxar
+F90 = sxf90
+F77 = sxf90
+CC  = sxcc
+
+F90FLAGS = -w -Cvsafe
+F77FLAGS = -w -Cvsafe
+
+LDFLAGS = 
+

LIBTOOLS/conf/config.VPP

+CPP = /usr/ccs/lib/cpp -P -C
+AR  = ar
+F90 = frt 
+F77 = frt
+F90FLAGS = -X9 -Am -Sw
+F77FLAGS = -Sw
+CPPFLAGS = -DFUJI
+LDFLAGS = 
+

LIBTOOLS/conf/config.gfortranR64

+#
+#   Configuration file for PGF (64-bit reals).
+#
+AR      = ar
+ARFLAGS = rv
+#
+CC      = gcc
+CFLAGS  = -O2 -D__hpux -DREAL_8 -DREAL_BIGGER_THAN_INTEGER
+FASTCFLAGS = 
+#
+FC      = gfortran
+VECTFFLAGS =
+CPPFLAGS = -D__hpux -DREAL_8 -DREAL_BIGGER_THAN_INTEGER -Dextend2o -Dg95
+FFLAGS = -w -g -O2 -fdefault-real-8
+#
+LDFLAGS = -L . -l emos$(R64)
+RANLIB  = /bin/true
+CT      = /bin/true
+NPROC   = 1

LIBTOOLS/conf/listing

+>lst.conf
+for i in config.* ; do
+echo $i >>lst.conf
+echo '---------------' >> lst.conf
+cat $i >>lst.conf
+echo '======================================='>> lst.conf
+done
+