From b21420a13c425a244d123386fbf1bd6748b8a5a7 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 12 Jan 2018 10:45:14 +0100
Subject: [PATCH] Philippe 12/01/2018: IO: correct grid number for X/YHAT +
rename degree->degrees
---
src/LIB/SURCOUCHE/src/mode_field.f90 | 8 ++++----
src/MNH/read_surf_mnh.f90 | 8 ++++----
src/MNH/write_surf_mnh.f90 | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index 90704a893..d1276e681 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -475,7 +475,7 @@ TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: XHAT'
TFIELDLIST(IDX)%CUNITS = 'm'
TFIELDLIST(IDX)%CDIR = 'XX'
TFIELDLIST(IDX)%CCOMMENT = 'Position x in the conformal or cartesian plane'
-TFIELDLIST(IDX)%NGRID = 4
+TFIELDLIST(IDX)%NGRID = 2
TFIELDLIST(IDX)%NTYPE = TYPEREAL
TFIELDLIST(IDX)%NDIMS = 1
ALLOCATE(TFIELDLIST(IDX)%TFIELD_X1D(IMODEL))
@@ -489,7 +489,7 @@ TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: YHAT'
TFIELDLIST(IDX)%CUNITS = 'm'
TFIELDLIST(IDX)%CDIR = 'YY'
TFIELDLIST(IDX)%CCOMMENT = 'Position y in the conformal or cartesian plane'
-TFIELDLIST(IDX)%NGRID = 4
+TFIELDLIST(IDX)%NGRID = 3
TFIELDLIST(IDX)%NTYPE = TYPEREAL
TFIELDLIST(IDX)%NDIMS = 1
ALLOCATE(TFIELDLIST(IDX)%TFIELD_X1D(IMODEL))
@@ -646,7 +646,7 @@ IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST()
TFIELDLIST(IDX)%CMNHNAME = 'LAT'
TFIELDLIST(IDX)%CSTDNAME = 'latitude'
TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LAT'
-TFIELDLIST(IDX)%CUNITS = 'degree_north'
+TFIELDLIST(IDX)%CUNITS = 'degrees_north'
TFIELDLIST(IDX)%CDIR = 'XY'
TFIELDLIST(IDX)%CCOMMENT = 'X_Y_latitude'
TFIELDLIST(IDX)%NGRID = 1
@@ -659,7 +659,7 @@ IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST()
TFIELDLIST(IDX)%CMNHNAME = 'LON'
TFIELDLIST(IDX)%CSTDNAME = 'longitude'
TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LON'
-TFIELDLIST(IDX)%CUNITS = 'degree_east'
+TFIELDLIST(IDX)%CUNITS = 'degrees_east'
TFIELDLIST(IDX)%CDIR = 'XY'
TFIELDLIST(IDX)%CCOMMENT = 'X_Y_longitude'
TFIELDLIST(IDX)%NGRID = 1
diff --git a/src/MNH/read_surf_mnh.f90 b/src/MNH/read_surf_mnh.f90
index 638fdabd2..d9177e42c 100644
--- a/src/MNH/read_surf_mnh.f90
+++ b/src/MNH/read_surf_mnh.f90
@@ -311,7 +311,7 @@ ELSE IF (HREC=='XX') THEN
TZFIELD%CLONGNAME = 'SURFEX: XHAT'
TZFIELD%CUNITS = ''
TZFIELD%CCOMMENT = '' !Expected comment is not known
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 2
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
IF (HDIR/='A') THEN
@@ -336,7 +336,7 @@ ELSE IF (HREC=='DX') THEN
TZFIELD%CLONGNAME = 'SURFEX: XHAT'
TZFIELD%CUNITS = ''
TZFIELD%CCOMMENT = '' !Expected comment is not known
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 2
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
IF (HDIR/='A') THEN
@@ -361,7 +361,7 @@ ELSE IF (HREC=='YY') THEN
TZFIELD%CLONGNAME = 'SURFEX: YHAT'
TZFIELD%CUNITS = ''
TZFIELD%CCOMMENT = '' !Expected comment is not known
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 3
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
IF (HDIR/='A') THEN
@@ -386,7 +386,7 @@ ELSE IF (HREC=='DY') THEN
TZFIELD%CLONGNAME = 'SURFEX: YHAT'
TZFIELD%CUNITS = ''
TZFIELD%CCOMMENT = '' !Expected comment is not known
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 3
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
IF (HDIR/='A') THEN
diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90
index 496a80c4b..e581c4073 100644
--- a/src/MNH/write_surf_mnh.f90
+++ b/src/MNH/write_surf_mnh.f90
@@ -302,7 +302,7 @@ IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') &
TZFIELD%CUNITS = ''
TZFIELD%CDIR = '--'
TZFIELD%CCOMMENT = TRIM(HCOMMENT)
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 2
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(:),KRESP)
@@ -314,7 +314,7 @@ IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') &
TZFIELD%CUNITS = ''
TZFIELD%CDIR = 'XX'
TZFIELD%CCOMMENT = TRIM(HCOMMENT)
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 2
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(1+NHALO:IIU-NHALO),KRESP)
@@ -342,7 +342,7 @@ ELSE IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') &
TZFIELD%CUNITS = ''
TZFIELD%CDIR = '--'
TZFIELD%CCOMMENT = TRIM(HCOMMENT)
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 3
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(:),KRESP)
@@ -354,7 +354,7 @@ ELSE IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') &
TZFIELD%CUNITS = ''
TZFIELD%CDIR = 'YY'
TZFIELD%CCOMMENT = TRIM(HCOMMENT)
- TZFIELD%NGRID = 4
+ TZFIELD%NGRID = 3
TZFIELD%NTYPE = TYPEREAL
TZFIELD%NDIMS = 1
CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(1+NHALO:IJU-NHALO),KRESP)
--
GitLab