Changeset 12950 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfosm.F90

Timestamp:

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

Author:

andmirek

Message:

Ticket #2462: new XIOS restart read/write interfaces

File:

• NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfosm.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfosm.F90

@@ -1424 +1424 @@
      ghamv(:,:,:) = 0.
      !
-     IF( lwxios ) THEN
-        CALL iom_set_rstw_var_active('wn')
-        CALL iom_set_rstw_var_active('hbl')
-        CALL iom_set_rstw_var_active('hbli')
-     ENDIF
    END SUBROUTINE zdf_osm_init
 
@@ -1459 +1454 @@
      !!-----------------------------------------------------------------------------
      IF( TRIM(cdrw) == 'READ'.AND. ln_rstart) THEN
+        IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
         id1 = iom_varid( numror, 'wn'   , ldstop = .FALSE. )
         IF( id1 > 0 ) THEN                       ! 'wn' exists; read
@@ -1473 +1469 @@
            CALL iom_get( numror, jpdom_autoglo, 'hbli', hbli, ldxios = lrxios  )
            WRITE(numout,*) ' ===>>>> :  hbl & hbli read from restart file'
+           IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
            RETURN
         ELSE                      ! 'hbl' & 'hbli' not in restart file, recalculate
            WRITE(numout,*) ' ===>>>> : previous run without osmosis scheme, hbl computed from stratification'
         END IF
+        IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
      END IF