Changeset 15656 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_exz_port/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2022-01-19T14:05:03+01:00 (2 years ago)

Author:

dford

Message:

Changes for XIOS 2.5 and netcdf read issue.

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_collate_exz_port/NEMOGCM/NEMO/OPA_SRC

Files:

• IOM/iom.F90 (modified) (1 diff)
• SBC/fldread.F90 (modified) (5 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_exz_port/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/AMM15_v3_6_STABLE_package_collate_exz_port/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -688 +688 @@
       INTEGER                                 ::   ierr
       REAL(wp), POINTER, DIMENSION(:,:,:)     ::   dta_read  ! work space for global data
+      REAL(wp), POINTER, DIMENSION(:,:,:)     ::   my_dta_read  ! work space for global data
       !!---------------------------------------------------------------------
             
@@ -696 +697 @@
       idvar   = iom_varid( num, clvar )
       ilendta = iom_file(num)%dimsz(1,idvar)
+!CEOD
+      ALLOCATE( my_dta_read(ilendta, 1, ipk) )
 
 #if defined key_bdy
@@ -710 +713 @@
 
       SELECT CASE( ipk )
+      !CEODCASE(1)        ;   CALL iom_get ( num, jpdom_unknown, clvar, my_dta_read(1:ilendta,1:ipj,1    ), nrec )
       CASE(1)        ;   CALL iom_get ( num, jpdom_unknown, clvar, dta_read(1:ilendta,1:ipj,1    ), nrec )
-      CASE DEFAULT   ;   CALL iom_get ( num, jpdom_unknown, clvar, dta_read(1:ilendta,1:ipj,1:ipk), nrec )
+      CASE DEFAULT   ;   CALL iom_get ( num, jpdom_unknown, clvar, my_dta_read(1:ilendta,1:ipj,1:ipk), nrec )
       END SELECT
       !
@@ -717 +721 @@
          DO ib = 1, ipi
             DO ik = 1, ipk
+               if( ipk .eq. 1) then
                dta(ib,1,ik) =  dta_read(map%ptr(ib),1,ik)
+               else
+               dta(ib,1,ik) =  my_dta_read(map%ptr(ib),1,ik)
+               endif
             END DO
          END DO
@@ -729 +737 @@
          END DO
       ENDIF
+   DEALLOCATE(my_dta_read)
 
    END SUBROUTINE fld_map