Changeset 11837 for NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/TRA

Timestamp:

2019-10-30T15:10:36+01:00 (4 years ago)

Author:

andmirek

Message:

ticket #2323 read SI3 restart with XIOS

Location:

NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/TRA

Files:

• traqsr.F90 (modified) (3 diffs)
• trasbc.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/TRA/traqsr.F90

@@ -137 +137 @@
             IF(lwp) WRITE(numout,*) '          nit000-1 qsr tracer content forcing field read in the restart file'
             z1_2 = 0.5_wp
+            IF(lrxios) CALL iom_swap(crxios_context)
             CALL iom_get( numror, jpdom_autoglo, 'qsr_hc_b', qsr_hc_b, ldxios = lrxios )   ! before heat content trend due to Qsr flux
+            IF(lrxios) CALL iom_swap(cxios_context)
          ELSE                                           ! No restart or restart not found: Euler forward time stepping
             z1_2 = 1._wp
@@ -423 +425 @@
       ! 1st ocean level attenuation coefficient (used in sbcssm)
       IF( iom_varid( numror, 'fraqsr_1lev', ldstop = .FALSE. ) > 0 ) THEN
+         IF(lrxios) CALL iom_swap(crxios_context)
          CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev'  , fraqsr_1lev, ldxios = lrxios  )
+         IF(lrxios) CALL iom_swap(cxios_context)
       ELSE
          fraqsr_1lev(:,:) = 1._wp   ! default : no penetration
@@ -429 +433 @@
       !
       IF( lwxios ) THEN
-         CALL iom_set_rstw_var_active('qsr_hc_b')
-         CALL iom_set_rstw_var_active('fraqsr_1lev')
+         CALL iom_set_rstw_var_active(rst_wfields, 'qsr_hc_b')
+         CALL iom_set_rstw_var_active(rst_wfields, 'fraqsr_1lev')
       ENDIF
       !

NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/TRA/trasbc.F90

@@ -107 +107 @@
          IF( ln_rstart .AND.    &               ! Restart: read in restart file
               & iom_varid( numror, 'sbc_hc_b', ldstop = .FALSE. ) > 0 ) THEN
+            IF(lrxios) CALL iom_swap(crxios_context)
             IF(lwp) WRITE(numout,*) '          nit000-1 sbc tracer content field read in the restart file'
             zfact = 0.5_wp
@@ -112 +113 @@
             CALL iom_get( numror, jpdom_autoglo, 'sbc_hc_b', sbc_tsc_b(:,:,jp_tem), ldxios = lrxios )   ! before heat content sbc trend
             CALL iom_get( numror, jpdom_autoglo, 'sbc_sc_b', sbc_tsc_b(:,:,jp_sal), ldxios = lrxios )   ! before salt content sbc trend
+            IF(lrxios) CALL iom_swap(cxios_context)
          ELSE                                   ! No restart or restart not found: Euler forward time stepping
             zfact = 1._wp