From 12546a4d8c1ced1104ea21e1699029ee287705f3 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Tue, 31 Jan 2023 18:49:27 +0100 Subject: [PATCH] Quentin 31/01/2023: bugfix integration of 5.6 mesonh TFIELD is now TFIELDMETADATA --- src/common/aux/modd_field.F90 | 5 ++--- src/common/aux/mode_io_field_write.F90 | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/common/aux/modd_field.F90 b/src/common/aux/modd_field.F90 index be5755c73..9ea5693a7 100644 --- a/src/common/aux/modd_field.F90 +++ b/src/common/aux/modd_field.F90 @@ -4,7 +4,7 @@ MODULE MODD_FIELD INTEGER, PARAMETER :: NMNHMAXDIMS = 6 ! Cannot be less than 6 INTEGER,PARAMETER :: TYPEUNDEF = -1, TYPEINT = 1, TYPELOG = 2, TYPEREAL = 3, TYPECHAR = 4, TYPEDATE = 5 ! -TYPE TFIELDDATA +TYPE TFIELDMETADATA CHARACTER(LEN=NMNHNAMELGTMAX) :: CMNHNAME = '' !Name of the field (for MesoNH, non CF convention) CHARACTER(LEN=NSTDNAMELGTMAX) :: CSTDNAME = '' !Standard name (CF convention) CHARACTER(LEN=32) :: CLONGNAME = '' !Long name (CF convention) @@ -24,6 +24,5 @@ TYPE TFIELDDATA CHARACTER(LEN=2) :: CDIR = '' !Type of the data field (XX,XY,--...) CHARACTER(LEN=4) :: CLBTYPE = 'NONE' !Type of the lateral boundary (LBX,LBY,LBXU,LBYV) LOGICAL :: LTIMEDEP = .FALSE. !Is the field time-dependent? -END TYPE TFIELDDATA -! +END TYPE TFIELDMETADATA END MODULE MODD_FIELD diff --git a/src/common/aux/mode_io_field_write.F90 b/src/common/aux/mode_io_field_write.F90 index fc33ce8dd..aa739877b 100644 --- a/src/common/aux/mode_io_field_write.F90 +++ b/src/common/aux/mode_io_field_write.F90 @@ -1,13 +1,13 @@ MODULE MODE_IO_FIELD_WRITE USE MODD_IO, ONLY: TFILEDATA -USE MODD_FIELD, ONLY: TFIELDDATA +USE MODD_FIELD, ONLY: TFIELDMETADATA CONTAINS SUBROUTINE IO_FIELD_WRITE(TPFILE,TZFIELD,PFIELD) ! !* 0.1 Declarations of arguments ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE - TYPE(TFIELDDATA), INTENT(IN) :: TZFIELD + TYPE(TFIELDMETADATA), INTENT(IN) :: TZFIELD REAL, DIMENSION(:,:,:), INTENT(IN) :: PFIELD ! array containing the data field ! CALL ABORT @@ -20,7 +20,7 @@ SUBROUTINE IO_FIELD_WRITE_PHY(D,TPFILE,TZFIELD,PFIELD) ! TYPE(DIMPHYEX_t), INTENT(IN) :: D TYPE(TFILEDATA), INTENT(IN) :: TPFILE - TYPE(TFIELDDATA), INTENT(IN) :: TZFIELD + TYPE(TFIELDMETADATA), INTENT(IN) :: TZFIELD REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PFIELD ! array containing the data field ! CALL ABORT -- GitLab