From f549cde5c92645b933b4f7836745a6d436c830e6 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 9 Jun 2017 14:39:27 +0200
Subject: [PATCH] Philippe 09/06/2017: IO: name of the variable added to the
name of the written field and better comment (true comment + units)
---
src/MNH/write_diachro.f90 | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/MNH/write_diachro.f90 b/src/MNH/write_diachro.f90
index deb859ad7..31a7b4669 100644
--- a/src/MNH/write_diachro.f90
+++ b/src/MNH/write_diachro.f90
@@ -70,6 +70,8 @@
!! routine.
!! J.Escobar 02/10/2015 modif for JPHEXT(JPVEXT) variable
!! D.Gazen+ G.Delautier 06/2016 modif for ncl files
+!! P. Wautelet 09/06/2017: name of the variable added to the name of the written field
+!! and better comment (true comment + units)
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -383,36 +385,36 @@ DO J = 1,IP
! BUG ...ca passe que si PRESENT(OICP) sinon OICP non defini
IF (PRESENT(OICP) .AND. PRESENT(OJCP)) THEN
IF(HTYPE == 'CART' .AND. .NOT. OICP .AND. .NOT. OJCP) THEN
- TZFIELD%CMNHNAME = TRIM(HGROUP)//'.PROC'//YJ
+ TZFIELD%CMNHNAME = TRIM(HGROUP)//'.'//TRIM(HTITRE(J))
TZFIELD%CSTDNAME = ''
- TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(HGROUP)//'.PROC'//YJ
- TZFIELD%CUNITS = ''
+ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME)
+ TZFIELD%CUNITS = TRIM(HUNITE(J))
TZFIELD%CDIR = 'XY'
- TZFIELD%CCOMMENT = TRIM(HTITRE(J))
+ TZFIELD%CCOMMENT = TRIM(HCOMMENT(J))
TZFIELD%NGRID = KGRID(J)
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 5
CALL IO_WRITE_FIELD_BOX(TPDIAFILE,TZFIELD,HLUOUTDIA,'BUDGET',PVAR(:,:,:,:,:,J), &
KIL+JPHEXT,KIH+JPHEXT,KJL+JPHEXT,KJH+JPHEXT)
ELSE
- TZFIELD%CMNHNAME = TRIM(HGROUP)//'.PROC'//YJ
+ TZFIELD%CMNHNAME = TRIM(HGROUP)//'.'//TRIM(HTITRE(J))
TZFIELD%CSTDNAME = ''
- TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(HGROUP)//'.PROC'//YJ
- TZFIELD%CUNITS = ''
+ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME)
+ TZFIELD%CUNITS = TRIM(HUNITE(J))
TZFIELD%CDIR = '--'
- TZFIELD%CCOMMENT = TRIM(HTITRE(J))
+ TZFIELD%CCOMMENT = TRIM(HCOMMENT(J))
TZFIELD%NGRID = KGRID(J)
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 5
CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PVAR(:,:,:,:,:,J))
ENDIF
ELSE
- TZFIELD%CMNHNAME = TRIM(HGROUP)//'.PROC'//YJ
+ TZFIELD%CMNHNAME = TRIM(HGROUP)//'.'//TRIM(HTITRE(J))
TZFIELD%CSTDNAME = ''
- TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(HGROUP)//'.PROC'//YJ
- TZFIELD%CUNITS = ''
+ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME)
+ TZFIELD%CUNITS = TRIM(HUNITE(J))
TZFIELD%CDIR = '--'
- TZFIELD%CCOMMENT = TRIM(HTITRE(J))
+ TZFIELD%CCOMMENT = TRIM(HCOMMENT(J))
TZFIELD%NGRID = KGRID(J)
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 5
--
GitLab