Changeset 8243 for branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

Timestamp:

2017-06-29T11:41:55+02:00 (7 years ago)

Author:

andmirek

Message:

#1914 working XIOS read, XIOS write and single processor read

File:

• branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (7 diffs)

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -27 +27 @@
    USE eosbn2
    USE wrk_nemo        ! Memory allocation
-   USE iom_def, ONLY : lxios_read
+   USE iom_def, ONLY : lxios_read, lwxios
 
    IMPLICIT NONE
@@ -56 +56 @@
 
    LOGICAL           , PUBLIC ::   l_rnfcpl = .false.       ! runoffs recieved from oasis
+   LOGICAL                    ::   ln_rnf_sio      !: single processor read
 
    INTEGER , PUBLIC  ::   nkrnf = 0         !: nb of levels over which Kz is increased at river mouths
@@ -172 +173 @@
             &                    'at it= ', kt,' date= ', ndastp
          IF(lwp) WRITE(numout,*) '~~~~'
-         CALL iom_rstput( kt, nitrst, numrow, 'rnf_b' , rnf )
-         CALL iom_rstput( kt, nitrst, numrow, 'rnf_hc_b', rnf_tsc(:,:,jp_tem) )
-         CALL iom_rstput( kt, nitrst, numrow, 'rnf_sc_b', rnf_tsc(:,:,jp_sal) )
+         IF( lwxios ) CALL iom_swap(      wxios_context          )
+         CALL iom_rstput( kt, nitrst, numrow, 'rnf_b' , rnf, lxios = lwxios )
+         CALL iom_rstput( kt, nitrst, numrow, 'rnf_hc_b', rnf_tsc(:,:,jp_tem), lxios = lwxios )
+         CALL iom_rstput( kt, nitrst, numrow, 'rnf_sc_b', rnf_tsc(:,:,jp_sal), lxios = lwxios )
+         IF( lwxios ) CALL iom_swap(      cxios_context          )
       ENDIF
       !
@@ -258 +261 @@
          &                 sn_rnf, sn_cnf    , sn_s_rnf    , sn_t_rnf  , sn_dep_rnf,   &
          &                 ln_rnf_mouth      , rn_hrnf     , rn_avt_rnf, rn_rfact,     &
-         &                 ln_rnf_depth_ini  , rn_dep_max  , rn_rnf_max, nn_rnf_depth_file
+         &                 ln_rnf_depth_ini  , rn_dep_max  , rn_rnf_max, nn_rnf_depth_file, &
+         &                 ln_rnf_sio
       !!----------------------------------------------------------------------
       !
@@ -278 +282 @@
       !                                   ! ============
       !
+      ln_rnf_sio = .FALSE.
       REWIND( numnam_ref )              ! Namelist namsbc_rnf in reference namelist : Runoffs 
       READ  ( numnam_ref, namsbc_rnf, IOSTAT = ios, ERR = 901)
@@ -302 +307 @@
       !                                   ! ==================
       !
+      lspr = ln_rnf_sio
       IF( .NOT. l_rnfcpl ) THEN                    
          ALLOCATE( sf_rnf(1), STAT=ierror )         ! Create sf_rnf structure (runoff inflow)
@@ -482 +488 @@
       ENDIF
       !
+   lspr = .false.
    END SUBROUTINE sbc_rnf_init