Changeset 13099

Timestamp:

2020-06-12T12:56:41+02:00 (4 years ago)

Author:

jcastill

Message:

Changes to allow the use of a later OASIS and xios 2.0 version

Location:

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC

Files:

• IOM/iom.F90 (modified) (1 diff)
• SBC/cpl_oasis3.F90 (modified) (2 diffs)

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -1326 +1326 @@
       IF ( xios_is_valid_gridgroup(cdid) )   CALL xios_set_gridgroup_attr( cdid, mask=mask )
 #else
-      IF ( xios_is_valid_grid     (cdid) )   CALL xios_set_grid_attr     ( cdid, mask3=mask )
-      IF ( xios_is_valid_gridgroup(cdid) )   CALL xios_set_gridgroup_attr( cdid, mask3=mask )
+      IF ( xios_is_valid_grid     (cdid) )   CALL xios_set_grid_attr     ( cdid, mask_3D=mask )
+      IF ( xios_is_valid_gridgroup(cdid) )   CALL xios_set_gridgroup_attr( cdid, mask_3D=mask )
 #endif
       CALL xios_solve_inheritance()

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -231 +231 @@
                   IF( ln_ctl ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_Out
                   CALL oasis_def_var (ssnd(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 0 /),   &
-                     &                OASIS_Out          , ishape , OASIS_REAL, nerror )
+                     &                OASIS_Out          , RESHAPE(ishape, (/4/)) , OASIS_REAL, nerror )
                   IF ( nerror /= OASIS_Ok ) THEN
                      WRITE(numout,*) 'Failed to define transient ', ji, jc, jm, " "//TRIM(zclname)
@@ -276 +276 @@
                   IF( ln_ctl ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_In
                   CALL oasis_def_var (srcv(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 0 /),   &
-                     &                OASIS_In           , ishape , OASIS_REAL, nerror )
+                     &                OASIS_In           , RESHAPE(ishape, (/4/)) , OASIS_REAL, nerror )
                   IF ( nerror /= OASIS_Ok ) THEN
                      WRITE(numout,*) 'Failed to define transient ', ji, jc, jm, " "//TRIM(zclname)