.gitattributes

+*	text=auto
 *.tar	filter=lfs diff=lfs merge=lfs -crlf
 *.tar.gz	filter=lfs diff=lfs merge=lfs -crlf
 */ecmwf.OD*	filter=lfs diff=lfs merge=lfs -crlf

.gitignore

+conf/profile_mesonh
 conf/profile_mesonh-*
-pub/ncl_ncarg*/
+exe/*
+MY_RUN/INTEGRATION_CASES/**/*.des
+MY_RUN/INTEGRATION_CASES/**/*.dir
+MY_RUN/INTEGRATION_CASES/**/*.hdr
+MY_RUN/INTEGRATION_CASES/**/*.nc
+MY_RUN/INTEGRATION_CASES/**/ecmwf.OD.????????.??
+MY_RUN/INTEGRATION_CASES/**/file_for_xtransfer
+MY_RUN/INTEGRATION_CASES/**/OUTPUT_LISTING*
+MY_RUN/INTEGRATION_CASES/**/PRESSURE
+MY_RUN/KTEST/*/*/*.des
+MY_RUN/KTEST/*/*/*.lfi
+MY_RUN/KTEST/*/*/*.nc
+MY_RUN/KTEST/*/*/dir.??????:??:??
+MY_RUN/KTEST/*/*/dir_save
+MY_RUN/KTEST/*/*/dirconv
+MY_RUN/KTEST/*/*/dirextract
+MY_RUN/KTEST/*/*/ecmwf.OD.????????.??
+MY_RUN/KTEST/*/*/file_for_xtransfer
+MY_RUN/KTEST/*/*/gmeta
+MY_RUN/KTEST/*/*/gtopo30.*
+MY_RUN/KTEST/*/*/CLAY_HWSD_MOY.*
+MY_RUN/KTEST/*/*/DATA?1
+MY_RUN/KTEST/*/*/ECOCLIMAP_v2.0.*
+MY_RUN/KTEST/*/*/FICJD
+MY_RUN/KTEST/*/*/LISTING_DIA
+MY_RUN/KTEST/*/*/OUT_DIA
+MY_RUN/KTEST/*/*/OUTPUT_LISTING*
+MY_RUN/KTEST/*/*/PRESSURE
+MY_RUN/KTEST/*/*/REMAP*FFT*
+MY_RUN/KTEST/*/*/SAND_HWSD_MOY.*
+MY_RUN/KTEST/*/*/output_save*
+MY_RUN/KTEST/*/*/pipe_name
+MY_RUN/KTEST/*/*/gshhs(?).rim
+MY_RUN/KTEST/*/*/gshhs(?).zip
+MY_RUN/KTEST/*/*/rangs(?).cat
+MY_RUN/KTEST/*/*/rangs(?).cel
+MY_RUN/KTEST/*/*/rangs(?).zip
+MY_RUN/KTEST/*/*/visu*.png
+MY_RUN/KTEST/*/*/zsection*.png
+MY_RUN/KTEST/007_16janvier/012_spectre/spectra_16JAN.1.12B18.001_*
+MY_RUN/KTEST/009_ICARTT/001_pgd1/*.asc
+MY_RUN/KTEST/009_ICARTT/002_arp2lfi/ecmwf.OD.20040810.18-V2
+MY_RUN/KTEST/009_ICARTT/002_arp2lfi/mocage.GLOB22.20040810.18
+MY_RUN/KTEST/9??_*
+pub/FILEPP/filepp*
+!pub/FILEPP/filepp*.tar.gz
+pub/FILEPP/FILEPP*
+pub/FILEPP/MNH_Expand_*
+!pub/FILEPP/MNH_EXPAND_*.tar.gz
 src/dir_obj-*
+src/LIB/eccodes*
+!src/LIB/eccodes*.tar.gz
 src/LIB/grib_api*
+!src/LIB/grib_api*.tar.gz
 src/LIB/hdf5*
+!src/LIB/hdf5*.tar.gz
+src/LIB/libaec*
+!src/LIB/libaec*.tar.gz
 src/LIB/netcdf*
+!src/LIB/netcdf*.tar.gz
+src/LIB/MEGAN*
+src/LIB/oasis3-mct*
+!src/LIB/oasis3-mct*.tar.gz
+src/LIB/toy*
+!src/LIB/toy*.tar.gz
+vscode_mod

LIBTOOLS/lib/COMPRESS/src/compress.f90

-!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
+!MNH_LIC Copyright 1994-2019 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
+!MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
 SUBROUTINE COMPRESS_FIELD(XTAB,KX,KY,KNBTOT,KNBUSE)
 USE MODD_COMPPAR
 USE MODE_SEARCHGRP
 
-#ifdef NAGf95
 USE,INTRINSIC :: IEEE_ARITHMETIC
-#endif
 
 IMPLICIT NONE 
 
@@ -38,17 +36,21 @@ INTEGER :: IEXTCOD
 CHARACTER(LEN=8),PARAMETER :: KEYWORD='COMPRESS'
 REAL,DIMENSION(KNBTOT) :: XWORKTAB
 LOGICAL :: LUPREAL,LNAN
-#ifndef NAGf95
-LOGICAL, EXTERNAL :: IEEE_IS_NAN
-#endif
+logical :: gnansupport
 
 ILEVNBELT = KX*KY
 LUPREAL = .FALSE.
 LNAN    = .FALSE.
 
+if ( IEEE_SUPPORT_NAN( xtab(1)) ) then
+  gnansupport=.true.
+else
+  gnansupport=.false.
+end if
+
 ! Check for NAN and change Upper and Lower bound according to 32bits real limits.
 DO JI=1,KNBTOT
-  IF (IEEE_IS_NAN(XTAB(JI))) THEN 
+  IF ( gnansupport .and. IEEE_IS_NAN(XTAB(JI)) ) THEN
     XTAB(JI)=0.
     LNAN = .TRUE.
   ELSE IF (ABS(XTAB(JI)) > HUGE(1.0_4)) THEN

LIBTOOLS/lib/COMPRESS/src/ieee_is_nan.c

-#include <math.h>
-
-#ifdef NO_UNDERSCORE
-# define IEEE_IS_NAN ieee_is_nan
-#else
-# define IEEE_IS_NAN ieee_is_nan_
-#endif
-
-int IEEE_IS_NAN(double *x){
-    return isnan(*x);
-}

LIBTOOLS/tools/lfi2cdf/scripts/lfi2cdfregex.sh

-#!/bin/sh
+#!/bin/bash
 #
 #
 usage(){

LIBTOOLS/tools/lfi2cdf/src/fieldtype.f90

-MODULE MODE_FIELDTYPE
-  USE MODD_PARAM
-  
-  IMPLICIT NONE 
-
-  PRIVATE
-
-  
-  TYPE field
-     CHARACTER(LEN=FM_FIELD_SIZE) :: name ! Le nom de l'article LFI
-     INTEGER                      :: TYPE ! Type :entier(INT) ou reel(FLOAT)
-     INTEGER                      :: dim  ! Dimension de l'article  
-  END TYPE field
-  
-  TYPE(field), DIMENSION(:), ALLOCATABLE :: userfield
-
-  ! Les champs contenant %TDATE et %TIME sont traites en dur
-  ! dans la routine de recherche de type
-  TYPE(field), DIMENSION(2),   PARAMETER  :: datefield = (/&
-               field('%TDA', INT, D0), &
-               field('%TIM', FLOAT, D0) &
-             /)
-
-  TYPE(field), DIMENSION(219), SAVE  :: sysfield
-
-  PUBLIC :: get_ftype, init_sysfield
-
-CONTAINS 
-SUBROUTINE init_sysfield()
-sysfield(1) =  field('LBXSVMxxx', FLOAT , D0)
-sysfield(2) =  field('LBYSVMxxx', FLOAT , D0)
-sysfield(3) =  field('LBXUM', FLOAT, D0)
-sysfield(4) =  field('LBYUM', FLOAT, D0)
-sysfield(5) =  field('LBXVM', FLOAT, D0)
-sysfield(6) =  field('LBYVM', FLOAT, D0)
-sysfield(7) =  field('LBXWM', FLOAT, D0)
-sysfield(8) =  field('LBYWM', FLOAT, D0)
-sysfield(9) =  field('LBXTHM', FLOAT, D0)
-sysfield(10) =  field('LBYTHM', FLOAT, D0)
-sysfield(11) =  field('LBXRVM', FLOAT, D0)
-sysfield(12) =  field('LBYRVM', FLOAT, D0)
-sysfield(13) =  field('AVG_ZS', FLOAT, D0)
-sysfield(14) =  field('SIL_ZS', FLOAT, D0)
-sysfield(15) =  field('AOSIP', FLOAT, D0)
-sysfield(16) =  field('AOSIM', FLOAT, D0)
-sysfield(17) =  field('AOSJP', FLOAT, D0)
-sysfield(18) =  field('AOSJM', FLOAT, D0)
-sysfield(19) =  field('HO2IP', FLOAT, D0)
-sysfield(20) =  field('HO2IM', FLOAT, D0)
-sysfield(21) =  field('HO2JP', FLOAT, D0)
-sysfield(22) =  field('HO2JM', FLOAT, D0)
-sysfield(23) =  field('RIMX',INT, D0)
-sysfield(24) =  field('RIMY',INT, D0)
-sysfield(25) =  field('HORELAX_UVWTH',BOOL, D0)
-sysfield(26) =  field('HORELAX_R',BOOL, D0)
-sysfield(27) =  field('I2D_XY', INT, D0)
-sysfield(28) =  field('MENU_BUDGET',TEXT, D0)
-sysfield(29) =  field('IE', INT, D0)
-sysfield(30) =  field('ZR', FLOAT, D0)
-sysfield(31) =  field('GOK', BOOL, D0)
-sysfield(32) =  field('YTEXT', TEXT, D0)
-sysfield(33) =  field('X1D', FLOAT, D0)
-sysfield(34) =  field('I1D', INT, D0)
-sysfield(35) =  field('DEB', INT, D0)
-sysfield(36) =  field('3D1', FLOAT, D0)
-sysfield(37) =  field('3D2', FLOAT, D0)
-sysfield(38) =  field('3D3', FLOAT, D0)
-sysfield(39) =  field('3D4', FLOAT, D0)
-sysfield(40) =  field('3D5', FLOAT, D0)
-sysfield(41) =  field('RHODREFZ', FLOAT, D0)
-sysfield(42) =  field('RSVS', FLOAT, D0)
-sysfield(43) =  field('RUS', FLOAT, D0)
-sysfield(44) =  field('MY_NAME', TEXT, D0)
-sysfield(45) =  field('DAD_NAME', TEXT, D0)
-sysfield(46) =  field('STORAGE_TYPE', TEXT, D0)
-sysfield(47) =  field('IMAX', INT, D0)
-sysfield(48) =  field('JMAX', INT, D0)
-sysfield(49) =  field('KMAX', INT, D0)
-sysfield(50) =  field('RPK', FLOAT, D0)
-sysfield(51) =  field('NEB', FLOAT , D0)
-sysfield(52) =  field('LONOR', FLOAT, D0)
-sysfield(53) =  field('LATOR', FLOAT, D0)
-sysfield(54) =  field('THINSHELL', BOOL, D0)
-sysfield(55) =  field('LAT0', FLOAT, D0)
-sysfield(56) =  field('LON0', FLOAT, D0)
-sysfield(57) =  field('BETA', FLOAT, D0)
-sysfield(58) =  field('XHAT', FLOAT, D0)
-sysfield(59) =  field('YHAT', FLOAT, D0)
-sysfield(60) =  field('ZHAT', FLOAT, D0)
-sysfield(61) =  field('ZS', FLOAT, D0)
-sysfield(62) =  field('CARTESIAN', BOOL, D0)
-sysfield(63) =  field('UM', FLOAT, D0)
-sysfield(64) =  field('VM', FLOAT, D0)
-sysfield(65) =  field('WM', FLOAT, D0)
-sysfield(66) =  field('THM', FLOAT, D0)
-sysfield(67) =  field('TKEM', FLOAT, D0)
-sysfield(68) =  field('EPSM', FLOAT, D0)
-sysfield(69) =  field('PABSM',FLOAT, D0)
-sysfield(70) =  field('RVM', FLOAT, D0)
-sysfield(71) =  field('RCM', FLOAT, D0)
-sysfield(72) =  field('RRM', FLOAT, D0)
-sysfield(73) =  field('RIM', FLOAT, D0)
-sysfield(74) =  field('RSM', FLOAT, D0)
-sysfield(75) =  field('RGM', FLOAT, D0)
-sysfield(76) =  field('RHM', FLOAT, D0)
-sysfield(77) =  field('SVMxxx', FLOAT, D0)
-sysfield(78) =  field('LSUM', FLOAT, D0)
-sysfield(79) =  field('LSVM', FLOAT, D0)
-sysfield(80) =  field('LSWM',FLOAT , D0)
-sysfield(81) =  field('LSTHM',FLOAT, D0)
-sysfield(82) =  field('LSRVM',FLOAT, D0)
-sysfield(83) =  field('LSXTKEM',FLOAT, D0)
-sysfield(84) =  field('LSYTKEM',FLOAT, D0)
-sysfield(85) =  field('LSXEPSM',FLOAT, D0)
-sysfield(86) =  field('LSYEPSM',FLOAT, D0)
-sysfield(87) =  field('LSXRCM',FLOAT , D0)
-sysfield(88) =  field('LSYRCM', FLOAT, D0)
-sysfield(89) =  field('LSXRRM', FLOAT, D0)
-sysfield(90) =  field('LSYRRM', FLOAT, D0)
-sysfield(91) =  field('LSXRIM', FLOAT, D0)
-sysfield(92) =  field('LSYRIM', FLOAT, D0)
-sysfield(93) =  field('LSXRSM', FLOAT, D0)
-sysfield(94) =  field('LSYRSM', FLOAT, D0)
-sysfield(95) =  field('LSXRGM', FLOAT, D0)
-sysfield(96) =  field('LSYRGM', FLOAT, D0)
-sysfield(97) =  field('LSXRHM', FLOAT, D0)
-sysfield(98) =  field('LSYRHM', FLOAT, D0)
-sysfield(99) =  field('LSXSVMxxx', FLOAT, D0)
-sysfield(100) =  field('LSYSVMxxx', FLOAT, D0)
-sysfield(101) =  field('UT',FLOAT, D0)
-sysfield(102) =  field('VT',FLOAT, D0)
-sysfield(103) =  field('WT',FLOAT, D0)
-sysfield(104) =  field('THT',FLOAT, D0)
-sysfield(105) =  field('TKET',FLOAT, D0)
-sysfield(106) =  field('EPST',FLOAT, D0)
-sysfield(107) =  field('PABST',FLOAT, D0)
-sysfield(108) =  field('RVT',FLOAT, D0)
-sysfield(109) =  field('RCT',FLOAT, D0)
-sysfield(110) =  field('RRT',FLOAT, D0)
-sysfield(111) =  field('RIT',FLOAT, D0)
-sysfield(112) =  field('CIT',FLOAT, D0)
-sysfield(113) =  field('RST',FLOAT, D0)
-sysfield(114) =  field('RGT',FLOAT, D0)
-sysfield(115) =  field('RHT',FLOAT, D0)
-sysfield(116) =  field('SVTxxx',FLOAT, D0)
-sysfield(117) =  field('DRYMASST',FLOAT, D0)
-sysfield(118) =  field('SRCM',FLOAT, D0)
-sysfield(119) =  field('SRCT',FLOAT, D0)
-sysfield(120) =  field('SIGS',FLOAT, D0)
-sysfield(121) =  field('RHOREFZ',FLOAT, D0)
-sysfield(122) =  field('THVREFZ',FLOAT, D0)
-sysfield(123) =  field('EXNTOP',FLOAT, D0)
-sysfield(124) =  field('RESA', FLOAT , D0)
-sysfield(125) =  field('Z0SEA', FLOAT , D0)
-sysfield(126) =  field('TS', FLOAT , D0)
-sysfield(127) =  field('WG', FLOAT , D0)
-sysfield(128) =  field('SST', FLOAT , D0)
-sysfield(129) =  field('T2', FLOAT , D0)
-sysfield(130) =  field('W2', FLOAT , D0)
-sysfield(131) =  field('WR', FLOAT , D0)
-sysfield(132) =  field('WS', FLOAT , D0)
-sysfield(133) =  field('ALBS', FLOAT , D0)
-sysfield(134) =  field('RHOS', FLOAT , D0)
-sysfield(135) =  field('LAND', FLOAT , D0)
-sysfield(136) =  field('SEA', FLOAT , D0)
-sysfield(137) =  field('Z0VEG', FLOAT , D0)
-sysfield(138) =  field('Z0HVEG', FLOAT , D0)
-sysfield(139) =  field('Z0REL', FLOAT , D0)
-sysfield(140) =  field('Z0EFFIP', FLOAT , D0)
-sysfield(141) =  field('Z0EFFIM', FLOAT , D0)
-sysfield(142) =  field('Z0EFFJP', FLOAT , D0)
-sysfield(143) =  field('Z0EFFJM', FLOAT , D0)
-sysfield(144) =  field('SSO_STDEV', FLOAT , D0)
-sysfield(145) =  field('SSO_ANIS', FLOAT , D0)
-sysfield(146) =  field('SSO_DIRECTION', FLOAT , D0)
-sysfield(147) =  field('SSO_SLOPE', FLOAT , D0)
-sysfield(148) =  field('ALBVIS', FLOAT , D0)
-sysfield(149) =  field('ALBNIR', FLOAT , D0)
-sysfield(150) =  field('EMIS', FLOAT , D0)
-sysfield(151) =  field('CLAY', FLOAT , D0)
-sysfield(152) =  field('SAND', FLOAT , D0)
-sysfield(153) =  field('D2', FLOAT , D0)
-sysfield(154) =  field('VEG', FLOAT , D0)
-sysfield(155) =  field('LAI', FLOAT , D0)
-sysfield(156) =  field('RSMIN', FLOAT , D0)
-sysfield(157) =  field('GAMMA', FLOAT , D0)
-sysfield(158) =  field('RGL', FLOAT , D0)
-sysfield(159) =  field('CV', FLOAT , D0)
-sysfield(160) =  field('SFTHT', FLOAT , D0)
-sysfield(161) =  field('SFTHP', FLOAT , D0)
-sysfield(162) =  field('SFRT', FLOAT , D0)
-sysfield(163) =  field('SFRP', FLOAT , D0)
-sysfield(164) =  field('SFSVT', FLOAT , D0)
-sysfield(165) =  field('SFSVP', FLOAT , D0)
-sysfield(166) =  field('DTHRAD', FLOAT , D0)
-sysfield(167) =  field('SRFLWD', FLOAT , D0)
-sysfield(168) =  field('SRFSWD', FLOAT , D0)
-sysfield(169) =  field('CLDFR', FLOAT , D0)
-sysfield(170) =  field('COUNTCONV', INT , D0)
-sysfield(171) =  field('DTHCONV', FLOAT , D0)
-sysfield(172) =  field('DRVCONV', FLOAT , D0)
-sysfield(173) =  field('DRCCONV', FLOAT , D0)
-sysfield(174) =  field('DRICONV', FLOAT , D0)
-sysfield(175) =  field('PRCONV', FLOAT , D0)
-sysfield(176) =  field('PACCONV', FLOAT , D0)
-sysfield(177) =  field('WSUBCONV', FLOAT , D0)
-sysfield(178) =  field('INPRR', FLOAT , D0)
-sysfield(179) =  field('ACPRR', FLOAT , D0)
-sysfield(180) =  field('INPRS', FLOAT , D0)
-sysfield(181) =  field('ACPRS', FLOAT , D0)
-sysfield(182) =  field('INPRG', FLOAT , D0)
-sysfield(183) =  field('ACPRG', FLOAT , D0)
-sysfield(184) =  field('INPRT', FLOAT , D0)
-sysfield(185) =  field('ACPRT', FLOAT , D0)
-sysfield(186) =  field('FRC', INT, D0)
-sysfield(187) =  field('UFRCxx', FLOAT , D0)
-sysfield(188) =  field('VFRCxx', FLOAT , D0)
-sysfield(189) =  field('WFRCxx', FLOAT , D0)
-sysfield(190) =  field('THFRCxx', FLOAT , D0)
-sysfield(191) =  field('RVFRCxx', FLOAT , D0)
-sysfield(192) =  field('GXRVFRCxx', FLOAT , D0)
-sysfield(193) =  field('GYRVFRCxx', FLOAT , D0)
-sysfield(194) =  field('GXTHFRCxx', FLOAT , D0)
-sysfield(195) =  field('GYTHFRCxx', FLOAT , D0)
-sysfield(196) =  field('DUMMY_GRxxx', FLOAT , D0)
-sysfield(197) =  field('MASDEV', INT , D0)
-sysfield(198) =  field('EMISFILE_GR_NBR', INT , D0)
-sysfield(199) =  field('EMISPEC_GR_NBR', INT , D0)
-sysfield(200) =  field('EMISNAMExxx', TEXT , D0)
-sysfield(201) =  field('EMISTIMESxxx', INT , D0)
-sysfield(202) =  field('DUMMY_GR_NBR', INT , D0)
-sysfield(203) =  field('COVERxxx', FLOAT , D0)
-sysfield(204) =  field('TGx', FLOAT, D0)
-sysfield(205) =  field('T_ROOFx', FLOAT, D0)
-sysfield(206) =  field('T_ROADx', FLOAT, D0)
-sysfield(207) =  field('T_WALLx', FLOAT, D0)
-sysfield(208) =  field('WGx', FLOAT, D0)
-sysfield(209) =  field('WGIx', FLOAT, D0)
-sysfield(210) =  field('MAX_ZS', FLOAT, D0)
-sysfield(211) =  field('MIN_ZS', FLOAT, D0)
-sysfield(212) =  field('XOR', INT, D0)
-sysfield(213) =  field('YOR', INT, D0)
-sysfield(214) =  field('DXRATIO', INT, D0)
-sysfield(215) =  field('DYRATIO', INT, D0)
-sysfield(216) =  field('PATCH_NUMBER', INT, D0)
-sysfield(217) =  field('BUGFIX', INT, D0)
-sysfield(218) =  field('BIBUSER', TEXT, D0)
-sysfield(219) =  field('LFI_COMPRESSED', INT, D0)
-END SUBROUTINE init_sysfield
-
-  FUNCTION get_ftype(hfname,level)
-    CHARACTER(LEN=*) :: hfname
-    INTEGER          :: get_ftype
-    INTEGER,INTENT(IN) :: level
-
-    TYPE(field) :: tzf
-
-    ! Is this a diachronic field ?
-    IF (INDEX(hfname,".TY",.TRUE.)     /=0 .OR.& 
-    &   INDEX(hfname,".TI",.TRUE.)  /=0 .OR.& 
-    &   INDEX(hfname,".UN",.TRUE.)  /=0 .OR.&
-    &   INDEX(hfname,".CO",.TRUE.)/=0) THEN
-      get_ftype = TEXT
-    ELSE IF (INDEX(hfname,".DI",.TRUE.) /= 0) THEN 
-      get_ftype = INT
-    ELSE IF (INDEX(hfname,".PR",.TRUE.)/= 0 .OR.&
-         &   INDEX(hfname,".TR",.TRUE.)/= 0 .OR.&
-         &   INDEX(hfname,".DA",.TRUE.)/= 0) THEN
-      get_ftype = FLOAT
-    ELSE IF (searchfield(hfname,tzf,level)) THEN
-    ! search in databases  
-      get_ftype = tzf%TYPE
-    ELSE
-      get_ftype = -1
-    END IF
-    
-  END FUNCTION get_ftype
-  
-  FUNCTION searchfield(hfname, tpf, level)
-    CHARACTER(LEN=*), INTENT(IN) :: hfname
-    TYPE(field), INTENT(OUT)     :: tpf
-    INTEGER,INTENT(IN)           :: level
-    LOGICAL                      :: searchfield
-
-    INTEGER :: ji,iposx
-    LOGICAL :: found
-    CHARACTER(LEN=4) :: clevel
-
-    found = .FALSE.
-    
-    ! First is this a date field ?
-    DO ji=1,SIZE(datefield)
-       IF (INDEX(hfname,TRIM(datefield(ji)%name)) /= 0) THEN 
-          found = .TRUE.
-          tpf = datefield(ji)
-          EXIT
-       END IF
-    END DO
-
-    IF (.NOT. found) THEN
-       ! Next, search in user field tab
-       IF (ALLOCATED(userfield)) THEN
-          DO ji=1,SIZE(userfield)
-             IF (hfname==userfield(ji)%name) THEN
-                found = .TRUE.
-                tpf = userfield(ji)
-                EXIT
-             END IF
-          END DO
-       END IF
-       
-       IF (.NOT. found) THEN
-          ! then search in system field tab
-          DO ji=1,SIZE(sysfield)
-             IF (hfname==sysfield(ji)%name) THEN
-                found = .TRUE.
-                tpf = sysfield(ji)
-                EXIT
-             ELSE
-                iposx = INDEX(sysfield(ji)%name,'x')
-                IF (iposx /= 0) THEN
-                   IF (isnumeric(hfname(iposx:LEN_TRIM(sysfield(ji)%name))) .AND. &
-                        sysfield(ji)%name(1:iposx-1)//&
-                        hfname(iposx:LEN_TRIM(sysfield(ji)%name))==hfname) THEN 
-                      found = .TRUE.
-                      tpf = sysfield(ji)
-                      EXIT
-                   END IF
-                ELSE IF (level>-1) THEN
-                  !Maybe it is a z-level splitted field
-                  !Warning: false positives are possible (but should be rare)
-                  write(clevel,'(I4.4)') level
-                  iposx = INDEX(hfname,clevel)
-                  IF (iposx /= 0) THEN
-                    IF (hfname(:iposx-1)==sysfield(ji)%name) THEN
-                      found = .TRUE.
-                      tpf = sysfield(ji)
-                      EXIT
-                    END IF
-                  END IF
-                END IF
-             END IF
-          END DO
-       END IF
-    END IF
-    
-    searchfield = found
-
-  END FUNCTION searchfield
-  
-  FUNCTION isnumeric(hname)
-    CHARACTER(LEN=*) :: hname
-    LOGICAL          :: isnumeric
-
-    INTEGER :: ji
-    
-    isnumeric = .TRUE.
-
-    DO ji = 1,LEN(hname)
-       IF (hname(ji:ji) > '9' .OR. hname(ji:ji) < '0') THEN
-          isnumeric = .FALSE.
-          EXIT
-       END IF
-    END DO
-    
-  END FUNCTION isnumeric
-
-END MODULE MODE_FIELDTYPE

LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90

+!MNH_LIC Copyright 1994-2023 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
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
+! Modifications:
+!  P. Wautelet 19/09/2019: add possibility to provide a fallback file if some information are not found in the input file
+!-----------------------------------------------------------------
 program LFI2CDF
+  USE MODD_CONF,          ONLY: CPROGRAM
+  USE MODD_CONFZ,         ONLY: NB_PROCIO_R
+  USE MODD_DIM_n,         ONLY: NIMAX_ll, NJMAX_ll, NKMAX
+  USE MODD_GRID_n,        ONLY: XXHAT, XXHATM, XYHAT, XYHATM
+  USE MODD_IO,            ONLY: LVERB_OUTLST, LVERB_STDOUT, NIO_ABORT_LEVEL, NIO_VERB, NGEN_ABORT_LEVEL, NGEN_VERB
+  USE MODD_PARAMETERS,    ONLY: JPHEXT, JPVEXT
+  USE MODD_TIMEZ,         ONLY: TIMEZ
+
+  use mode_field,         only: Ini_field_list
+  USE MODE_IO,            ONLY: IO_Init, IO_Config_set
+  use mode_ll
+  use mode_modeln_handler, only: Goto_model
   USE mode_options
+  USE MODE_SET_GRID,      ONLY: INTERP_HORGRID_TO_MASSPOINTS
+  USE MODE_SPLITTINGZ_ll, ONLY: INI_PARAZ_ll
   USE mode_util
+
+  USE MODI_VERSION
+
+  USE MODN_CONFIO, ONLY: LCDF4, LLFIOUT, LLFIREAD
+
   IMPLICIT NONE 
 
-  INTEGER :: ibuflen
   INTEGER :: ji
-  INTEGER :: nbvar_infile ! number of variables available in the input file
-  INTEGER :: nbvar_tbr  ! number of variables to be read
-  INTEGER :: nbvar_calc ! number of variables to be computed from others
-  INTEGER :: nbvar_tbw  ! number of variables to be written
-  INTEGER :: nbvar      ! number of defined variables
-  INTEGER :: first_level, current_level, last_level, nb_levels
+  INTEGER :: nbvar_infile = 0 ! number of variables available in the input file
+  INTEGER :: nbvar_tbr    = 0 ! number of variables to be read
+  INTEGER :: nbvar_calc   = 0 ! number of variables to be computed from others
+  INTEGER :: nbvar_tbw    = 0 ! number of variables to be written
+  INTEGER :: nbvar        = 0 ! number of defined variables
+  INTEGER :: IINFO_ll         ! return code of // routines
+  INTEGER :: nfiles_out   = 0 ! number of output files
   CHARACTER(LEN=:),allocatable :: hvarlist
-  TYPE(filelist_struct) :: infiles, outfiles
+  TYPE(TFILE_ELT),DIMENSION(2)        :: infiles
+  TYPE(TFILE_ELT),DIMENSION(MAXFILES) :: outfiles
+
   TYPE(workfield), DIMENSION(:), POINTER :: tzreclist
 
   type(option),dimension(:),allocatable :: options
@@ -20,11 +49,76 @@ program LFI2CDF
   integer                      :: runmode
 
 
+  CPROGRAM = 'LFICDF'
+
+  CALL Goto_model(1)
+
+  CALL IO_Init()
+  CALL VERSION
+  CALL INI_CST
+
+  ALLOCATE(TIMEZ) !Used by IO_WRITE_FIELD
+
+  NIO_VERB  = NVERB_WARNING
+  NGEN_VERB = NVERB_WARNING
+  NIO_ABORT_LEVEL = NVERB_FATAL
+  NGEN_ABORT_LEVEL = NVERB_FATAL
+  LVERB_OUTLST = .FALSE.
+  LVERB_STDOUT = .TRUE.
+
   call read_commandline(options,hinfile,houtfile,runmode)
 
-  CALL OPEN_FILES(infiles, outfiles, hinfile, houtfile, nbvar_infile, options, runmode)
+  if (options(OPTVERBOSE)%set) then
+    NIO_VERB  = NVERB_DEBUG
+    NGEN_VERB = NVERB_DEBUG
+  end if
+
+  IF (options(OPTMERGE)%set) THEN
+    NB_PROCIO_R = options(OPTMERGE)%ivalue
+  ELSE
+    NB_PROCIO_R = 1
+  END IF
+
+  IF (runmode == MODELFI2CDF) THEN
+     LCDF4    = .TRUE.
+     LLFIOUT  = .FALSE.
+     LLFIREAD = .TRUE.
+     CALL IO_Config_set()
+  ELSE IF (runmode == MODECDF2CDF) THEN
+     LCDF4    = .TRUE.
+     LLFIOUT  = .FALSE.
+     LLFIREAD = .FALSE.
+     CALL IO_Config_set()
+  ELSE
+     LCDF4    = .TRUE.
+     LLFIOUT  = .TRUE.
+     LLFIREAD = .FALSE.
+     CALL IO_Config_set()
+  END IF
+
+  CALL INI_FIELD_LIST()
+
+  CALL OPEN_FILES(infiles, outfiles, nfiles_out, hinfile, houtfile, nbvar_infile, options, runmode)
   IF (options(OPTLIST)%set) STOP
 
+  !Set and initialize parallel variables (necessary to read split files)
+  CALL SET_JP_ll(1,JPHEXT,JPVEXT,JPHEXT)
+  CALL SET_DAD0_ll()
+  CALL SET_DIM_ll(NIMAX_ll, NJMAX_ll, NKMAX)
+  CALL SET_XRATIO_ll(1, 1)
+  CALL SET_YRATIO_ll(1, 1)
+  CALL SET_XOR_ll(1, 1)
+  CALL SET_XEND_ll(NIMAX_ll+2*JPHEXT, 1)
+  CALL SET_YOR_ll(1, 1)
+  CALL SET_YEND_ll(NJMAX_ll+2*JPHEXT, 1)
+  CALL INI_PARAZ_ll(IINFO_ll)
+
+  ! This has to be done after INI_PARAZ_ll and after reading of XXHAT and XYHAT (in OPEN_FILES)
+  ALLOCATE(XXHATM(NIMAX_ll+2*JPHEXT))
+  ALLOCATE(XYHATM(NJMAX_ll+2*JPHEXT))
+  ! Interpolations of positions to mass points
+  CALL INTERP_HORGRID_TO_MASSPOINTS( XXHAT, XYHAT, XXHATM, XYHATM )
+
   IF (runmode == MODELFI2CDF .OR. runmode == MODECDF2CDF) THEN
      IF (options(OPTVAR)%set) THEN
         ! nbvar_tbr is computed from number of requested variables
@@ -48,87 +142,35 @@ program LFI2CDF
      ELSE
         nbvar = nbvar_infile
      END IF
+  ELSE
+    nbvar = nbvar_infile
   END IF
 
   IF (runmode == MODELFI2CDF) THEN
      ! Conversion LFI -> NetCDF
-     
-     !Standard treatment (one LFI file only)
-     IF (.not.options(OPTMERGE)%set) THEN
-       CALL parse_infiles(infiles,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,ibuflen,options)
-       IF (options(OPTSPLIT)%set) call open_split_ncfiles_out(outfiles,houtfile,nbvar,tzreclist,options)
-       CALL def_ncdf(outfiles,tzreclist,nbvar,options)
-       CALL fill_ncdf(infiles,outfiles,tzreclist,nbvar,ibuflen,options)
-
-     ELSE
-     !Treat several LFI files and merge into 1 NC file
-
-       !Determine first level (eg needed to find suffix of the variable name)
-       read( hinfile(len(hinfile)-6:len(hinfile)-4) , "(I3)" ) first_level
-       nb_levels = options(OPTMERGE)%ivalue
-       current_level = first_level
-       last_level    = first_level + nb_levels - 1
-
-       !Read 1st LFI file
-       CALL parse_infiles(infiles,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,ibuflen,options,current_level)
-       IF (options(OPTSPLIT)%set) call open_split_ncfiles_out(outfiles,houtfile,nbvar,tzreclist,options)
-       !Define NC variables
-       CALL def_ncdf(outfiles,tzreclist,nbvar,options)
-
-       DO current_level = first_level,last_level
-         print *,'Treating level ',current_level
-         IF (current_level/=first_level) THEN
-           CALL open_split_lfifile_in(infiles,hinfile,current_level)
-           CALL read_data_lfi(infiles,nbvar,tzreclist,ibuflen,current_level)
-         END IF
-         CALL fill_ncdf(infiles,outfiles,tzreclist,nbvar,ibuflen,options,current_level)
-         IF (current_level/=last_level) CALL close_files(infiles)
-       END DO
-     END IF
+     IF (options(OPTSPLIT)%set) call open_split_ncfiles_out(outfiles,nfiles_out,houtfile,nbvar_tbw,options)
+     CALL parse_infiles(infiles,outfiles,nfiles_out,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,options,runmode)
+     CALL def_ncdf(infiles,outfiles,nfiles_out)
+     CALL fill_files(infiles,outfiles,tzreclist,nbvar,options)
 
   ELSE IF (runmode == MODECDF2CDF) THEN
      ! Conversion netCDF -> netCDF
-
-     !Standard treatment (one netCDF file only)
-     IF (.not.options(OPTMERGE)%set) THEN
-       CALL parse_infiles(infiles,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,ibuflen,options,current_level)
-       IF (options(OPTSPLIT)%set) call open_split_ncfiles_out(outfiles,houtfile,nbvar,tzreclist,options)
-       CALL def_ncdf(outfiles,tzreclist,nbvar,options)
-       CALL fill_ncdf(infiles,outfiles,tzreclist,nbvar,ibuflen,options)
-
-     ELSE
-     !Treat several NC files and merge into 1 NC file
-
-       !Determine first level (eg needed to find suffix of the variable name)
-       read( hinfile(len(hinfile)-5:len(hinfile)-3) , "(I3)" ) first_level
-       nb_levels = options(OPTMERGE)%ivalue
-       current_level = first_level
-       last_level    = first_level + nb_levels - 1
-
-       !Read 1st NC file
-       CALL parse_infiles(infiles,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,ibuflen,options,current_level)
-       IF (options(OPTSPLIT)%set) call open_split_ncfiles_out(outfiles,houtfile,nbvar,tzreclist,options)
-       !Define NC variables
-       CALL def_ncdf(outfiles,tzreclist,nbvar,options)
-
-       DO current_level = first_level,last_level
-         print *,'Treating level ',current_level
-         IF (current_level/=first_level) THEN
-           CALL open_split_ncfile_in(infiles,hinfile,current_level)
-           CALL update_varid_in(infiles,hinfile,tzreclist,nbvar,current_level)
-         END IF
-         CALL fill_ncdf(infiles,outfiles,tzreclist,nbvar,ibuflen,options,current_level)
-         IF (current_level/=last_level) CALL close_files(infiles)
-       END DO
-     END IF
+     IF (options(OPTSPLIT)%set) call open_split_ncfiles_out(outfiles,nfiles_out,houtfile,nbvar_tbw,options)
+     CALL parse_infiles(infiles,outfiles,nfiles_out,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,options,runmode)
+     CALL def_ncdf(infiles,outfiles,nfiles_out)
+     CALL fill_files(infiles,outfiles,tzreclist,nbvar,options)
 
   ELSE
      ! Conversion NetCDF -> LFI
-     CALL parse_infiles(infiles,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,ibuflen,options,current_level)
-     CALL build_lfi(infiles,outfiles,tzreclist,ibuflen)
+     CALL parse_infiles(infiles,outfiles,nfiles_out,nbvar_infile,nbvar_tbr,nbvar_calc,nbvar_tbw,tzreclist,options,runmode)
+     CALL fill_files(infiles,outfiles,tzreclist,nbvar,options)
   END IF
-  
-  CALL CLOSE_FILES(infiles)
-  CALL CLOSE_FILES(outfiles)
-  
+
+  if ( options( OPTFALLBACK )%set ) then
+    CALL CLOSE_FILES(infiles, 2)
+  else
+    CALL CLOSE_FILES(infiles, 1)
+  end if
+  CALL CLOSE_FILES(outfiles,nfiles_out)
+
 end program LFI2CDF

LIBTOOLS/tools/lfi2cdf/src/modd_ncparam.f90

-MODULE MODD_PARAM
-  IMPLICIT NONE 
-
-  CHARACTER(LEN=*), PARAMETER :: VERSION_ID='lfi2cdf Ver. Alpha'
-  INTEGER, PARAMETER :: INT   = 1
-  INTEGER, PARAMETER :: FLOAT = 2
-  INTEGER, PARAMETER :: TEXT  = 3
-  INTEGER, PARAMETER :: BOOL  = 4
-
-  INTEGER, PARAMETER :: D0 = 100
-  INTEGER, PARAMETER :: D1 = 200
-  INTEGER, PARAMETER :: D2 = 300
-  INTEGER, PARAMETER :: D3 = 400
-
-  INTEGER, PARAMETER :: NOTFOUND = -1
-
-  INTEGER, PARAMETER :: FM_FIELD_SIZE = 32
-  
-END MODULE MODD_PARAM

LIBTOOLS/tools/lfi2cdf/src/mode_dimlist.f90

-MODULE mode_dimlist
-  IMPLICIT NONE 
-  
-  TYPE dimCDF
-     CHARACTER(LEN=8)      :: name
-     INTEGER               :: len
-     INTEGER               :: id
-     LOGICAL               :: create
-     INTEGER               :: ndims  ! number of dim reference (when create=.FALSE.)
-     TYPE(dimCDF), POINTER :: next
-  END TYPE dimCDF
-
-  TYPE(dimCDF), POINTER, PRIVATE, SAVE :: dimlist
-  INTEGER, PRIVATE, SAVE               :: nbelt = 0
-  INTEGER, SAVE :: IDIMX = 0
-  INTEGER, SAVE :: IDIMY = 0
-  INTEGER, SAVE :: IDIMZ = 0
-  LOGICAL, SAVE :: GUSEDIM = .FALSE.
-  TYPE(dimCDF), POINTER :: ptdimx, ptdimy, ptdimz
-
-CONTAINS 
-  
-  SUBROUTINE init_dimCDF()
-  
-  NULLIFY(dimlist)
-  NULLIFY(ptdimx, ptdimy, ptdimz)
-  IF (GUSEDIM) THEN
-    ! reservation for DIMX,DIMY,DIMZ
-    ptdimx=>get_dimCDF(IDIMX,.TRUE.)
-    ptdimx%name = 'DIMX'
-    ptdimy=>get_dimCDF(IDIMY,.TRUE.)
-    ptdimy%name = 'DIMY'
-    ! PGD MesoNH files doesn't contain KMAX
-    IF (IDIMZ > 0) THEN
-      ptdimz=>get_dimCDF(IDIMZ,.TRUE.)
-      ptdimz%name = 'DIMZ'
-    END IF
-  END IF
-  END SUBROUTINE init_dimCDF
-
-  FUNCTION size_dimCDF()
-    INTEGER :: size_dimCDF
-
-    size_dimCDF = nbelt
-
-  END FUNCTION size_dimCDF
-
-  FUNCTION first_dimCDF()
-    TYPE(dimCDF), POINTER :: first_dimCDF
-
-    first_dimCDF=>dimlist
-
-  END FUNCTION first_dimCDF
-  
-  
-  FUNCTION get_dimCDF(len,ocreate)
-    INTEGER, INTENT(IN)   :: len
-    LOGICAL, INTENT(IN), OPTIONAL :: ocreate ! when .TRUE. create a dim CELL 
-    TYPE(dimCDF), POINTER :: get_dimCDF
-    
-
-    TYPE(dimCDF), POINTER :: tmp
-    INTEGER               :: count
-    CHARACTER(LEN=5)      :: yndim
-    LOGICAL               :: gforce
-
-    IF (PRESENT(ocreate)) THEN
-      gforce = ocreate
-    ELSE
-      gforce = .FALSE.
-    ENDIF
-    !
-    IF (len /= 1) THEN 
-       IF (gforce) THEN
-         count = 0
-         NULLIFY(tmp)
-       ELSE 
-         count = 1
-         tmp=>dimlist
-         DO WHILE(ASSOCIATED(tmp))
-           IF (tmp%len == len) EXIT
-           tmp=>tmp%next
-           count = count+1
-         END DO
-       END IF
-       IF (.NOT. ASSOCIATED(tmp)) THEN
-          ALLOCATE(tmp)
-          nbelt = nbelt+1
-          WRITE(yndim,'(i5)') count
-          tmp%name = 'DIM'//ADJUSTL(yndim)
-          tmp%len  = len
-          tmp%id   = 0
-          IF (GUSEDIM .AND. len == IDIMX*IDIMY) THEN
-             tmp%create = .FALSE.
-             tmp%ndims = 2
-          ELSEIF (GUSEDIM .AND. len == IDIMX*IDIMY*IDIMZ) THEN
-             tmp%ndims = 3
-             tmp%create = .FALSE.
-          ELSEIF (GUSEDIM .AND. IDIMY == 3 .AND. len == IDIMX*IDIMZ) THEN
-             tmp%ndims = 12 ! faux mais reconnu dans def_ncdf
-             tmp%create = .FALSE.
-          ELSE
-            tmp%ndims = 0
-            tmp%create = .TRUE.
-          END IF
-          tmp%next => dimlist
-          dimlist  => tmp
-       END IF
-    
-       get_dimCDF=>tmp
-
-    ELSE
-
-       NULLIFY(get_dimCDF)
-    END IF
-
-  END FUNCTION get_dimCDF
-END MODULE mode_dimlist

LIBTOOLS/tools/lfi2cdf/src/mode_options.f90

+!MNH_LIC Copyright 2015-2020 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
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
+! Modifications:
+!  P. Wautelet 19/09/2019: add possibility to provide a fallback file if some information are not found in the input file
+!  P. Wautelet 21/10/2019: add OPTDIR option to set directory for writing outfiles
+!-----------------------------------------------------------------
 module mode_options
+  use modd_field, only: TYPEUNDEF, TYPEINT, TYPELOG, TYPEREAL, TYPECHAR, TYPEDATE
+
   implicit none
 
-  integer,parameter :: nbavailoptions = 10
-  integer,parameter :: TYPEUNDEF = -1, TYPEINT = 1, TYPELOG = 2, TYPEREAL = 3, TYPECHAR = 4
+  integer,parameter :: NBAVAILOPTIONS = 12
   integer,parameter :: MODEUNDEF = -11, MODECDF2CDF = 11, MODELFI2CDF = 12, MODECDF2LFI = 13
 
-  integer,parameter :: OPTCDF3   = 1, OPTCDF4   = 2, OPTCOMPRESS = 3
-  integer,parameter :: OPTHELP   = 4, OPTLIST   = 5, OPTMERGE    = 6
-  integer,parameter :: OPTOUTPUT = 7, OPTREDUCE = 8, OPTSPLIT    = 9
-  integer,parameter :: OPTVAR    = 10
+  integer,parameter :: OPTCOMPRESS = 1,  OPTHELP     = 2,  OPTLIST   = 3
+  integer,parameter :: OPTMERGE    = 4,  OPTOUTPUT   = 5,  OPTREDUCE = 6
+  integer,parameter :: OPTMODE     = 7,  OPTSPLIT    = 8,  OPTVAR    = 9
+  integer,parameter :: OPTVERBOSE  = 10, OPTFALLBACK = 11, OPTDIR    = 12
 
   type option
     logical :: set = .false.
@@ -53,8 +63,6 @@ subroutine read_commandline(options,hinfile,houtfile,runmode)
       runmode = MODELFI2CDF
     case default
       runmode = MODEUNDEF
-      print *,'Error: program started with unknown command: ',command
-      call help()
   end select
   deallocate(command,fullcommand)
 
@@ -80,15 +88,22 @@ subroutine read_commandline(options,hinfile,houtfile,runmode)
 
   call check_options(options,hinfile,runmode)
 
-  houtfile = options(OPTOUTPUT)%cvalue
+  call remove_suffix(hinfile)
 
-  !Remove level in the filename if merging LFI splitted files and output name not set by option
-  if (.NOT.options(OPTOUTPUT)%set) then
-    if (options(OPTMERGE)%set) then
-      houtfile=hinfile(1:len(hinfile)-9)
-    end if
+  !Determine outfile name if not given
+  if (.NOT.options(OPTOUTPUT)%set .AND. .NOT.options(OPTSPLIT)%set) then
+    idx = index(hinfile,'/',back=.true.)
+    options(OPTOUTPUT)%cvalue = hinfile(idx+1:len_trim(hinfile))//'_merged'
   end if
 
+  if (.NOT.options(OPTOUTPUT)%set .AND. options(OPTSPLIT)%set) then
+    idx = index(hinfile,'/',back=.true.)
+    options(OPTOUTPUT)%cvalue = trim(hinfile)
+  end if
+  houtfile = options(OPTOUTPUT)%cvalue
+
+  call remove_suffix(houtfile)
+
 end subroutine read_commandline
 
 subroutine init_options(options)
@@ -98,14 +113,6 @@ subroutine init_options(options)
 
   allocate(options(nbavailoptions))
 
-  options(OPTCDF3)%long_name    = "cdf3"
-  options(OPTCDF3)%short_name   = '3'
-  options(OPTCDF3)%has_argument = .false.
-
-  options(OPTCDF4)%long_name    = "cdf4"
-  options(OPTCDF4)%short_name   = '4'
-  options(OPTCDF4)%has_argument = .false.
-
   options(OPTCOMPRESS)%long_name    = "compress"
   options(OPTCOMPRESS)%short_name   = 'c'
   options(OPTCOMPRESS)%has_argument = .true.
@@ -133,6 +140,11 @@ subroutine init_options(options)
   options(OPTREDUCE)%short_name   = 'r'
   options(OPTREDUCE)%has_argument = .false.
 
+  options(OPTMODE)%long_name    = "runmode"
+  options(OPTMODE)%short_name   = 'R'
+  options(OPTMODE)%has_argument = .true.
+  options(OPTMODE)%type         = TYPECHAR
+
   options(OPTSPLIT)%long_name    = "split"
   options(OPTSPLIT)%short_name   = 's'
   options(OPTSPLIT)%has_argument = .false.
@@ -142,6 +154,20 @@ subroutine init_options(options)
   options(OPTVAR)%has_argument = .true.
   options(OPTVAR)%type         = TYPECHAR
 
+  options(OPTVERBOSE)%long_name    = "verbose"
+  options(OPTVERBOSE)%short_name   = 'V'
+  options(OPTVERBOSE)%has_argument = .false.
+
+  options(OPTFALLBACK)%long_name    = "fallback-file"
+  options(OPTFALLBACK)%short_name   = 'f'
+  options(OPTFALLBACK)%has_argument = .true.
+  options(OPTFALLBACK)%type         = TYPECHAR
+
+  options(OPTDIR)%long_name    = "outdir"
+  options(OPTDIR)%short_name   = 'd'
+  options(OPTDIR)%has_argument = .true.
+  options(OPTDIR)%type         = TYPECHAR
+
 end subroutine init_options
 
 subroutine get_option(options,finished)
@@ -224,24 +250,32 @@ subroutine check_options(options,infile,runmode)
 
   type(option),dimension(:),intent(inout) :: options
   character(len=:),allocatable,intent(in) :: infile
-  integer,intent(in)                      :: runmode
+  integer,intent(inout)                   :: runmode
 
   integer :: idx1, idx2
 
-
   !Check if help has been asked
   if (options(OPTHELP)%set) then
     call help()
   end if
 
-  !Use NetCF-4 by default
-  if (.NOT.options(OPTCDF3)%set) then
-    options(OPTCDF4)%set = .true.
+  !Check runmode
+  if (options(OPTMODE)%set) then
+    select case (options(OPTMODE)%cvalue)
+      case ('cdf2cdf')
+        runmode = MODECDF2CDF
+      case ('lfi2cdf')
+        runmode = MODELFI2CDF
+      case ('cdf2lfi')
+        runmode = MODECDF2LFI
+      case default
+        print *,'Error: invalid runmode option'
+        call help()
+     end select
   else
-    if (options(OPTCDF4)%set) then
-      print *,'Warning: NetCDF-3 and NetCDF-4 options are not compatible'
-      print *,'NetCDF-4 is forced'
-      options(OPTCDF3)%set = .false.
+    if(runmode==MODEUNDEF) then
+      print *,'Error: program started with unknown command'
+      call help()
     end if
   end if
 
@@ -259,63 +293,86 @@ subroutine check_options(options,infile,runmode)
     call help()
   end if
 
-  !Merge flag only supported if -v is set
-  if (options(OPTMERGE)%set .AND. .NOT.options(OPTVAR)%set) then
-    print *,'Error: merge option must be used with var option'
-    call help()
-  end if
-
   !Split flag only supported if -v is set
   if (options(OPTSPLIT)%set .AND. .NOT.options(OPTVAR)%set) then
       options(OPTSPLIT)%set = .false.
       print *,"Warning: split option is forced to disable"
   end if
 
-  !Determine outfile name if not given
-  if (.NOT.options(OPTOUTPUT)%set) then
-    idx1 = index(infile,'/',back=.true.)
-    idx2 = index(infile,'.',back=.true.)
-    options(OPTOUTPUT)%cvalue = infile(idx1+1:idx2-1)
+  !Check list option
+  if (options(OPTSPLIT)%set .AND. runmode==MODECDF2LFI) then
+    print *,'Error: split option is not supported by cdf2lfi'
+    call help()
   end if
 
 end subroutine check_options
 
+
+subroutine remove_suffix(hfile)
+character(len=:),allocatable,intent(inout) :: hfile
+
+integer                      :: idx1, idx2
+character(len=:),allocatable :: yfile
+
+idx1 = index(hfile,'.lfi',back=.true.)
+idx2 = index(hfile,'.nc', back=.true.)
+
+if (idx1>0) then
+  yfile=hfile(1:idx1-1)
+else if (idx2>0) then
+  yfile=hfile(1:idx2-1)
+else
+  yfile=trim(hfile)
+endif
+
+deallocate(hfile)
+hfile = trim(yfile)
+deallocate(yfile)
+
+end subroutine remove_suffix
+
+
 subroutine help()
   implicit none
 
 !TODO: -l option for cdf2cdf and cdf2lfi
-  print *,"Usage : lfi2cdf [-h --help] [--cdf4 -4] [-l] [-v --var var1[,...]] [-r --reduce-precision]"
+  print *,"Usage : lfi2cdf [-h --help] [-l] [-v --var var1[,...]] [-r --reduce-precision]"
   print *,"                [-m --merge number_of_z_levels] [-s --split] [-o --output output-file.nc]"
+  print *,"                [-R --runmode mode] [-V --verbose] [-f --fallback-file fallback-file]"
   print *,"                [-c --compress compression_level] input-file.lfi"
-  print *,"        cdf2cdf [-h --help] [--cdf4 -4] [-v --var var1[,...]] [-r --reduce-precision]"
-  print *,"                [-m --merge number_of_z_levels] [-s --split] [-o --output output-file.nc]"
+  print *,"        cdf2cdf [-h --help] [-v --var var1[,...]] [-r --reduce-precision]"
+  print *,"                [-m --merge number_of_split_files] [-s --split] [-o --output output-file.nc]"
+  print *,"                [-R --runmode mode] [-V --verbose] [-f --fallback-file fallback-file]"
   print *,"                [-c --compress compression_level] input-file.nc"
-  print *,"        cdf2lfi [-o --output output-file.lfi] input-file.nc"
+  print *,"        cdf2lfi [-o --output output-file.lfi] [-R --runmode mode]  [-V --verbose]"
+  print *,"                [-f --fallback-file fallback-file] input-file.nc"
   print *,""
   print *,"Options:"
-  print *,"  --cdf3, -3"
-  print *,"     Write netCDF file in netCDF-3 format (cdf2cdf and lfi2cdf only)"
-  print *,"  --cdf4, -4 (by default)"
-  print *,"     Write netCDF file in netCDF-4 format (HDF5 compatible) (cdf2cdf and lfi2cdf only)"
   print *,"  --compress, -c compression_level"
   print *,"     Compress data. The compression level should be in the 1 to 9 interval."
-  print *,"     Only supported with the netCDF-4 format (cdf2cdf and lfi2cdf only)"
+  print *,"     Only supported with the netCDF format (cdf2cdf and lfi2cdf only)"
+  print *,"  -f --fallback-file fallback-file"
+  print *,"     File to use to read some grid information if not found in input-file"
   print *,"  --help, -h"
   print *,"     Print this text"
   print *,"  --list, -l"
   print *,"     List all the fields of the LFI file and returns (lfi2cdf only)"
-  print *,"  --merge, -m number_of_z_levels"
-  print *,"     Merge LFI files which are split by vertical level (cdf2cdf and lfi2cdf only)"
+  print *,"  --merge, -m number_of_split_files"
+  print *,"     Merge files which are split by vertical level (cdf2cdf and lfi2cdf only)"
   print *,"  --output, -o"
   print *,"     Name of file for the output"
   print *,"  --reduce-precision, -r"
   print *,"     Reduce the precision of the floating point variables to single precision (cdf2cdf and lfi2cdf only)"
+  print *,"  --runmode, -R"
+  print *,"     Force runmode (lfi2cdf, cdf2cdf or cdf2lfi)"
   print *,"  --split, -s"
   print *,"     Split variables specified with the -v option (one per file) (cdf2cdf and lfi2cdf only)"
   print *,"  --var, -v var1[,...]"
   print *,"     List of the variable to write in the output file. Variables names have to be separated by commas (,)."
   print *,"     A variable can be computed from the sum of existing variables (format: new_var=var1+var2[+...])"
   print *,"     (cdf2cdf and lfi2cdf only)"
+  print *,"  --verbose, -V"
+  print *,"     Be verbose (for debugging purpose)"
   print *,""
   stop
 

LIBTOOLS/tools/lfiz/src/lfiz.f90

@@ -14,25 +14,27 @@ INTEGER :: arglen
 INTEGER :: inarg
 CHARACTER(LEN=50) :: yexe
 
+LOGICAL(KIND=LFI_INT),PARAMETER :: GTRUE  = .TRUE.
+LOGICAL(KIND=LFI_INT),PARAMETER :: GFALSE = .FALSE.
 
 INTEGER, PARAMETER :: FM_FIELD_SIZE = 16
-INTEGER, PARAMETER :: ISRCLU  = 11
-INTEGER, PARAMETER :: IDESTLU = 12
+INTEGER(KIND=LFI_INT), PARAMETER :: ISRCLU  = 11
+INTEGER(KIND=LFI_INT), PARAMETER :: IDESTLU = 12
 INTEGER :: JPHEXT
-INTEGER :: iverb
-INTEGER :: inap ! nb d'articles prevus (utile a la creation)
-INTEGER :: inaf ! nb d'articles presents dans un fichier existant
-INTEGER :: inafdest
+INTEGER(KIND=LFI_INT) :: iverb
+INTEGER(KIND=LFI_INT) :: inap ! nb d'articles prevus (utile a la creation)
+INTEGER(KIND=LFI_INT) :: inaf ! nb d'articles presents dans un fichier existant
+INTEGER(KIND=LFI_INT) :: inafdest
 
 CHARACTER(LEN=128) :: filename,DESTFNAME
 INTEGER :: JI,JJ
-INTEGER :: IRESP
+INTEGER(KIND=LFI_INT) :: IRESP
 CHARACTER(LEN=FM_FIELD_SIZE),DIMENSION(:),ALLOCATABLE :: yrecfm
-INTEGER,                     DIMENSION(:),ALLOCATABLE :: ileng
+INTEGER(KIND=LFI_INT),       DIMENSION(:),ALLOCATABLE :: ileng
 INTEGER(KIND=8),             DIMENSION(:),ALLOCATABLE :: iwork
 
-INTEGER :: ilengs
-INTEGER :: ipos
+INTEGER(KIND=LFI_INT) :: ilengs
+INTEGER(KIND=LFI_INT) :: ipos
 INTEGER :: sizemax
 
 INTEGER            :: IGRID
@@ -46,7 +48,9 @@ INTEGER :: LFICOMP
 INTEGER :: NEWSIZE
 INTEGER :: searchndx
 INTEGER :: INDDATIM
-INARG = IARGC()
+
+!OLD: INARG = IARGC()
+INARG = COMMAND_ARGUMENT_COUNT()
 
 #if defined(F90HP)
 #define HPINCR 1
@@ -54,6 +58,9 @@ INARG = IARGC()
 #define HPINCR 0
 #endif
 
+  CALL GET_COMMAND_ARGUMENT(0,yexe)
+#if 0
+!OLD:
 #if defined(FUJI) || defined(NAGf95) || defined(NEC) || defined(HP) || defined(pgf) || defined(G95) || defined(GFORTRAN)
   CALL GETARG(0+HPINCR,yexe)
   IF (LEN_TRIM(yexe) == 0) THEN
@@ -63,12 +70,17 @@ INARG = IARGC()
 #else
   CALL PXFGETARG(0,yexe,arglen,iresp)
 #endif
+#endif
 !  PRINT *,yexe, ' avec ',INARG,' arguments.'
   IF (INARG == 1) THEN 
+     CALL GET_COMMAND_ARGUMENT(1,filename)
+#if 0
+!OLD:
 #if defined(FUJI) || defined(NAGf95) || defined(NEC) || defined(HP) || defined(pgf) || defined(G95)|| defined(GFORTRAN)
      CALL GETARG(1+HPINCR,filename)
 #else
      CALL PXFGETARG(1,filename,arglen,iresp)
+#endif
 #endif
   ELSE 
      PRINT *,'Usage : ', TRIM(yexe), ' [fichier lfi]'
@@ -91,8 +103,8 @@ IDIMY = 0
 IDIMZ = 0
 GUSEDIM = .FALSE.
 
-CALL LFIOUV(IRESP,ISRCLU,.TRUE.,filename,'OLD',.FALSE.&
-            & ,.FALSE.,iverb,inap,inaf)
+CALL LFIOUV(IRESP,ISRCLU,GTRUE,filename,'OLD',GFALSE&
+            & ,GFALSE,iverb,inap,inaf)
 
 CALL FMREADLFIN1(ISRCLU,'LFI_COMPRESSED',LFICOMP,iresp)
 IF (iresp == 0) THEN
@@ -139,8 +151,8 @@ END IF
 
 
 PRINT *,'compressed file : ',DESTFNAME
-CALL LFIOUV(IRESP,IDESTLU,.TRUE.,DESTFNAME,'NEW'&
-     & ,.FALSE.,.FALSE.,iverb,inaf+1,inafdest)
+CALL LFIOUV(IRESP,IDESTLU,GTRUE,DESTFNAME,'NEW'&
+     & ,GFALSE,GFALSE,iverb,inaf+1,inafdest)
 
 CALL LFIPOS(IRESP,ISRCLU)
 ALLOCATE(yrecfm(inaf))
@@ -148,7 +160,7 @@ ALLOCATE(ileng(inaf))
 yrecfm(:) = ''
 sizemax=0
 DO ji=1,inaf
-  CALL LFICAS(IRESP,ISRCLU,yrecfm(ji),ileng(ji),ipos,.TRUE.)
+  CALL LFICAS(IRESP,ISRCLU,yrecfm(ji),ileng(ji),ipos,GTRUE)
   IF (ileng(ji) > sizemax) sizemax=ileng(ji)
 END DO
 PRINT *,' Nombre total d''articles dans fichier source :', inaf
@@ -218,13 +230,13 @@ CALL LFIFER(IRESP,IDESTLU,'KEEP')
 CONTAINS 
 
 SUBROUTINE FMREADLFIN1(klu,hrecfm,kval,kresp)
-INTEGER, INTENT(IN)         :: klu ! logical fortran unit au lfi file
-CHARACTER(LEN=*),INTENT(IN) :: hrecfm ! article name to be read
-INTEGER, INTENT(OUT)        :: kval ! integer value for hrecfm article
-INTEGER, INTENT(OUT)        :: kresp! return code null if OK
+INTEGER(KIND=LFI_INT), INTENT(IN)  :: klu ! logical fortran unit au lfi file
+CHARACTER(LEN=*),      INTENT(IN)  :: hrecfm ! article name to be read
+INTEGER,               INTENT(OUT) :: kval ! integer value for hrecfm article
+INTEGER(KIND=LFI_INT), INTENT(OUT) :: kresp! return code null if OK
 !
-INTEGER(KIND=8),DIMENSION(:),ALLOCATABLE::iwork
-INTEGER :: iresp,ilenga,iposex,icomlen
+INTEGER(KIND=8),DIMENSION(:),ALLOCATABLE :: iwork
+INTEGER(KIND=LFI_INT)                    :: iresp,ilenga,iposex,icomlen
 !
 CALL LFINFO(iresp,klu,hrecfm,ilenga,iposex)
 IF (iresp /=0 .OR. ilenga == 0) THEN

LIBTOOLS/tools/lfiz/src/unlfiz.f90

@@ -14,24 +14,26 @@ INTEGER :: arglen
 INTEGER :: inarg
 CHARACTER(LEN=50) :: yexe
 
+LOGICAL(KIND=LFI_INT),PARAMETER :: GTRUE  = .TRUE.
+LOGICAL(KIND=LFI_INT),PARAMETER :: GFALSE = .FALSE.
 
 INTEGER, PARAMETER :: FM_FIELD_SIZE = 16
-INTEGER, PARAMETER :: ISRCLU  = 11
-INTEGER, PARAMETER :: IDESTLU = 12
-INTEGER :: iverb
-INTEGER :: inap ! nb d'articles prevus (utile a la creation)
-INTEGER :: inaf ! nb d'articles presents dans un fichier existant
-INTEGER :: inafdest
+INTEGER(KIND=LFI_INT), PARAMETER :: ISRCLU  = 11
+INTEGER(KIND=LFI_INT), PARAMETER :: IDESTLU = 12
+INTEGER(KIND=LFI_INT) :: iverb
+INTEGER(KIND=LFI_INT) :: inap ! nb d'articles prevus (utile a la creation)
+INTEGER(KIND=LFI_INT) :: inaf ! nb d'articles presents dans un fichier existant
+INTEGER(KIND=LFI_INT) :: inafdest
 
 CHARACTER(LEN=128) :: filename,DESTFNAME
 INTEGER :: JI,JJ
-INTEGER :: IRESP
+INTEGER(KIND=LFI_INT) :: IRESP
 CHARACTER(LEN=FM_FIELD_SIZE),DIMENSION(:),ALLOCATABLE :: yrecfm
-INTEGER,                     DIMENSION(:),ALLOCATABLE :: ileng
+INTEGER(KIND=LFI_INT),       DIMENSION(:),ALLOCATABLE :: ileng
 INTEGER(KIND=8),             DIMENSION(:),ALLOCATABLE :: iwork,iworknew
 
-INTEGER :: ilengs
-INTEGER :: ipos
+INTEGER(KIND=LFI_INT) :: ilengs
+INTEGER(KIND=LFI_INT) :: ipos
 INTEGER :: sizemax
 
 INTEGER            :: ICOMLEN
@@ -43,9 +45,10 @@ INTEGER :: CPT
 INTEGER :: LFICOMP
 INTEGER :: searchndx
 INTEGER :: ITYPCOD
-INTEGER :: ITOTAL,ITOTALMAX
+INTEGER(KIND=LFI_INT) :: ITOTAL,ITOTALMAX
 
-INARG = IARGC()
+!OLD: INARG = IARGC()
+INARG = COMMAND_ARGUMENT_COUNT()
 
 #if defined(F90HP)
 #define HPINCR 1
@@ -53,6 +56,9 @@ INARG = IARGC()
 #define HPINCR 0
 #endif
 
+  CALL GET_COMMAND_ARGUMENT(0,yexe)
+#if 0
+!OLD:
 #if defined(FUJI) || defined(NAGf95) || defined(NEC) || defined(HP) || defined(pgf) || defined(G95) || defined(GFORTRAN)
   CALL GETARG(0+HPINCR,yexe)
   IF (LEN_TRIM(yexe) == 0) THEN
@@ -62,12 +68,17 @@ INARG = IARGC()
 #else
   CALL PXFGETARG(0,yexe,arglen,iresp)
 #endif
+#endif
 !  PRINT *,yexe, ' avec ',INARG,' arguments.'
   IF (INARG == 1) THEN 
+     CALL GET_COMMAND_ARGUMENT(1,filename)
+#if 0
+!OLD:
 #if defined(FUJI) || defined(NAGf95) || defined(NEC) || defined(HP) || defined(pgf) || defined(G95) || defined(GFORTRAN)
      CALL GETARG(1+HPINCR,filename)
 #else
      CALL PXFGETARG(1,filename,arglen,iresp)
+#endif
 #endif
   ELSE 
      PRINT *,'Usage : ', TRIM(yexe), ' [fichier lfi]'
@@ -93,8 +104,8 @@ IDIMY = 0
 IDIMZ = 0
 GUSEDIM = .FALSE.
 
-CALL LFIOUV(IRESP,ISRCLU,.TRUE.,filename,'OLD',.FALSE.&
-            & ,.FALSE.,iverb,inap,inaf)
+CALL LFIOUV(IRESP,ISRCLU,GTRUE,filename,'OLD',GFALSE&
+            & ,GFALSE,iverb,inap,inaf)
 
 CALL FMREADLFIN1(ISRCLU,'LFI_COMPRESSED',LFICOMP,iresp)
 IF (iresp /= 0 .OR. LFICOMP /= 1) THEN
@@ -104,8 +115,8 @@ IF (iresp /= 0 .OR. LFICOMP /= 1) THEN
 END IF  
 
 PRINT *,'Uncompressed (but 32 bits REAL precision) file : ',DESTFNAME
-CALL LFIOUV(IRESP,IDESTLU,.TRUE.,DESTFNAME,'NEW'&
-     & ,.FALSE.,.FALSE.,iverb,inaf,inafdest)
+CALL LFIOUV(IRESP,IDESTLU,GTRUE,DESTFNAME,'NEW'&
+     & ,GFALSE,GFALSE,iverb,inaf,inafdest)
 
 CALL LFIPOS(IRESP,ISRCLU)
 ALLOCATE(yrecfm(inaf))
@@ -113,7 +124,7 @@ ALLOCATE(ileng(inaf))
 yrecfm(:) = ''
 sizemax=0
 DO ji=1,inaf
-  CALL LFICAS(IRESP,ISRCLU,yrecfm(ji),ileng(ji),ipos,.TRUE.)
+  CALL LFICAS(IRESP,ISRCLU,yrecfm(ji),ileng(ji),ipos,GTRUE)
   IF (ileng(ji) > sizemax) sizemax=ileng(ji)
 END DO
 PRINT *,' Nombre total d''articles dans fichier source :', inaf
@@ -173,13 +184,13 @@ CALL LFIFER(IRESP,IDESTLU,'KEEP')
 CONTAINS 
 
 SUBROUTINE FMREADLFIN1(klu,hrecfm,kval,kresp)
-INTEGER, INTENT(IN)         :: klu ! logical fortran unit au lfi file
-CHARACTER(LEN=*),INTENT(IN) :: hrecfm ! article name to be read
-INTEGER, INTENT(OUT)        :: kval ! integer value for hrecfm article
-INTEGER, INTENT(OUT)        :: kresp! return code null if OK
+INTEGER(KIND=LFI_INT), INTENT(IN)  :: klu ! logical fortran unit au lfi file
+CHARACTER(LEN=*),      INTENT(IN)  :: hrecfm ! article name to be read
+INTEGER,               INTENT(OUT) :: kval ! integer value for hrecfm article
+INTEGER(KIND=LFI_INT), INTENT(OUT) :: kresp! return code null if OK
 !
-INTEGER(KIND=8),DIMENSION(:),ALLOCATABLE::iwork
-INTEGER :: iresp,ilenga,iposex,icomlen
+INTEGER(KIND=8),DIMENSION(:),ALLOCATABLE :: iwork
+INTEGER(KIND=LFI_INT)                    :: iresp,ilenga,iposex,icomlen
 !
 CALL LFINFO(iresp,klu,hrecfm,ilenga,iposex)
 IF (iresp /=0 .OR. ilenga == 0) THEN

MY_RUN/BENCH/001_RELIEF_PERTURB/002_mesonh/EXSEG1_NSTEP.nam.ihm

@@ -82,7 +82,7 @@
  LNUMDIFF = T /
 
 &NAM_FMOUT
- XFMOUT(1,1) = 100000.0 /
+ XBAK_TIME(1,1) = 100000.0 /
 &NAM_BUDGET
  CBUTYPE = "NONE"
 /

MY_RUN/BENCH/003_MEDATL_FULLHD/003_mesonh/run_mesonh_xyz_SEG1.ihm

@@ -134,7 +134,7 @@ cat > EXSEG1.nam  << EOF
 /
 
 &NAM_FMOUT
- ${XFMOUT} 
+ ${XBAK_TIME} 
 / 
 EOF
 cp EXSEG1.nam SURF1.nam      

MY_RUN/BENCH/003_MEDATL_FULLHD/003_mesonh/run_mesonh_xyz_SEGN.ihm

@@ -134,7 +134,7 @@ cat > EXSEG1.nam  << EOF
 /
 
 &NAM_FMOUT
- ${XFMOUT} 
+ ${XBAK_TIME} 
 / 
 EOF
 cp EXSEG1.nam SURF1.nam      

MY_RUN/BENCH/003_MEDATL_FULLHD/grillE_3072_1920_MNH490

@@ -203,16 +203,16 @@ export XTSTEP=$( echo " scale=5 ; ${XTSTEP0} / ${GRIDFAC} " | bc -l )
 export XSEGLEN=$( echo "1 * 3600  " | bc -l )
 export XSEGLEN=3600.0 
 
-#export XFMOUT="XFMOUT(1,1) =  1800., XFMOUT(1,2)  =  3600. , XFMOUT(1,3)  =  5400., XFMOUT(1,4)  = 7200., \
-#               XFMOUT(1,5) =  9000., XFMOUT(1,6)  = 10800. , XFMOUT(1,7)  = 12600., XFMOUT(1,8)  = 14400. , \
-#               XFMOUT(1,9) = 16200., XFMOUT(1,10) = 18000. , XFMOUT(1,11) = 19800., XFMOUT(1,12) = 21600. "
-#export XFMOUT="XFMOUT(1,1)  =  3600. , XFMOUT(1,2)  = 7200., \
-#               XFMOUT(1,3)  = 10800. , XFMOUT(1,4)  = 14400. , \
-#               XFMOUT(1,5) = 18000. , XFMOUT(1,6) = 21600. "
-#export XFMOUT="XFMOUT(1,1) =  21600. , XFMOUT(1,2)  =  43200. , XFMOUT(1,3)  =  64800. , XFMOUT(1,4)  = 86400. "
-#export XFMOUT="XFMOUT(1,1) =  21540. , XFMOUT(1,2)  =  43140. , XFMOUT(1,3)  =  64740. , XFMOUT(1,4)  = 86340. "
-
-export XFMOUT="XFMOUT(1,1) =  900. , XFMOUT(1,2)= 1800.  XFMOUT(1,3)  = 2400. , XFMOUT(1,4)  = 3600. "
+#export XBAK_TIME="XBAK_TIME(1,1) =  1800., XBAK_TIME(1,2)  =  3600. , XBAK_TIME(1,3)  =  5400., XBAK_TIME(1,4)  = 7200., \
+#               XBAK_TIME(1,5) =  9000., XBAK_TIME(1,6)  = 10800. , XBAK_TIME(1,7)  = 12600., XBAK_TIME(1,8)  = 14400. , \
+#               XBAK_TIME(1,9) = 16200., XBAK_TIME(1,10) = 18000. , XBAK_TIME(1,11) = 19800., XBAK_TIME(1,12) = 21600. "
+#export XBAK_TIME="XBAK_TIME(1,1)  =  3600. , XBAK_TIME(1,2)  = 7200., \
+#               XBAK_TIME(1,3)  = 10800. , XBAK_TIME(1,4)  = 14400. , \
+#               XBAK_TIME(1,5) = 18000. , XBAK_TIME(1,6) = 21600. "
+#export XBAK_TIME="XBAK_TIME(1,1) =  21600. , XBAK_TIME(1,2)  =  43200. , XBAK_TIME(1,3)  =  64800. , XBAK_TIME(1,4)  = 86400. "
+#export XBAK_TIME="XBAK_TIME(1,1) =  21540. , XBAK_TIME(1,2)  =  43140. , XBAK_TIME(1,3)  =  64740. , XBAK_TIME(1,4)  = 86340. "
+
+export XBAK_TIME="XBAK_TIME(1,1) =  900. , XBAK_TIME(1,2)= 1800.  XBAK_TIME(1,3)  = 2400. , XBAK_TIME(1,4)  = 3600. "
 
 if  [ $(echo " scale=0 ; ( ${XDX} - 5000.0 ) / 1 " | bc -l ) -gt 0 ] ; then
 # XDX > 5KM

MY_RUN/BENCH/003_MEDATL_FULLHD/grille_4km_1920x0600_I8_MED_ATL

@@ -279,15 +279,15 @@ export XTSTEP=$( echo " scale=5 ; ${XTSTEP0} / ${GRIDFAC} " | bc -l )
 export XSEGLEN=$( echo "24 * 3600 - 60 " | bc -l )
 #export XSEGLEN=60.0 
 
-#export XFMOUT="XFMOUT(1,1) =  1800., XFMOUT(1,2)  =  3600. , XFMOUT(1,3)  =  5400., XFMOUT(1,4)  = 7200., \
-#               XFMOUT(1,5) =  9000., XFMOUT(1,6)  = 10800. , XFMOUT(1,7)  = 12600., XFMOUT(1,8)  = 14400. , \
-#               XFMOUT(1,9) = 16200., XFMOUT(1,10) = 18000. , XFMOUT(1,11) = 19800., XFMOUT(1,12) = 21600. "
-#export XFMOUT="XFMOUT(1,1)  =  3600. , XFMOUT(1,2)  = 7200., \
-#               XFMOUT(1,3)  = 10800. , XFMOUT(1,4)  = 14400. , \
-#               XFMOUT(1,5) = 18000. , XFMOUT(1,6) = 21600. "
-#export XFMOUT="XFMOUT(1,1) =  21600. , XFMOUT(1,2)  =  43200. , XFMOUT(1,3)  =  64800. , XFMOUT(1,4)  = 86400. "
-export XFMOUT="XFMOUT(1,1) =  21540. , XFMOUT(1,2)  =  43140. , XFMOUT(1,3)  =  64740. , XFMOUT(1,4)  = 86340. "
-#export XFMOUT="XFMOUT(1,1) =  60. "
+#export XBAK_TIME="XBAK_TIME(1,1) =  1800., XBAK_TIME(1,2)  =  3600. , XBAK_TIME(1,3)  =  5400., XBAK_TIME(1,4)  = 7200., \
+#               XBAK_TIME(1,5) =  9000., XBAK_TIME(1,6)  = 10800. , XBAK_TIME(1,7)  = 12600., XBAK_TIME(1,8)  = 14400. , \
+#               XBAK_TIME(1,9) = 16200., XBAK_TIME(1,10) = 18000. , XBAK_TIME(1,11) = 19800., XBAK_TIME(1,12) = 21600. "
+#export XBAK_TIME="XBAK_TIME(1,1)  =  3600. , XBAK_TIME(1,2)  = 7200., \
+#               XBAK_TIME(1,3)  = 10800. , XBAK_TIME(1,4)  = 14400. , \
+#               XBAK_TIME(1,5) = 18000. , XBAK_TIME(1,6) = 21600. "
+#export XBAK_TIME="XBAK_TIME(1,1) =  21600. , XBAK_TIME(1,2)  =  43200. , XBAK_TIME(1,3)  =  64800. , XBAK_TIME(1,4)  = 86400. "
+export XBAK_TIME="XBAK_TIME(1,1) =  21540. , XBAK_TIME(1,2)  =  43140. , XBAK_TIME(1,3)  =  64740. , XBAK_TIME(1,4)  = 86340. "
+#export XBAK_TIME="XBAK_TIME(1,1) =  60. "
 
 
 #export XR=2.0

MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/plot_16JAN.py

+#!/usr/bin/env python3
+"""
+@author: Quentin Rodier
+Creation : 07/01/2021
+
+Last modifications
+"""
+import matplotlib as mpl
+mpl.use('Agg')
+import cartopy.crs as ccrs
+from read_MNHfile import read_netcdf
+from Panel_Plot import PanelPlot
+import os
+
+os.system('rm -f tempgraph*')
+#
+#  User's parameter / Namelist
+#
+#
+path="../RUN/"
+LnameFiles = ['16JA1.1.WENO5.004dg.nc', '16JA2.2.WENO5.002dg.nc']
+
+Dvar_input = {
+'f1':['MRV700HPA','THT850HPA','UT850HPA','VT850HPA','UT700HPA','VT700HPA', 'ALT_PRESSURE','ALT_U','ALT_V', 'ZS', 'latitude', 'longitude'],
+'f2':['MRV700HPA','THT850HPA','UT850HPA','VT850HPA','UT700HPA','VT700HPA', 'ALT_PRESSURE', 'ZS', 'ALT_U','ALT_V','latitude', 'longitude']
+}
+
+#  Read the variables in the files
+Dvar = {}
+Dvar = read_netcdf(LnameFiles, Dvar_input, path=path, removeHALO=True)
+
+################################################################
+#########          PANEL 1  
+###############################################################
+Panel1 = PanelPlot(2,2, [15,10],'16 JAN domaine 1 ', minmaxpad=1.05, minmaxTextSize=7.7, colorbaraspect=14)
+
+Lplot = [ Dvar['f1']['ZS'],Dvar['f1']['THT850HPA'], Dvar['f1']['MRV700HPA'],Dvar['f1']['ALT_PRESSURE']]
+lon = [Dvar['f1']['longitude']]*len(Lplot)
+lat = [Dvar['f1']['latitude']]*len(Lplot)
+Ltitle = ['Orography', 'Potential Temperature at 850hPa', 'Water vapor mixing at 700hPa','Pressure at z = 9000m']
+Lcbarlabel = ['m','K', 'g/kg', 'hPa']
+Lxlab = ['longitude']*len(Lplot)
+Lylab = ['latitude']*len(Lplot)
+Lminval = [0, 280, 0.5, 270]
+Lmaxval = [1500, 293, 4.2, 303]
+Lstep = [10, 0.25, 0.1, 1]
+Lstepticks = [500, 2, 0.5, 5]
+Lfacconv = [1.0, 1.0, 1.0, 1./100.0]
+Lcolormap = ['terrain', 'gist_rainbow_r', 'gist_rainbow_r', 'gist_rainbow_r']
+Lprojection = [ccrs.PlateCarree()]*len(Lplot)
+Llvl = [0, 0, 0, 0]
+fig1 = Panel1.psectionH(lon=lon, lat=lat, Lvar=Lplot, Lcarte=[], Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, 
+                                Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv)
+
+Lplot1 = [ Dvar['f1']['UT850HPA'], Dvar['f1']['UT700HPA'], Dvar['f1']['ALT_U']]
+Lplot2 = [ Dvar['f1']['VT850HPA'], Dvar['f1']['VT700HPA'], Dvar['f1']['ALT_V']]
+Ltitle = ['Wind at 850hPa', 'Wind at 700hPa', 'Wind at 9000m']
+Lxlab = ['longitude']*len(Lplot1)
+Lylab = ['latitude']*len(Lplot1)
+Llegendval = [20,20,40]
+Llegendlabel = ['(m/s)']*len(Lplot1)
+Larrowstep = [2]*len(Lplot1)
+Lwidth = [0.002]*len(Lplot1)
+Lcolor = ['black']*len(Lplot1)
+Lprojection = [ccrs.PlateCarree()]*len(Lplot1)
+Llvl = [0]*len(Lplot1)
+fig2 = Panel1.pvector(Lxx=lon, Lyy=lat, Lvar1=Lplot1, Lvar2=Lplot2, Lcarte=[], Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, 
+                      Ltitle=Ltitle, Lwidth=Lwidth, Larrowstep=Larrowstep, Lproj=Lprojection,
+                      Lcolor=Lcolor, Llegendval=Llegendval, Llegendlabel=Llegendlabel, Lid_overlap=[2,4,6], ax=fig1.axes)
+
+Panel1.save_graph(1,fig2)
+
+################################################################
+#########          PANEL 2 
+###############################################################
+Panel2 = PanelPlot(2,2, [15,10],'16 JAN domaine 2 ', minmaxpad=1.05, minmaxTextSize=8, colorbaraspect=14)
+
+Lplot = [ Dvar['f2']['ZS'],Dvar['f2']['THT850HPA'], Dvar['f2']['MRV700HPA'],Dvar['f2']['ALT_PRESSURE']]
+lon = [Dvar['f2']['longitude']]*len(Lplot)
+lat = [Dvar['f2']['latitude']]*len(Lplot)
+Ltitle = ['Orography', 'Potential Temperature at 850hPa', 'Water vapor mixing at 700hPa','Pressure at z = 9000m']
+Lcbarlabel = ['m','K', 'g/kg', 'hPa']
+Lxlab = ['longitude']*len(Lplot)
+Lylab = ['latitude']*len(Lplot)
+Lminval = [0, 285, 0.9, 280]
+Lmaxval = [2600, 293, 4, 294]
+Lstep = [10, 0.5, 0.1, 0.5]
+Lstepticks = [500, 1, 0.2, 5]
+Lfacconv = [1.0, 1.0, 1.0, 1./100.0]
+Lcolormap = ['terrain', 'gist_rainbow_r', 'gist_rainbow_r', 'gist_rainbow_r']
+Lprojection = [ccrs.PlateCarree()]*len(Lplot)
+Llvl = [0]*len(Lplot)
+fig1 = Panel2.psectionH(lon=lon, lat=lat, Lvar=Lplot, Lcarte=[], Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, 
+                                Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv)
+
+Lplot1 = [ Dvar['f2']['UT850HPA'], Dvar['f2']['UT700HPA'], Dvar['f2']['ALT_U']]
+Lplot2 = [ Dvar['f2']['VT850HPA'], Dvar['f2']['VT700HPA'], Dvar['f2']['ALT_V']]
+Ltitle = ['Wind at 850hPa', 'Wind at 700hPa', 'Wind at 9000m']
+Llegendval = [20,20,40]
+Lxlab = ['longitude']*len(Lplot1)
+Lylab = ['latitude']*len(Lplot1)
+Llegendlabel = ['(m/s)']*len(Lplot1)
+Larrowstep = [2]*len(Lplot1)
+Lwidth = [0.002]*len(Lplot1)
+Lcolor = ['black']*len(Lplot1)
+Lprojection = [ccrs.PlateCarree()]*len(Lplot1)
+Llvl = [0]*len(Lplot1)
+fig2 = Panel2.pvector(Lxx=lon, Lyy=lat, Lvar1=Lplot1, Lvar2=Lplot2, Lcarte=[], Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, 
+                      Ltitle=Ltitle, Lwidth=Lwidth, Larrowstep=Larrowstep, Lproj=Lprojection,
+                      Lcolor=Lcolor, Llegendval=Llegendval, Llegendlabel=Llegendlabel, Lid_overlap=[2,4,6], ax=fig1.axes)
+
+Panel2.save_graph(2,fig2)