Changeset 11484 for branches

Timestamp:

2019-08-29T14:58:24+02:00 (5 years ago)

Author:

timgraham

Message:

Merge in changes from GMED ticket 408 - Richard's fix for compatibility with OASIS-MCT v4.0

File:

• branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -151 +151 @@
       INTEGER :: id_part
       INTEGER :: paral(5)       ! OASIS3 box partition
-      INTEGER :: ishape(2,2)    ! shape of arrays passed to PSMILe
+      INTEGER :: ishape(4)      ! Shape of 2D arrays passed to PSMILe. 
+                                ! Redundant from OASIS3-MCT vn4.0 onwards but required
+                                ! to satisfy interface and for backward compatibility.
+      INTEGER :: ishape0d1d(2)  ! Shape of 0D or 1D arrays passed to PSMILe.
+      INTEGER :: var_nodims(2)  ! Number of coupling field dimensions.
+                                ! var_nodims(1) is redundant from OASIS3-MCT vn4.0 onwards
+                                ! but retained for backward compatibility. 
+                                ! var_nodims(2) is the number of fields in a bundle 
+                                ! or 1 for unbundled fields (bundles are not yet catered for
+                                ! in NEMO hence we default to 1).  
       INTEGER :: ji,jc,jm       ! local loop indicees
       CHARACTER(LEN=64) :: zclname
@@ -182 +191 @@
       !     nl* is set to the global values 1 and jp*glo.
       !
-      ishape(:,1) = (/ 1, nlei-nldi+1 /)
-      ishape(:,2) = (/ 1, nlej-nldj+1 /)
+      ishape(1) = 1
+      ishape(2) = nlei-nldi+1
+      ishape(3) = 1
+      ishape(4) = nlej-nldj+1
+
+      ishape0d1d(1) = 0
+      ishape0d1d(2) = 0
+
       !
       ! ... Allocate memory for data exchange
@@ -243 +258 @@
 #endif
                   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 /),   &
+
+                  !
+                  ! ... Set the field dimension and bundle count
+                  var_nodims(1) = 2
+                  var_nodims(2) = 1 ! Modify this value to cater for bundled fields.    
+
+                  CALL oasis_def_var (ssnd(ji)%nid(jc,jm), zclname, id_part   , var_nodims,   &
                      &                OASIS_Out          , ishape , OASIS_REAL, nerror )
                   IF ( nerror /= OASIS_Ok ) THEN
@@ -288 +309 @@
 #endif
                   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 )
+
+                  var_nodims(1) = 2
+                  var_nodims(2) = 1 ! Modify this value to cater for bundled fields.     
+
+                  CALL oasis_def_var (srcv(ji)%nid(jc,jm), zclname, id_part   , var_nodims,   &
+                                      OASIS_In           , ishape , OASIS_REAL, nerror )
                   IF ( nerror /= OASIS_Ok ) THEN
                      WRITE(numout,*) 'Failed to define transient ', ji, jc, jm, " "//TRIM(zclname)