Changeset 12969 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/TRA

Timestamp:

2020-05-26T12:05:09+02:00 (4 years ago)

Author:

andmirek

Message:

ticket #2462: read restart with XIOS independently for each component

Location:

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/TRA

Files:

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

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/TRA/traqsr.F90

@@ -135 +135 @@
       !                         !-----------------------------------!
       IF( kt == nit000 ) THEN          !==  1st time step  ==!
-         IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
+         IF( lroxios ) CALL iom_swap( TRIM(crxios_context) )
          IF( ln_rstart .AND. iom_varid( numror, 'qsr_hc_b', ldstop = .FALSE. ) > 0  .AND. .NOT.l_1st_euler ) THEN    ! read in restart
             IF(lwp) WRITE(numout,*) '          nit000-1 qsr tracer content forcing field read in the restart file'
             z1_2 = 0.5_wp
-            CALL iom_get( numror, jpdom_autoglo, 'qsr_hc_b', qsr_hc_b, ldxios = lrxios )   ! before heat content trend due to Qsr flux
+            CALL iom_get( numror, jpdom_autoglo, 'qsr_hc_b', qsr_hc_b, ldxios = lroxios )   ! before heat content trend due to Qsr flux
          ELSE                                           ! No restart or restart not found: Euler forward time stepping
             z1_2 = 1._wp
             qsr_hc_b(:,:,:) = 0._wp
          ENDIF
-         IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+         IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
       ELSE                             !==  Swap of qsr heat content  ==!
          z1_2 = 0.5_wp
@@ -403 +403 @@
       !
       ! 1st ocean level attenuation coefficient (used in sbcssm)
-      IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
+      IF( lroxios ) CALL iom_swap( TRIM(crxios_context) )
       IF( iom_varid( numror, 'fraqsr_1lev', ldstop = .FALSE. ) > 0 ) THEN
-         CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev'  , fraqsr_1lev, ldxios = lrxios  )
+         CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev'  , fraqsr_1lev, ldxios = lroxios  )
       ELSE
          fraqsr_1lev(:,:) = 1._wp   ! default : no penetration
       ENDIF
-      IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+      IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
       !
    END SUBROUTINE tra_qsr_init

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/TRA/trasbc.F90

@@ -106 +106 @@
       !                             !==  Set before sbc tracer content fields  ==!
       IF( kt == nit000 ) THEN             !* 1st time-step
-         IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
+         IF( lroxios ) CALL iom_swap( TRIM(crxios_context) )
          IF( ln_rstart .AND.    &               ! Restart: read in restart file
               & iom_varid( numror, 'sbc_hc_b', ldstop = .FALSE. ) > 0 ) THEN
@@ -112 +112 @@
             zfact = 0.5_wp
             sbc_tsc(:,:,:) = 0._wp
-            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
+            CALL iom_get( numror, jpdom_autoglo, 'sbc_hc_b', sbc_tsc_b(:,:,jp_tem), ldxios = lroxios )   ! before heat content sbc trend
+            CALL iom_get( numror, jpdom_autoglo, 'sbc_sc_b', sbc_tsc_b(:,:,jp_sal), ldxios = lroxios )   ! before salt content sbc trend
          ELSE                                   ! No restart or restart not found: Euler forward time stepping
             zfact = 1._wp
@@ -119 +119 @@
             sbc_tsc_b(:,:,:) = 0._wp
          ENDIF
-         IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+         IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
       ELSE                                !* other time-steps: swap of forcing fields
          zfact = 0.5_wp