From 0b2c8d7148e20cc6a012ee0d564ab3cf9d0716f1 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Fri, 13 Nov 2020 13:36:58 +0100 Subject: [PATCH] Philippe 13/11/2020: IO: improve CF compliance (add missing unit, does not write empty standard_name) --- src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 | 6 ++++-- src/MNH/rain_c2r2_khko.f90 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 index 808e451a2..991f19d45 100644 --- a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 +++ b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 @@ -2045,8 +2045,10 @@ SUBROUTINE WRITE_VER_COORD(TDIM,HLONGNAME,HSTDNAME,HCOMPNAME,PSHIFT,KBOUNDLOW,KB ! Write metadata STATUS = NF90_PUT_ATT(INCID, IVARID, 'long_name',HLONGNAME) IF (STATUS /= NF90_NOERR) CALL IO_Err_handle_nc4(status,'WRITE_VER_COORD','NF90_PUT_ATT','long_name for '//trim(YVARNAME)) - STATUS = NF90_PUT_ATT(INCID, IVARID, 'standard_name',HSTDNAME) - IF (STATUS /= NF90_NOERR) CALL IO_Err_handle_nc4(status,'WRITE_VER_COORD','NF90_PUT_ATT','standard_name for '//trim(YVARNAME)) + if ( Len_trim( hstdname ) > 0 ) then + STATUS = NF90_PUT_ATT(INCID, IVARID, 'standard_name',HSTDNAME) + IF (STATUS /= NF90_NOERR) CALL IO_Err_handle_nc4(status,'WRITE_VER_COORD','NF90_PUT_ATT','standard_name for '//trim(YVARNAME)) + end if STATUS = NF90_PUT_ATT(INCID, IVARID, 'units','m') IF (STATUS /= NF90_NOERR) CALL IO_Err_handle_nc4(status,'WRITE_VER_COORD','NF90_PUT_ATT','units for '//trim(YVARNAME)) STATUS = NF90_PUT_ATT(INCID, IVARID, 'axis','Z') diff --git a/src/MNH/rain_c2r2_khko.f90 b/src/MNH/rain_c2r2_khko.f90 index bda25362d..05e67c35e 100644 --- a/src/MNH/rain_c2r2_khko.f90 +++ b/src/MNH/rain_c2r2_khko.f90 @@ -885,7 +885,7 @@ IF ( OCLOSE_OUT ) THEN TZFIELD%CMNHNAME = 'SMAX' TZFIELD%CSTDNAME = '' TZFIELD%CLONGNAME = 'SMAX' - TZFIELD%CUNITS = '' + TZFIELD%CUNITS = '1' TZFIELD%CDIR = 'XY' TZFIELD%CCOMMENT = 'X_Y_Z_SMAX' TZFIELD%NGRID = 1 -- GitLab