Changeset 10018

Timestamp:

2018-07-31T11:58:30+02:00 (6 years ago)

Author:

frrh

Message:

Corrections for consistency with OASIS3-MCT version 4.0
and backwards compatibility with earlier coupler releases.

File:

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

branches/UKMO/dev_r5518_GO6_oasis3mct_vn4/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 arrays passed to PSMILe
+      INTEGER :: var_nodims(2)  ! Number of coupling field dimensions.
+                                ! var_nodims(1) is redundant with OASIS3-MCT vn4.0 but retained
+                                ! for backwards compatibility. var_nodims(2) is the number of
+                                ! fields in a bundle or 1 for unbundled fields. 
       INTEGER :: ji,jc,jm       ! local loop indicees
       CHARACTER(LEN=64) :: zclname
@@ -182 +186 @@
       !     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
+
+
       !
       ! ... Allocate memory for data exchange
@@ -243 +251 @@
 #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 ! Make this variable 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 +302 @@
 #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 /),   &
+
+                  ! ... Set the field dimension and bundle count
+                  var_nodims(1) = 2
+                  var_nodims(2) = 1 ! Make this variable 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