From 3035b2d5e27386ea4e381d77aa7497f370aa06fb Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 10 Mar 2017 11:30:45 +0100
Subject: [PATCH] Philippe 10/03/2017: IO: minor: added PRINT_MSG calls
(NVERB_DEBUG level)
---
src/LIB/SURCOUCHE/src/fmread_ll.f90 | 41 ++++++++++++++++++------
src/LIB/SURCOUCHE/src/fmreadwrit.f90 | 7 ++++
src/LIB/SURCOUCHE/src/mode_io.f90 | 8 +++--
src/LIB/SURCOUCHE/src/mode_netcdf.f90 | 46 +++++++++++++++++++++++++++
4 files changed, 91 insertions(+), 11 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/fmread_ll.f90 b/src/LIB/SURCOUCHE/src/fmread_ll.f90
index e980fb9db..c94e8e1cd 100644
--- a/src/LIB/SURCOUCHE/src/fmread_ll.f90
+++ b/src/LIB/SURCOUCHE/src/fmread_ll.f90
@@ -30,6 +30,8 @@ USE MODD_MPIF
#if defined(MNH_IOCDF4)
USE MODE_NETCDF
#endif
+USE MODE_MSG
+
IMPLICIT NONE
PRIVATE
@@ -119,6 +121,8 @@ TYPE(FD_ll), POINTER :: TZFD
INTEGER :: IRESP
TYPE(FMHEADER) :: TZFMH
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADX0_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
IRESP = 0
@@ -205,6 +209,8 @@ REAL,DIMENSION(:),POINTER :: ZFIELDP
LOGICAL :: GALLOC
TYPE(FMHEADER) :: TZFMH
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADX1_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
GALLOC = .FALSE.
@@ -328,6 +334,8 @@ REAL,DIMENSION(:,:),POINTER :: ZFIELD_GA
#endif
INTEGER :: IHEXTOT
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADX2_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
CALL SECOND_MNH2(T11)
@@ -534,6 +542,8 @@ REAL*8,DIMENSION(2) :: T11,T22
INTEGER :: IHEXTOT
!JUAN
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADX3_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
CALL SECOND_MNH2(T11)
@@ -848,6 +858,8 @@ LOGICAL :: GALLOC
TYPE(FMHEADER) :: TZFMH
INTEGER :: IHEXTOT
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADX4_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
GALLOC = .FALSE.
@@ -970,6 +982,8 @@ LOGICAL :: GALLOC
TYPE(FMHEADER) :: TZFMH
INTEGER :: IHEXTOT
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADX5_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
GALLOC = .FALSE.
@@ -1090,6 +1104,8 @@ REAL,DIMENSION(:,:,:,:,:,:),POINTER :: ZFIELDP
LOGICAL :: GALLOC
TYPE(FMHEADER) :: TZFMH
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADX6_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
GALLOC = .FALSE.
@@ -1183,7 +1199,8 @@ INTEGER :: IERR
TYPE(FD_ll), POINTER :: TZFD
INTEGER :: IRESP
TYPE(FMHEADER) :: TZFMH
-
+!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADN0_ll','reading '//TRIM(HRECFM))
!
!* 1.1 THE NAME OF LFIFM
!
@@ -1266,6 +1283,8 @@ INTEGER,DIMENSION(:),POINTER :: IFIELDP
LOGICAL :: GALLOC
TYPE(FMHEADER) :: TZFMH
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADN1_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
GALLOC = .FALSE.
@@ -1357,6 +1376,8 @@ LOGICAL :: GALLOC
TYPE(FMHEADER) :: TZFMH
INTEGER :: IHEXTOT
!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADN2_ll','reading '//TRIM(HRECFM))
+!
!* 1.1 THE NAME OF LFIFM
!
GALLOC = .FALSE.
@@ -1482,7 +1503,8 @@ TYPE(FD_ll), POINTER :: TZFD
INTEGER :: IRESP
INTEGER :: IFIELD
TYPE(FMHEADER) :: TZFMH
-
+!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADL0_ll','reading '//TRIM(HRECFM))
!
!* 1.1 THE NAME OF LFIFM
!
@@ -1569,7 +1591,8 @@ TYPE(FD_ll), POINTER :: TZFD
INTEGER :: IRESP
INTEGER, DIMENSION(SIZE(OFIELD)) :: IFIELD
TYPE(FMHEADER) :: TZFMH
-
+!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADL1_ll','reading '//TRIM(HRECFM))
!
!* 1.1 THE NAME OF LFIFM
!
@@ -1659,7 +1682,8 @@ INTEGER, DIMENSION(LEN(HFIELD)) :: IFIELD
CHARACTER(LEN(HFIELD)) :: YFIELD
INTEGER :: ILENG
TYPE(FMHEADER) :: TZFMH
-
+!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADC0_ll','reading '//TRIM(HRECFM))
!
!* 1.1 THE NAME OF LFIFM
!
@@ -1762,7 +1786,8 @@ INTEGER :: IRESP
INTEGER,DIMENSION(3) :: ITDATE
REAL :: ZTIME
TYPE(FMHEADER) :: TZFMH
-
+!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREADT0_ll','reading '//TRIM(HRECFM))
!
!* 1.1 THE NAME OF LFIFM
!
@@ -1876,7 +1901,8 @@ REAL*8,DIMENSION(2) :: T0,T1,T2,T3
REAL*8,DIMENSION(2) :: T11,T22
!JUANZIO
INTEGER :: IHEXTOT
-
+!
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FMREAD_LB','reading '//TRIM(HRECFM))
!
!* 1.1 THE NAME OF LFIFM
!
@@ -2041,6 +2067,3 @@ TIMEZ%T_READLB_ALL=TIMEZ%T_READLB_ALL + T22 - T11
END SUBROUTINE FMREAD_LB
END MODULE MODE_FMREAD
-
-
-!
diff --git a/src/LIB/SURCOUCHE/src/fmreadwrit.f90 b/src/LIB/SURCOUCHE/src/fmreadwrit.f90
index e4ebd9991..e167b5bae 100644
--- a/src/LIB/SURCOUCHE/src/fmreadwrit.f90
+++ b/src/LIB/SURCOUCHE/src/fmreadwrit.f90
@@ -30,6 +30,7 @@ END MODULE MODD_FM
SUBROUTINE FM_READ_ll(KFLU,HRECFM,OREAL,KLENG,KFIELD,TPFMH,KRESP)
USE MODD_FM
USE MODD_CONFZ, ONLY : NZ_VERB
+USE MODE_MSG
!
!* 0. DECLARATIONS
! ------------
@@ -60,6 +61,8 @@ INTEGER,DIMENSION(1:JPXKRK) ::ICOMMENT
!
!------------------------------------------------------------------
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FM_READ_ll','reading '//TRIM(HRECFM))
+
!
!* 1.2 WE LOOK FOR THE FILE'S LOGICAL UNIT
!
@@ -142,6 +145,7 @@ END SUBROUTINE FM_READ_ll
SUBROUTINE FM_WRIT_ll(KFLU,HRECFM,OREAL,KLENG,KFIELD,TPFMH,KRESP)
USE MODD_FM
+USE MODE_MSG
IMPLICIT NONE
!
@@ -163,6 +167,9 @@ INTEGER :: J
!JUAN
INTEGER(KIND=8),DIMENSION(:),ALLOCATABLE::IWORK
INTEGER,DIMENSION(1:JPXKRK) ::ICOMMENT
+
+CALL PRINT_MSG(NVERB_DEBUG,'IO','FM_WRIT_ll','writing '//TRIM(HRECFM))
+
!
!* 1.2 WE LOOK FOR THE FILE'S LOGICAL UNIT
!
diff --git a/src/LIB/SURCOUCHE/src/mode_io.f90 b/src/LIB/SURCOUCHE/src/mode_io.f90
index cf1dd4237..110b48cd8 100644
--- a/src/LIB/SURCOUCHE/src/mode_io.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io.f90
@@ -126,8 +126,10 @@ CONTAINS
LOGICAL :: GFORCELFIOUT, GFORCELFIREAD
+ CALL PRINT_MSG(NVERB_DEBUG,'IO','SET_CONFIO_ll','called')
+
IF (GCONFIO) THEN
- PRINT *, 'SET_CONFIO_ll already called (ignoring this call).'
+ CALL PRINT_MSG(NVERB_WARNING,'IO','SET_CONFIO_ll','already called (ignoring this call)')
ELSE
IF (PRESENT(OFORCELFIOUT)) THEN
GFORCELFIOUT = OFORCELFIOUT
@@ -165,13 +167,15 @@ CONTAINS
INTEGER :: IERR, IOS
LOGICAL :: GISINIT
+ CALL PRINT_MSG(NVERB_DEBUG,'IO','INITIO_ll','called')
+
ISTDERR = 0
CALL MPI_INITIALIZED(GISINIT, IERR)
IF (.NOT. GISINIT) THEN
!CALL MPI_INIT(IERR)
CALL INIT_NMNH_COMM_WORLD(IERR)
- if (IERR .NE.0) STOP "mode_io.f90::INITIO_ll() MPI_INIT ---> PROBLEME WITH REMAPPING NMNH_COMM_WORLD "
+ if (IERR .NE.0) CALL PRINT_MSG(NVERB_FATAL,'IO','SET_CONFIO_ll','problem with remapping of NMNH_COMM_WORLD')
END IF
!! Now MPI is initialized for sure
diff --git a/src/LIB/SURCOUCHE/src/mode_netcdf.f90 b/src/LIB/SURCOUCHE/src/mode_netcdf.f90
index 81d6b4a42..80a995125 100644
--- a/src/LIB/SURCOUCHE/src/mode_netcdf.f90
+++ b/src/LIB/SURCOUCHE/src/mode_netcdf.f90
@@ -441,6 +441,8 @@ CHARACTER(LEN=30) :: YVARNAME
INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITX0','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -525,6 +527,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(PFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITX1','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -630,6 +634,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(PFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITX2','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -761,6 +767,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(PFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITX3','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -867,6 +875,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(PFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITX4','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -912,6 +922,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(PFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITX5','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -957,6 +969,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(PFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITX6','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -1003,6 +1017,8 @@ CHARACTER(LEN=30) :: YVARNAME
INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITN0','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -1132,6 +1148,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(KFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITN1','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -1241,6 +1259,8 @@ INTEGER(KIND=IDCDF_KIND) :: IVARID
INTEGER(KIND=IDCDF_KIND), DIMENSION(SIZE(SHAPE(KFIELD))) :: IVDIMS
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITN2','writing '//TRIM(HVARNAME))
+
IRESP = 0
! Get the Netcdf file ID
INCID = PZCDF%NCID
@@ -1354,6 +1374,8 @@ CHARACTER(LEN=32) :: YSTR
!CHARACTER(LEN=LEN(HFIELD)) :: YSTR
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITC0','writing '//TRIM(HVARNAME))
+
IRESP = 0
YSTR = HFIELD
IF (LEN_TRIM(HFIELD) > LEN(YSTR)) THEN
@@ -1465,6 +1487,8 @@ INTEGER :: IRESP
INTEGER(KIND=IDCDF_KIND) :: ILEN
INTEGER(KIND=IDCDF_KIND) :: ISIZE
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCWRITC1','writing '//TRIM(HVARNAME))
+
IRESP = 0
ILEN = LEN(HFIELD)
ISIZE = SIZE(HFIELD)
@@ -1668,6 +1692,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMS ! number of dimensions
INTEGER(KIND=IDCDF_KIND) :: ICOMLEN ! comment length
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADX0','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -1722,6 +1748,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADX1','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -1789,6 +1817,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADX2','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -1856,6 +1886,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADX3','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -1923,6 +1955,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADX4','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -1990,6 +2024,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADX5','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -2057,6 +2093,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADX6','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -2120,6 +2158,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMS ! number of dimensions
INTEGER(KIND=IDCDF_KIND) :: ICOMLEN ! comment length
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADN0','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -2178,6 +2218,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADN1','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -2249,6 +2291,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADN2','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
@@ -2320,6 +2364,8 @@ INTEGER(KIND=IDCDF_KIND) :: IDIMLEN
INTEGER :: II
INTEGER :: IRESP
+CALL PRINT_MSG(NVERB_DEBUG,'IO','NCREADC0','reading '//TRIM(HVARNAME))
+
IRESP = 0
! NetCDF var names can't contain '%' nor '.'
--
GitLab