From 196095e73fffbad0d36d663789cab6181d578b81 Mon Sep 17 00:00:00 2001
From: Gaelle Tanguy <gaelle.tanguy@meteo.fr>
Date: Tue, 26 Apr 2016 09:47:29 +0000
Subject: [PATCH] Gaelle + Didier 26/04/2016 : change error message
---
src/LIB/SURCOUCHE/src/mode_fm.f90 | 14 ++++++--------
src/LIB/SURCOUCHE/src/mode_io.f90 | 5 +++--
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_fm.f90 b/src/LIB/SURCOUCHE/src/mode_fm.f90
index 0c3c8fa3b..112f1959d 100644
--- a/src/LIB/SURCOUCHE/src/mode_fm.f90
+++ b/src/LIB/SURCOUCHE/src/mode_fm.f90
@@ -9,6 +9,8 @@
! $Name$
! $Revision$
! $Date$
+!Correction :
+! D.Gazen : avril 2016 change error message
!-----------------------------------------------------------------
!-----------------------------------------------------------------
@@ -128,12 +130,6 @@ END SUBROUTINE FMLOOK_ll
SUBROUTINE FMOPEN_ll(HFILEM,HACTION,HFIPRI,KNPRAR,KFTYPE,KVERB,KNINAR&
& ,KRESP,OPARALLELIO)
-!-------------------------------------------------------------------------------
-!! MODIFICATIONS
-!! -------------
-!! J.escobar 19/04/2016 , return error<>0 when open file modified & no closed
-!!
-!-------------------------------------------------------------------------------
USE MODD_IO_ll, ONLY : ISP,ISTDOUT,LFIPARAM,LIOCDF4,LLFIOUT,LLFIREAD
USE MODE_FD_ll, ONLY : FD_ll,GETFD,JPFINL
USE MODE_IO_ll, ONLY : OPEN_ll,GCONFIO
@@ -262,7 +258,8 @@ IF (ISP == TZFDLFI%OWNER) THEN
TZFDLFI%CDF => NEWIOCDF()
INCERR = NF_OPEN(ADJUSTL(TRIM(HFILEM))//".nc4", NF_NOWRITE, TZFDLFI%CDF%NCID)
IF (INCERR /= NF_NOERR) THEN
- PRINT *, 'FMOPEN_ll, NF_OPEN error : ', NF_STRERROR(INCERR)
+ !PRINT *, 'FMOPEN_ll, NF_OPEN error : ', NF_STRERROR(INCERR)
+ PRINT *, 'Error in opening (FMOPEN_ll/NF_OPEN) ', TRIM(HFILEM)//'.nc4', ' : ', NF_STRERROR(IRESOU)
STOP
END IF
PRINT *, 'NF_OPEN: ', TRIM(HFILEM)//'.nc4'
@@ -274,7 +271,8 @@ IF (ISP == TZFDLFI%OWNER) THEN
INCERR = NF_CREATE(ADJUSTL(TRIM(HFILEM))//".nc4", &
&IOR(NF_CLOBBER,NF_NETCDF4), TZFDLFI%CDF%NCID)
IF (INCERR /= NF_NOERR) THEN
- PRINT *, 'FMOPEN_ll, NF_CREATE error : ', NF_STRERROR(INCERR)
+ !PRINT *, 'FMOPEN_ll, NF_CREATE error : ', NF_STRERROR(INCERR)
+ PRINT *, 'Error in opening (FMOPEN_ll/NF_CREATE) ', TRIM(HFILEM)//'.nc4', ' : ', NF_STRERROR(IRESOU)
STOP
END IF
PRINT *, 'NF_CREATE: ', TRIM(HFILEM)//'.nc4'
diff --git a/src/LIB/SURCOUCHE/src/mode_io.f90 b/src/LIB/SURCOUCHE/src/mode_io.f90
index 6708457e0..06e981263 100644
--- a/src/LIB/SURCOUCHE/src/mode_io.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io.f90
@@ -20,6 +20,7 @@
! Juan 05/11/2009: allow JPMAX_UNIT=48 open files
! J.Escobar 18/10/10 bug with PGI compiler on ADJUSTL
! Philippe 04/02/2016: bug with DELIM='NONE' and GCC 5.2/5.3
+! D.Gazen : avril 2016 change error message
!
MODULE MODE_IO_ll
@@ -663,7 +664,7 @@ CONTAINS
TZFD_IOZ%CDF => NEWIOCDF()
IOSCDF = NF_OPEN(TRIM(FILE)//cfile//".nc4", NF_NOWRITE, TZFD_IOZ%CDF%NCID)
IF (IOSCDF /= NF_NOERR) THEN
- PRINT *, 'NF_OPEN error : ', NF_STRERROR(IOSCDF)
+ PRINT *, 'Error in opening (NF_OPEN) ', TRIM(FILE)//cfile//'.nc4', ' : ', NF_STRERROR(IOS)
STOP
ELSE
IOS = 0
@@ -678,7 +679,7 @@ CONTAINS
IOSCDF = NF_CREATE(TRIM(FILE)//cfile//".nc4", &
&IOR(NF_CLOBBER,NF_NETCDF4), TZFD_IOZ%CDF%NCID)
IF (IOSCDF /= NF_NOERR) THEN
- PRINT *, 'NF_CREATE error : ', NF_STRERROR(IOSCDF)
+ PRINT *, 'Error in opening (NF_CREATE) ', TRIM(FILE)//cfile//'.nc4', ' : ', NF_STRERROR(IOS)
STOP
ELSE
IOS = 0
--
GitLab