From d8bc5895db38314ea292e29180cf532af9c1b57e Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 8 Sep 2017 13:40:27 +0200
Subject: [PATCH] Philippe 08/09/2017: IO: improved debug messages
---
src/MNH/read_surf_mnh.f90 | 36 +++++++++++++++++++++++++++++++++---
src/MNH/write_surf_mnh.f90 | 22 +++++++++++-----------
2 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/src/MNH/read_surf_mnh.f90 b/src/MNH/read_surf_mnh.f90
index bd0e4d153..8f49fa93b 100644
--- a/src/MNH/read_surf_mnh.f90
+++ b/src/MNH/read_surf_mnh.f90
@@ -52,6 +52,7 @@ USE MODE_FIELD, ONLY : TFIELDDATA,TYPEREAL
USE MODE_FM
USE MODE_FMREAD
USE MODE_GRIDPROJ
+USE MODE_MSG
!
USE MODD_IO_SURF_MNH, ONLY : COUT, TPINFILE, NLUOUT
!
@@ -81,6 +82,8 @@ CHARACTER(LEN=100):: YCOMMENT ! comment
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFX0_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
IF (HREC=='LONORI' .OR. HREC=='LATORI') THEN
CALL IO_READ_FIELD(TPINFILE,'MASDEV',IMASDEV)
IF (IMASDEV<=45) THEN
@@ -194,6 +197,7 @@ USE MODE_FM
USE MODE_FMREAD
USE MODE_ll
USE MODE_IO_ll
+USE MODE_MSG
!
USE MODD_CST, ONLY : XPI
!
@@ -243,6 +247,8 @@ REAL :: ZUNDEF ! undefined value in SURFEX
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFX1_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
KRESP = 0
!
IF (HDIR=='A') THEN
@@ -513,6 +519,7 @@ USE MODE_FIELD, ONLY: TFIELDDATA,TYPEREAL
USE MODE_FM
USE MODE_FMREAD
USE MODE_IO_ll
+USE MODE_MSG
!
USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE , NLUOUT, TPINFILE, NMASK, NIU, NJU, NIB, NJB, NIE, NJE, &
NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, NIE_ALL, NJE_ALL, NMASK_ALL
@@ -549,6 +556,7 @@ REAL :: ZUNDEF ! undefined value in SURFEX
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFX2_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
!
!! Reading of a 3D field, masked (2 first dimensions) and with
!! 2 first dimensions packed into only 1 (results in a 2D array instead of 3D)
@@ -653,6 +661,7 @@ USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG,TYPEREAL
USE MODE_FM
USE MODE_FMREAD
USE MODE_IO_ll
+USE MODE_MSG
!
USE MODD_DATA_COVER_PAR, ONLY : JPCOVER
USE MODD_CST, ONLY : XPI
@@ -702,6 +711,8 @@ LOGICAL :: GCOVER_PACKED ! .T. if COVER are all packed into one field
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFX2COV_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
KRESP = 0
IRESP = 0
!
@@ -849,6 +860,7 @@ USE MODE_FM
USE MODE_FMREAD
USE MODE_ll
USE MODE_IO_ll
+USE MODE_MSG
!
USE MODD_CST, ONLY : XPI
!
@@ -897,6 +909,8 @@ CHARACTER(LEN=1) :: YDIR1
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFX2COV_1COV_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
KRESP = 0
!YDIR1 = 'H'
!IF (PRESENT(HDIR)) YDIR1 = HDIR
@@ -1029,6 +1043,7 @@ USE MODE_ll
USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT
USE MODE_FM
USE MODE_FMREAD
+USE MODE_MSG
!
USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE, TPINFILE, NLUOUT, NMASK, &
NIU, NJU, NIB, NJB, NIE, NJE
@@ -1069,6 +1084,8 @@ TYPE(TFIELDDATA) :: TZFIELD
!
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFN0_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
KRESP=0
!
CALL IO_READ_FIELD(TPINFILE,'MASDEV',IMASDEV)
@@ -1215,6 +1232,7 @@ END SUBROUTINE READ_SURFN0_MNH
USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT
USE MODE_FM
USE MODE_FMREAD
+USE MODE_MSG
!
USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE, TPINFILE, NLUOUT, NMASK, &
NIU, NJU, NIB, NJB, NIE, NJE
@@ -1244,6 +1262,8 @@ INTEGER, DIMENSION(:,:), ALLOCATABLE :: IWORK ! work array read in the file
TYPE(TFIELDDATA) :: TZFIELD
!---------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFN1_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
IF (HDIR=='-') THEN
!
TZFIELD%CMNHNAME = TRIM(HREC)
@@ -1332,7 +1352,7 @@ USE MODE_ll
USE MODE_FIELD, ONLY: TFIELDDATA,TYPECHAR
USE MODE_FM
USE MODE_FMREAD
-!
+USE MODE_MSG
USE MODE_POS
!
USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE, TPINFILE, NLUOUT
@@ -1366,6 +1386,8 @@ TYPE(TFIELDDATA) :: TZFIELD
NAMELIST/NAM_PARAMn/CTURB,CRAD,CGROUND,CCLOUD,CDCONV,CSEA_FLUX, CELEC
!----------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFC0_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
KRESP = 0
! On lit la version de Mesonh usilisée pour fabriquer le fichier
!
@@ -1494,6 +1516,7 @@ USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE , TPINFILE, NLUOUT, NMASK, &
USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT,TYPELOG
USE MODE_FM
USE MODE_FMREAD
+USE MODE_MSG
!
USE MODI_PACK_2D_1D
!
@@ -1522,7 +1545,8 @@ LOGICAL, DIMENSION(:,:), ALLOCATABLE :: GWORK ! work array read in the file
INTEGER, DIMENSION(:,:), ALLOCATABLE :: IWORK ! work array read in the file
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
-
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFL1_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
IF (HDIR=='-') THEN
TZFIELD%CMNHNAME = TRIM(HREC)
TZFIELD%CSTDNAME = ''
@@ -1618,6 +1642,7 @@ END SUBROUTINE READ_SURFL1_MNH
USE MODE_FIELD, ONLY: TFIELDDATA,TYPELOG
USE MODE_FM
USE MODE_FMREAD
+USE MODE_MSG
!
USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE, TPINFILE, NLUOUT
!
@@ -1636,7 +1661,8 @@ CHARACTER(LEN=100), INTENT(OUT) :: HCOMMENT ! comment
INTEGER :: IMASDEV ! MESONH version
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
-
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFL0_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
+!
IF (HREC(1:4)=='BUDC') THEN
CALL IO_READ_FIELD(TPINFILE,'MASDEV',IMASDEV)
IF (IMASDEV<=45) THEN
@@ -1721,6 +1747,7 @@ END SUBROUTINE READ_SURFL0_MNH
USE MODE_FIELD, ONLY : TFIELDDATA,TYPECHAR
USE MODE_FM
USE MODE_FMREAD
+USE MODE_MSG
!
USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE, TPINFILE, NLUOUT
USE MODD_TYPE_DATE
@@ -1752,6 +1779,7 @@ TYPE(TFIELDDATA) :: TZFIELD
TYPE(DATE_TIME) :: TZDATETIME
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFT0_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
!
CALL IO_READ_FIELD(TPINFILE,'MASDEV',IMASDEV)
IF (IMASDEV<46) THEN
@@ -1841,6 +1869,7 @@ END SUBROUTINE READ_SURFT0_MNH
USE MODE_FIELD, ONLY : TFIELDDATA,TYPECHAR
USE MODE_FM
USE MODE_FMREAD
+USE MODE_MSG
!
USE MODD_IO_SURF_MNH, ONLY : COUT, CFILE, TPINFILE, NLUOUT
!
@@ -1872,6 +1901,7 @@ INTEGER :: IMASDEV ! MESONH version
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','READ_SURFT1_MNH',TRIM(TPINFILE%CNAME)//': reading '//TRIM(HREC))
!
CALL IO_READ_FIELD(TPINFILE,'MASDEV',IMASDEV)
IF (IMASDEV<46) THEN
diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90
index 72af98fdc..496a80c4b 100644
--- a/src/MNH/write_surf_mnh.f90
+++ b/src/MNH/write_surf_mnh.f90
@@ -78,7 +78,7 @@ TYPE(TFIELDDATA) :: TZFIELD
!
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX0_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX0_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF( ( HREC=='LAT0' .OR. HREC=='LON0' .OR. HREC=='RPK' .OR. HREC=='BETA' &
.OR. HREC=='LATORI'.OR. HREC=='LONORI' )&
@@ -198,7 +198,7 @@ CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX1_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX1_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
!* 1. Special cases with no writing
! -----------------------------------
@@ -506,7 +506,7 @@ CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX2COV_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX2COV_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
!* 2. Ecriture
! --------------
@@ -701,7 +701,7 @@ CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX2_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFX2_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF (HDIR=='A') THEN
IIU = NIU_ALL
@@ -851,7 +851,7 @@ TYPE(TFIELDDATA) :: TZFIELD
CHARACTER(LEN=5) :: YMSG
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFN0_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFN0_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF( (HREC=='IMAX' .OR. HREC=='JMAX' .OR. HREC=='KMAX') .AND. &
CSTORAGE_TYPE/='PG' .AND. CSTORAGE_TYPE/='SU' ) THEN
@@ -960,7 +960,7 @@ CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFN1_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFN1_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF (HDIR=='-') THEN
!
@@ -1068,7 +1068,7 @@ TYPE(TFIELDDATA) :: TZFIELD
CHARACTER(LEN=5) :: YMSG
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFC0_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFC0_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') &
.AND. HREC=='GRID_TYPE ' ) THEN
@@ -1189,7 +1189,7 @@ CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFL1_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFL1_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF (HDIR=='-') THEN
IF( (CMASK /= 'FULL ').AND. (HREC=='COVER') ) THEN
@@ -1306,7 +1306,7 @@ CHARACTER(LEN=100), INTENT(IN) :: HCOMMENT ! Comment string
CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDDATA) :: TZFIELD
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFL0_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFL0_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF( (CMASK /= 'FULL ').AND. (HREC=='COVER') ) THEN
CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFL0_MNH',TRIM(HREC)//' with mask '// &
@@ -1405,7 +1405,7 @@ TYPE (DATE_TIME) :: TZDATA
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFT0_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFT0_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF( HREC=='DTCUR' .AND. CSTORAGE_TYPE/='SU' ) THEN
CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFT0_MNH',TRIM(HREC)//' not written in file by externalized surface')
@@ -1504,7 +1504,7 @@ CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDDATA) :: TZFIELD
!-------------------------------------------------------------------------------
!
-CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFT1_MNH','writing '//TRIM(HREC))
+CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFT1_MNH',TRIM(TFILE_SURFEX%CNAME)//': writing '//TRIM(HREC))
!
IF( HREC=='DTCUR' .AND. CSTORAGE_TYPE/='SU' ) THEN
CALL PRINT_MSG(NVERB_DEBUG,'IO','WRITE_SURFT1_MNH',TRIM(HREC)//' not written in file by externalized surface')
--
GitLab