Changeset 11405 for NEMO/branches/2019/dev_r11351_fldread_with_XIOS/src/OCE/IOM/iom.F90

Timestamp:

2019-08-06T15:16:49+02:00 (5 years ago)

Author:

andmirek

Message:

ticket #2195: read weights for blk using XIOS

File:

• NEMO/branches/2019/dev_r11351_fldread_with_XIOS/src/OCE/IOM/iom.F90 (modified) (5 diffs)

NEMO/branches/2019/dev_r11351_fldread_with_XIOS/src/OCE/IOM/iom.F90

@@ -1072 +1072 @@
       llxios = .FALSE.
       if(PRESENT(ldxios)) llxios = ldxios
-      idvar = iom_varid( kiomid, cdvar ) 
       idom = kdom
       !
       IF(.NOT.llxios) THEN
+         idvar = iom_varid( kiomid, cdvar )
          clname = iom_file(kiomid)%name   !   esier to read
          clinfo = '          iom_get_123d, file: '//trim(clname)//', var: '//trim(cdvar)
@@ -1290 +1290 @@
          ENDIF
          !
+         !--- Apply scale_factor and offset
+         zscf = iom_file(kiomid)%scf(idvar)      ! scale factor
+         zofs = iom_file(kiomid)%ofs(idvar)      ! offset
+         IF(     PRESENT(pv_r1d) ) THEN
+            IF( zscf /= 1. )   pv_r1d(:) = pv_r1d(:) * zscf
+            IF( zofs /= 0. )   pv_r1d(:) = pv_r1d(:) + zofs
+         ELSEIF( PRESENT(pv_r2d) ) THEN
+            IF( zscf /= 1.)   pv_r2d(:,:) = pv_r2d(:,:) * zscf
+            IF( zofs /= 0.)   pv_r2d(:,:) = pv_r2d(:,:) + zofs
+         ELSEIF( PRESENT(pv_r3d) ) THEN
+            IF( zscf /= 1.)   pv_r3d(:,:,:) = pv_r3d(:,:,:) * zscf
+            IF( zofs /= 0.)   pv_r3d(:,:,:) = pv_r3d(:,:,:) + zofs
+         ENDIF
       ELSE        ! read using XIOS. Only if KEY_IOMPUT is defined
 #if defined key_iomput
-!would be good to be able to check which context is active and swap only if current is not restart
-         CALL iom_swap( TRIM(crxios_context) ) 
          IF( PRESENT(pv_r3d) ) THEN
             pv_r3d(:, :, :) = 0.
-            if(lwp) write(numout,*) 'XIOS RST READ (3D): ',trim(cdvar)
+            if(lwp) write(numout,*) 'XIOS READ (3D): ',trim(cdvar)
             CALL xios_recv_field( trim(cdvar), pv_r3d)
             IF(idom /= jpdom_unknown ) then
@@ -1303 +1314 @@
          ELSEIF( PRESENT(pv_r2d) ) THEN
             pv_r2d(:, :) = 0.
-            if(lwp) write(numout,*) 'XIOS RST READ (2D): ', trim(cdvar)
+            if(lwp) write(numout,*) 'XIOS READ (2D): ', trim(cdvar)
             CALL xios_recv_field( trim(cdvar), pv_r2d)
             IF(idom /= jpdom_unknown ) THEN
@@ -1310 +1321 @@
          ELSEIF( PRESENT(pv_r1d) ) THEN
             pv_r1d(:) = 0.
-            if(lwp) write(numout,*) 'XIOS RST READ (1D): ', trim(cdvar)
+            if(lwp) write(numout,*) 'XIOS READ (1D): ', trim(cdvar)
             CALL xios_recv_field( trim(cdvar), pv_r1d)
          ENDIF
-         CALL iom_swap( TRIM(cxios_context) )
 #else
          istop = istop + 1 
@@ -1323 +1333 @@
       IF( lk_c1d .AND. PRESENT(pv_r2d) )   CALL lbc_lnk( 'iom', pv_r2d,'Z',1. )
       IF( lk_c1d .AND. PRESENT(pv_r3d) )   CALL lbc_lnk( 'iom', pv_r3d,'Z',1. )
-
-      !--- Apply scale_factor and offset
-      zscf = iom_file(kiomid)%scf(idvar)      ! scale factor
-      zofs = iom_file(kiomid)%ofs(idvar)      ! offset
-      IF(     PRESENT(pv_r1d) ) THEN
-         IF( zscf /= 1. )   pv_r1d(:) = pv_r1d(:) * zscf 
-         IF( zofs /= 0. )   pv_r1d(:) = pv_r1d(:) + zofs
-      ELSEIF( PRESENT(pv_r2d) ) THEN
-         IF( zscf /= 1.)   pv_r2d(:,:) = pv_r2d(:,:) * zscf
-         IF( zofs /= 0.)   pv_r2d(:,:) = pv_r2d(:,:) + zofs
-      ELSEIF( PRESENT(pv_r3d) ) THEN
-         IF( zscf /= 1.)   pv_r3d(:,:,:) = pv_r3d(:,:,:) * zscf
-         IF( zofs /= 0.)   pv_r3d(:,:,:) = pv_r3d(:,:,:) + zofs
-      ENDIF
       !
    END SUBROUTINE iom_get_123d