diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index 90704a8933e1c3f03a7262bdf8bd63db510f0de6..d1276e6811b8c1c49c39bc5d13956a7d8ceb6a0e 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 638fdabd2205166e4ef492dc31e3c9b145792b9e..d9177e42c34139577eb0d552beab4ec6cdb3698d 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 496a80c4b4e22363def034f63058fd9a9c182e01..e581c407378cf63edb7e37721722e02989065bc2 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)