From dc611e4593026cc11646afa40b8f032504a82724 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 8 Mar 2018 10:30:28 +0100
Subject: [PATCH] Philippe 08/03/2018: IO: add LATOR/LONOR in TFIELDLIST

---
 src/LIB/SURCOUCHE/src/mode_field.f90 | 24 ++++++++++++++++++++++++
 src/MNH/write_lfifm1_for_diag.f90    | 18 ++----------------
 src/MNH/write_lfifmn_fordiachron.f90 | 18 ++----------------
 src/MNH/write_lfin.f90               | 18 ++----------------
 4 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index eeeecd985..d9f3b0a63 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -439,6 +439,30 @@ TFIELDLIST(IDX)%NDIMS      = 0
 IDX = IDX+1
 !
 IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST()
+TFIELDLIST(IDX)%CMNHNAME   = 'LONOR'
+TFIELDLIST(IDX)%CSTDNAME   = ''
+TFIELDLIST(IDX)%CLONGNAME  = 'LONOR'
+TFIELDLIST(IDX)%CUNITS     = 'degree'
+TFIELDLIST(IDX)%CDIR       = '--'
+TFIELDLIST(IDX)%CCOMMENT   = 'Longitude of 1st mass point'
+TFIELDLIST(IDX)%NGRID      = 0
+TFIELDLIST(IDX)%NTYPE      = TYPEREAL
+TFIELDLIST(IDX)%NDIMS      = 0
+IDX = IDX+1
+!
+IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST()
+TFIELDLIST(IDX)%CMNHNAME   = 'LATOR'
+TFIELDLIST(IDX)%CSTDNAME   = ''
+TFIELDLIST(IDX)%CLONGNAME  = 'LATOR'
+TFIELDLIST(IDX)%CUNITS     = 'degree'
+TFIELDLIST(IDX)%CDIR       = '--'
+TFIELDLIST(IDX)%CCOMMENT   = 'Latitude of 1st mass point'
+TFIELDLIST(IDX)%NGRID      = 0
+TFIELDLIST(IDX)%NTYPE      = TYPEREAL
+TFIELDLIST(IDX)%NDIMS      = 0
+IDX = IDX+1
+!
+IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST()
 TFIELDLIST(IDX)%CMNHNAME   = 'THINSHELL'
 TFIELDLIST(IDX)%CSTDNAME   = ''
 TFIELDLIST(IDX)%CLONGNAME  = 'THINSHELL'
diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90
index db5bf7f61..99fcf9887 100644
--- a/src/MNH/write_lfifm1_for_diag.f90
+++ b/src/MNH/write_lfifm1_for_diag.f90
@@ -410,22 +410,8 @@ IF (.NOT.LCARTESIAN) THEN
   CALL SM_LATLON(XLATORI,XLONORI,ZXHATM,ZYHATM,ZLATOR,ZLONOR)
   DEALLOCATE(ZXHAT_ll,ZYHAT_ll)
 !
-  !LONOR and LATOR not in TFIELDLIST because local variables
-  TZFIELD%CMNHNAME   = 'LONOR'
-  TZFIELD%CSTDNAME   = ''
-  TZFIELD%CLONGNAME  = 'LONOR'
-  TZFIELD%CUNITS     = 'degree'
-  TZFIELD%CDIR       = '--'
-  TZFIELD%CCOMMENT   = 'Longitude of 1st mass point'
-  TZFIELD%NGRID      = 0
-  TZFIELD%NTYPE      = TYPEREAL
-  TZFIELD%NDIMS      = 0
-  CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLONOR)
-!
-  TZFIELD%CMNHNAME   = 'LATOR'
-  TZFIELD%CLONGNAME  = 'LATOR'
-  TZFIELD%CCOMMENT   = 'Latitude of 1st mass point'
-  CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLATOR)
+  CALL IO_WRITE_FIELD(TPFILE,'LONOR',ZLONOR)
+  CALL IO_WRITE_FIELD(TPFILE,'LATOR',ZLATOR)
 !
 END IF 
 !
diff --git a/src/MNH/write_lfifmn_fordiachron.f90 b/src/MNH/write_lfifmn_fordiachron.f90
index ec9b57add..d3a75dab2 100644
--- a/src/MNH/write_lfifmn_fordiachron.f90
+++ b/src/MNH/write_lfifmn_fordiachron.f90
@@ -167,22 +167,8 @@ IF (.NOT.LCARTESIAN) THEN
   CALL SM_LATLON(XLATORI,XLONORI,ZXHATM,ZYHATM,ZLATOR,ZLONOR)
   DEALLOCATE(ZXHAT_ll,ZYHAT_ll)
 !
-  !LONOR and LATOR not in TFIELDLIST because local variables
-  TZFIELD%CMNHNAME   = 'LONOR'
-  TZFIELD%CSTDNAME   = ''
-  TZFIELD%CLONGNAME  = 'LONOR'
-  TZFIELD%CUNITS     = 'degree'
-  TZFIELD%CDIR       = '--'
-  TZFIELD%CCOMMENT   = 'Longitude of 1st mass point'
-  TZFIELD%NGRID      = 0
-  TZFIELD%NTYPE      = TYPEREAL
-  TZFIELD%NDIMS      = 0
-  CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLONOR)
-!
-  TZFIELD%CMNHNAME   = 'LATOR'
-  TZFIELD%CLONGNAME  = 'LATOR'
-  TZFIELD%CCOMMENT   = 'Latitude of 1st mass point'
-  CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLATOR)
+  CALL IO_WRITE_FIELD(TPFILE,'LONOR',ZLONOR)
+  CALL IO_WRITE_FIELD(TPFILE,'LATOR',ZLATOR)
 !
 ! #ifdef MNH_NCWRIT
 !   IF (LNETCDF) THEN
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index 715c0486b..e1c27889a 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -371,22 +371,8 @@ IF (.NOT.LCARTESIAN) THEN
   CALL SM_LATLON(XLATORI,XLONORI,ZXHATM,ZYHATM,ZLATOR,ZLONOR)
   DEALLOCATE(ZXHAT_ll,ZYHAT_ll)
 !
-  !LONOR and LATOR not in TFIELDLIST because local variables
-  TZFIELD%CMNHNAME   = 'LONOR'
-  TZFIELD%CSTDNAME   = ''
-  TZFIELD%CLONGNAME  = 'LONOR'
-  TZFIELD%CUNITS     = 'degree'
-  TZFIELD%CDIR       = '--'
-  TZFIELD%CCOMMENT   = 'Longitude of 1st mass point'
-  TZFIELD%NGRID      = 0
-  TZFIELD%NTYPE      = TYPEREAL
-  TZFIELD%NDIMS      = 0
-  CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLONOR)
-!
-  TZFIELD%CMNHNAME   = 'LATOR'
-  TZFIELD%CLONGNAME  = 'LATOR'
-  TZFIELD%CCOMMENT   = 'Latitude of 1st mass point'
-  CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLATOR)
+  CALL IO_WRITE_FIELD(TPFILE,'LONOR',ZLONOR)
+  CALL IO_WRITE_FIELD(TPFILE,'LATOR',ZLATOR)
 END IF 
 !
 CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',LTHINSHELL)
-- 
GitLab