Add current simulation time in OUTPUT_LISTING and add test in profile_mesonh

.gitignore

@@ -53,5 +53,7 @@ src/LIB/libaec*
 src/LIB/netcdf*
 !src/LIB/netcdf*.tar.gz
 src/LIB/MEGAN*
-src/LIB/oasis3-mct_v3*
-src/LIB/toy_v1-0*
+src/LIB/oasis3-mct*
+!src/LIB/oasis3-mct*.tar.gz
+src/LIB/toy*
+!src/LIB/toy*.tar.gz

MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE

@@ -4,7 +4,7 @@
 
 &NAM_SFX_WAVE_CPL XTSTEP_CPL_WAVE = 60.0,
                   CWAVE_U10       = 'MNH__U10',
-                  CWAVE_V10       = '        ',    
+                  CWAVE_V10       = '        ',
                   CWAVE_CHA       = 'MNH__CHA',
                   CWAVE_UCU       = '        ',
                   CWAVE_VCU       = '        ',
@@ -34,7 +34,7 @@
 &NAM_CONFZ MPI_BUFFER_SIZE=200 /
 
 &NAM_CONF CCONF = "START",
-          NVERB=5,
+          NVERB =0,
           NMODEL = 1,
           CEXP = "IROIS",
           CSEG = "00-01",

MY_RUN/KTEST/013_Iroise_ideal_case_coupling/A_RUN_MNH_TOY/run_mesonh_xyz

@@ -4,7 +4,7 @@ echo '--------------------------------------'
 echo '--  run Meso-NH coupling              '
 echo '--------------------------------------'
 
-export PATH_EXETOY=${SRC_MESONH}/src/LIB/toy_v1-0/
+export PATH_EXETOY=${SRC_MESONH}/src/LIB/toy_1.0/
 
 #~~~~~ OCEAN OR WAVE
 export TYPE_TOY='WAVE'

conf/profile_mesonh.ihm

@@ -117,6 +117,8 @@ export VER_ECRAD=${VER_ECRAD}
 #  OASIS
 #
 export VER_OASIS=${VER_OASIS}
+export VERSION_OASIS=${VERSION_OASIS}
+export VERSION_TOY=${VERSION_TOY}
 #
 # NCL_NCARG
 #
@@ -177,3 +179,15 @@ export VARTTY=\`tty\`
 # Optional Environnement variable/Module  Env
 #
 ${MNHENV}
+#
+if [ \${VER_CDF} = 'CDFPERSO' ] ; then
+if [ -z \$NETCDF_CONFIG ] ; then
+echo 'WARNING : You chose VER_CDF=CDFPERSO, please set NETCDF_CONFIG environment variable'
+fi
+fi
+#
+if [ \${VER_OASIS} = 'OASISPERSO' ] ; then
+if [ -z \$OASISDIR ] ; then
+echo 'WARNING : You chose VER_OASIS=OASISPERSO, please set OASISDIR environment variable'
+fi
+fi 

src/MNH/ground_paramn.f90

@@ -146,7 +146,7 @@ USE MODD_BUDGET,            ONLY: LBUDGET_TH, LBUDGET_RV, NBUDGET_RV, NBUDGET_TH
 USE MODD_CH_AEROSOL,        ONLY: LORILAM
 USE MODD_CH_FLX_n,          ONLY: XCHFLX
 USE MODD_CH_MNHC_n,         ONLY: LUSECHEM
-USE MODD_CONF,              ONLY: CPROGRAM, LCARTESIAN, NHALO
+USE MODD_CONF,              ONLY: CPROGRAM, LCARTESIAN, NHALO, NVERB
 USE MODD_COUPLING_LEVELS_n
 USE MODD_CONF_n,            ONLY: NRR
 USE MODD_CST,               ONLY: XP00, XCPD, XRD, XRV, XRHOLW, XDAY, XPI, XMD, XAVOGADRO
@@ -761,13 +761,10 @@ CALL DATETIME_DISTANCE(TDTSEG,TDTCUR,ZTIMEC)
 IF (LOASIS) THEN
   IF ( MOD(ZTIMEC,1.0) .LE. 1E-2 .OR. (1.0 - MOD(ZTIMEC,1.0)) .LE. 1E-2 ) THEN
     IF ( NINT(ZTIMEC-(XSEGLEN-DYN_MODEL(1)%XTSTEP)) .LT. 0 ) THEN
-      WRITE(ILUOUT,*) '----------------------------'
-      WRITE(ILUOUT,*) ' Reception des champs avec OASIS'
-      WRITE(ILUOUT,*) 'NINT(ZTIMEC)=', NINT(ZTIMEC)
+      IF (NVERB .GE. 5) WRITE(ILUOUT,*) 'Received fields from OASIS at ', NINT(ZTIMEC), 's'
       CALL MNH_OASIS_RECV(CPROGRAM,IDIM1D,SIZE(XSW_BANDS),ZTIMEC+XTSTEP,XTSTEP,         &
                         ZP_ZENITH,XSW_BANDS                                         ,         &
                         ZP_TSRAD,ZP_DIR_ALB,ZP_SCA_ALB,ZP_EMIS,ZP_TSURF)
-      WRITE(ILUOUT,*) '----------------------------'
     END IF
   END IF
 END IF
@@ -792,11 +789,8 @@ CALL COUPLING_SURF_ATM_MULTI_LEVEL_n(YSURF_CUR,'MESONH', 'E',ZTIMEC, XTSTEP,
 IF (LOASIS) THEN
   IF ( MOD(ZTIMEC,1.0) .LE. 1E-2 .OR. (1.0 - MOD(ZTIMEC,1.0)) .LE. 1E-2 ) THEN
     IF (NINT(ZTIMEC-(XSEGLEN-DYN_MODEL(1)%XTSTEP)) .LT. 0) THEN
-      WRITE(ILUOUT,*) '----------------------------'
-      WRITE(ILUOUT,*) ' Envoi des champs avec OASIS'
-      WRITE(ILUOUT,*) 'NINT(ZTIMEC)=', NINT(ZTIMEC)
+      IF (NVERB .GE. 5) WRITE(ILUOUT,*) 'Send fields to OASIS at ', NINT(ZTIMEC), 's'
       CALL MNH_OASIS_SEND(CPROGRAM,IDIM1D,ZTIMEC+XTSTEP,XTSTEP)
-      WRITE(ILUOUT,*) '----------------------------'
     END IF
   END IF
 END IF

src/MNH/mesonh.f90

@@ -85,7 +85,6 @@
 !
 #ifdef CPLOASIS
   USE MODD_VAR_ll, ONLY : NMNH_COMM_WORLD, IP
-  USE MODD_DYN_n, ONLY : XTSTEP
   USE MODD_SFX_OASIS, ONLY : LOASIS, LOASIS_GRID
 #endif
 !
@@ -108,6 +107,13 @@ USE MODI_VERSION
 USE MODI_INIT_MNH
 USE MODD_MNH_SURFEX_n
 !
+USE MODD_TIME,              ONLY: TDTSEG
+USE MODD_TIME_n,            ONLY: TDTCUR
+USE MODE_DATETIME
+USE MODD_LUNIT_n,           ONLY: TLUOUT
+USE MODD_DYN,               ONLY: XSEGLEN
+USE MODD_DYN_n,             ONLY: XTSTEP
+!
 #ifdef CPLOASIS
   USE MODI_SFX_OASIS_INIT
   USE MODI_MNH_OASIS_GRID
@@ -126,6 +132,7 @@ END TYPE TFILEPTR
 !
 INTEGER       :: JMODEL                       ! loop index 
 INTEGER       :: ITEMP_MODEL1                 ! loop increment 
+REAL          :: ZTIMEC                       ! Cumulative time since the start of simulation (s)
 LOGICAL       :: GEXIT                        ! flag for the end of the temporal loop
 INTEGER       :: IINFO_ll                     ! return code of // routines
 TYPE(TFILEDATA), POINTER :: TZBAKFILE         ! Backup file
@@ -227,6 +234,8 @@ ITEMP_MODEL1=1
 DO
   ITEMP_MODEL1=ITEMP_MODEL1+1
   !
+  CALL DATETIME_DISTANCE(TDTSEG,TDTCUR,ZTIMEC)
+  WRITE(TLUOUT%NLU,*) 'Current simulation time: ', ZTIMEC, '/', XSEGLEN-XTSTEP
   CALL GO_TOMODEL_ll(1,IINFO_ll)
   CALL GOTO_MODEL(1)
   CALL MODEL_n( ITEMP_MODEL1, TZBAKFILE, TZDTMODELN, GEXIT )