From f0b74cbe67afc8e70e4cf14589fdc05cb2e5de6f Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Thu, 18 May 2017 13:44:03 +0200 Subject: [PATCH] Philippe 18/05/2017: IO: bug corrections: corrected characteristics of several fields --- src/LIB/SURCOUCHE/src/mode_field.f90 | 12 ++++++------ src/MNH/modeln.f90 | 1 - src/MNH/write_surf_mnh.f90 | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90 index 376b78821..8c33ef365 100644 --- a/src/LIB/SURCOUCHE/src/mode_field.f90 +++ b/src/LIB/SURCOUCHE/src/mode_field.f90 @@ -160,7 +160,7 @@ TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CCOMMENT = '' TFIELDLIST(IDX)%NGRID = 0 TFIELDLIST(IDX)%NTYPE = TYPECHAR -TFIELDLIST(IDX)%NDIMS = 1 +TFIELDLIST(IDX)%NDIMS = 0 IDX = IDX+1 ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() @@ -172,7 +172,7 @@ TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CCOMMENT = '' TFIELDLIST(IDX)%NGRID = 0 TFIELDLIST(IDX)%NTYPE = TYPECHAR -TFIELDLIST(IDX)%NDIMS = 1 +TFIELDLIST(IDX)%NDIMS = 0 IDX = IDX+1 ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() @@ -184,7 +184,7 @@ TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CCOMMENT = '' TFIELDLIST(IDX)%NGRID = 0 TFIELDLIST(IDX)%NTYPE = TYPECHAR -TFIELDLIST(IDX)%NDIMS = 1 +TFIELDLIST(IDX)%NDIMS = 0 IDX = IDX+1 ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() @@ -196,7 +196,7 @@ TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CCOMMENT = '' TFIELDLIST(IDX)%NGRID = 0 TFIELDLIST(IDX)%NTYPE = TYPECHAR -TFIELDLIST(IDX)%NDIMS = 1 +TFIELDLIST(IDX)%NDIMS = 0 IDX = IDX+1 ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() @@ -208,7 +208,7 @@ TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CCOMMENT = '' TFIELDLIST(IDX)%NGRID = 0 TFIELDLIST(IDX)%NTYPE = TYPECHAR -TFIELDLIST(IDX)%NDIMS = 1 +TFIELDLIST(IDX)%NDIMS = 0 IDX = IDX+1 ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() @@ -292,7 +292,7 @@ TFIELDLIST(IDX)%CDIR = '--' TFIELDLIST(IDX)%CCOMMENT = 'Storage type for the information written in the FM files' TFIELDLIST(IDX)%NGRID = 0 TFIELDLIST(IDX)%NTYPE = TYPECHAR -TFIELDLIST(IDX)%NDIMS = 1 +TFIELDLIST(IDX)%NDIMS = 0 IDX = IDX+1 ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90 index 59edda8b1..274877ae1 100644 --- a/src/MNH/modeln.f90 +++ b/src/MNH/modeln.f90 @@ -1298,7 +1298,6 @@ XT_RELAX = XT_RELAX + ZTIME2 - ZTIME1 & ! ZTIME1 = ZTIME2 ! -!!Was called if MNH_NCWRIT: CALL WRITE_PHYS_PARAM(TZBAKFILE%CNAME) CALL PHYS_PARAM_n(KTCOUNT,TZBAKFILE, GCLOSE_OUT, & XT_RAD,XT_SHADOWS,XT_DCONV,XT_GROUND,XT_MAFL, & XT_DRAG,XT_TURB,XT_TRACER, & diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90 index 3eb1def7d..f61451634 100644 --- a/src/MNH/write_surf_mnh.f90 +++ b/src/MNH/write_surf_mnh.f90 @@ -370,7 +370,7 @@ ELSE IF (HDIR=='H') THEN TZFIELD%CCOMMENT = TRIM(HCOMMENT) TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL - TZFIELD%NDIMS = 1 + TZFIELD%NDIMS = 2 CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,KRESP,ZWORK(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO)) ELSE IF (HDIR=='A') THEN TZFIELD%CMNHNAME = TRIM(HREC) @@ -381,7 +381,7 @@ ELSE IF (HDIR=='A') THEN TZFIELD%CCOMMENT = TRIM(HCOMMENT) TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL - TZFIELD%NDIMS = 1 + TZFIELD%NDIMS = 2 CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,KRESP,ZWORK(:,:)) ELSE TZFIELD%CMNHNAME = TRIM(HREC) -- GitLab