Changeset 8308 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO

Timestamp:

2017-07-10T14:39:17+02:00 (7 years ago)

Author:

timgraham

Message:

Changes required to make scalar diagnostics work correctly in XIOS2. Note that a new grid definition is needed in the iodef.xml file as a result of this change

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -1034 +1034 @@
    !!----------------------------------------------------------------------
    SUBROUTINE iom_g0d_intatt( kiomid, cdatt, pvar )
-      INTEGER         , INTENT(in   )                 ::   kiomid    ! Identifier of the file
+      INTEGER         , INTENT(in   )                 ::   kiomid    !Identifier of the file
       CHARACTER(len=*), INTENT(in   )                 ::   cdatt     ! Name of the attribute
       INTEGER         , INTENT(  out)                 ::   pvar      ! read field
@@ -1150 +1150 @@
       CHARACTER(LEN=*), INTENT(in) ::   cdname
       REAL(wp)        , INTENT(in) ::   pfield0d
+#if ! defined key_xios2
       REAL(wp)        , DIMENSION(jpi,jpj) ::   zz     ! masson
+#endif
 #if defined key_iomput
+#if ! defined key_xios2
       zz(:,:)=pfield0d
       CALL xios_send_field(cdname, zz)
-      !CALL xios_send_field(cdname, (/pfield0d/)) 
+#else
+      CALL xios_send_field(cdname, (/pfield0d/)) 
+#endif
 #else
       IF( .FALSE. )   WRITE(numout,*) cdname, pfield0d   ! useless test to avoid compilation warnings