Changeset 12950 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ISF

Timestamp:

2020-05-19T12:53:16+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462: new XIOS restart read/write interfaces

Location:

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ISF

Files:

• isfcav.F90 (modified) (1 diff)
• isfcpl.F90 (modified) (5 diffs)
• isfrst.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ISF/isfcav.F90

@@ -187 +187 @@
       !================
       !
-      IF( lwxios ) THEN
-         CALL iom_set_rstw_var_active('fwfisf_cav_b')
-         CALL iom_set_rstw_var_active('isf_hc_cav_b')
-         CALL iom_set_rstw_var_active('isf_sc_cav_b')
-      ENDIF
-      !
       !================
       ! 3: read restart

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ISF/isfcpl.F90

@@ -114 +114 @@
       e3t(:,:,:,Kbb)   = e3t(:,:,:,Kmm)
  
-      ! prepare writing restart
-      IF( lwxios ) THEN
-         CALL iom_set_rstw_var_active('ssmask')
-         CALL iom_set_rstw_var_active('tmask')
-         CALL iom_set_rstw_var_active('e3t_n')
-         CALL iom_set_rstw_var_active('e3u_n')
-         CALL iom_set_rstw_var_active('e3v_n')
-      END IF
-      !
    END SUBROUTINE isfcpl_init
    ! 
@@ -166 +157 @@
       !!----------------------------------------------------------------------
       !
+      IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
       CALL iom_get( numror, jpdom_autoglo, 'ssmask'  , zssmask_b, ldxios = lrxios   ) ! need to extrapolate T/S
+      IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
 
       ! compute new ssh if we open a full water column 
@@ -245 +238 @@
       !!----------------------------------------------------------------------
       ! 
+      IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
       CALL iom_get( numror, jpdom_autoglo, 'tmask'  , ztmask_b, ldxios = lrxios   ) ! need to extrapolate T/S
       !CALL iom_get( numror, jpdom_autoglo, 'wmask'  , zwmask_b, ldxios = lrxios   ) ! need to extrapolate T/S
       !CALL iom_get( numror, jpdom_autoglo, 'gdepw_n', zdepw_b(:,:,:), ldxios = lrxios ) ! need to interpol vertical profile (vvl)
+      IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
       !
       ! 
@@ -391 +386 @@
       !!----------------------------------------------------------------------
       !
+      IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
       CALL iom_get( numror, jpdom_autoglo, 'tmask'  , ztmask_b, ldxios = lrxios )
       CALL iom_get( numror, jpdom_autoglo, 'e3u_n'  , ze3u_b  , ldxios = lrxios )
       CALL iom_get( numror, jpdom_autoglo, 'e3v_n'  , ze3v_b  , ldxios = lrxios )
+      IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
       !
       ! 1.0: compute horizontal volume flux divergence difference before-after coupling
@@ -495 +492 @@
 
       ! get restart variable
+      IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
       CALL iom_get( numror, jpdom_autoglo, 'tmask'  , ztmask_b(:,:,:), ldxios = lrxios   ) ! need to extrapolate T/S
       CALL iom_get( numror, jpdom_autoglo, 'e3t_n'  , ze3t_b(:,:,:)  , ldxios = lrxios )
       CALL iom_get( numror, jpdom_autoglo, 'tn'     , zt_b(:,:,:)    , ldxios = lrxios )
       CALL iom_get( numror, jpdom_autoglo, 'sn'     , zs_b(:,:,:)    , ldxios = lrxios )
+      IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
 
       ! compute run length

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ISF/isfrst.F90

@@ -53 +53 @@
       IF( iom_varid( numror, cfwf_b, ldstop = .FALSE. ) > 0 ) THEN
          IF(lwp) WRITE(numout,*) '          nit000-1 isf tracer content forcing fields read in the restart file'
+         IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
          CALL iom_get( numror, jpdom_autoglo, cfwf_b, pfwf_b(:,:)        , ldxios = lrxios )   ! before ice shelf melt
          CALL iom_get( numror, jpdom_autoglo, chc_b , ptsc_b (:,:,jp_tem), ldxios = lrxios )   ! before ice shelf heat flux
          CALL iom_get( numror, jpdom_autoglo, csc_b , ptsc_b (:,:,jp_sal), ldxios = lrxios )   ! before ice shelf heat flux
+         IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
       ELSE
          pfwf_b(:,:)   = pfwf(:,:)
@@ -61 +63 @@
       ENDIF
       !
-      IF( lwxios ) THEN
-         CALL iom_set_rstw_var_active(TRIM(chc_b ))
-         CALL iom_set_rstw_var_active(TRIM(csc_b ))
-         CALL iom_set_rstw_var_active(TRIM(cfwf_b))
-      ENDIF
-
    END SUBROUTINE isfrst_read
    !