Changeset 8243 for branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

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

Author:

andmirek

Message:

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

Location:

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• daymod.F90 (modified) (2 diffs)
• domain.F90 (modified) (5 diffs)
• domvvl.F90 (modified) (2 diffs)
• dtatsd.F90 (modified) (5 diffs)

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -36 +36 @@
    USE restart         ! restart
    USE iom_def, ONLY : lxios_read
+   USE iom_def, ONLY : lwxios
 
    IMPLICIT NONE
@@ -360 +361 @@
          ENDIF
          ! calendar control
-         CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp) )   ! time-step
-         CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp) )   ! date
-         CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj            )   ! number of elapsed days since
+         IF( lwxios ) CALL iom_swap(      wxios_context          )
+         CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp), lxios = lwxios )   ! time-step
+         CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp), lxios = lwxios )   ! date
+         CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj, lxios = lwxios            )   ! number of elapsed days since
          !                                                                     ! the begining of the run [s]
+         IF( lwxios ) CALL iom_swap(      cxios_context          )
       ENDIF
       !

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -38 +38 @@
    USE timing          ! Timing
    USE lbclnk          ! ocean lateral boundary condition (or mpp link)
-   USE iom_def, ONLY:lxios_read
+   USE iom_def, ONLY:lxios_read, lwxios, wxioso
 
    IMPLICIT NONE
@@ -140 +140 @@
          &             nn_it000, nn_itend  , nn_date0    , nn_leapy     , nn_istate , nn_stock ,   &
          &             nn_write, ln_dimgnnn, ln_mskland  , ln_cfmeta    , ln_clobber, nn_chunksz, nn_euler, &
-         &             ln_xios_read
+         &             ln_xios_read, nn_wxios
       NAMELIST/namdom/ nn_bathy, rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,   &
          &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,                  &
@@ -155 +155 @@
       !!----------------------------------------------------------------------
       ln_xios_read = .false.            ! set in case ln_xios_read is not in namelist
+      nn_wxios = 0
       REWIND( numnam_ref )              ! Namelist namrun in reference namelist : Parameters of the run
       READ  ( numnam_ref, namrun, IOSTAT = ios, ERR = 901)
@@ -196 +197 @@
          WRITE(numout,*) '      NetCDF chunksize (bytes)        nn_chunksz = ', nn_chunksz
          WRITE(numout,*) '      READ restart for a single file using XIOS ln_xios_read =', ln_xios_read
+         WRITE(numout,*) '      Write restart using XIOS        nn_wxios   = ', nn_wxios
       ENDIF
 
@@ -309 +311 @@
       rdtmax    = rn_rdtmin
       rdth      = rn_rdth
+      if (nn_wxios > 0) lwxios = .TRUE. 
+      wxioso = nn_wxios
 
       REWIND( numnam_ref )              ! Namelist namcla in reference namelist : Cross land advection

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -135 +135 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
 
+      ! Set variables needed in iom for reastart write with XIOS
+      lr_vvl_ztilde = ln_vvl_ztilde
+      lr_vvl_layer   = ln_vvl_layer
       ! choose vertical coordinate (z_star, z_tilde or layer)
       ! ==========================
@@ -910 +913 @@
          !                                           ! all cases !
          !                                           ! --------- !
-         CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:) )
-         CALL iom_rstput( kt, nitrst, numrow, 'fse3t_n', fse3t_n(:,:,:) )
+         IF( lwxios ) CALL iom_swap(      wxios_context          ) 
+         CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:), lxios = lwxios )
+         CALL iom_rstput( kt, nitrst, numrow, 'fse3t_n', fse3t_n(:,:,:), lxios = lwxios )
          !                                           ! ----------------------- !
          IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN  ! z_tilde and layer cases !
             !                                        ! ----------------------- !
-            CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:) )
-            CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:) )
+            CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:), lxios = lwxios)
+            CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:), lxios = lwxios)
          END IF
          !                                           ! -------------!    
          IF( ln_vvl_ztilde ) THEN                    ! z_tilde case !
             !                                        ! ------------ !
-            CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:) )
+            CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:), lxios = lwxios)
          ENDIF
-
+         IF( lwxios ) CALL iom_swap(      cxios_context          )
       ENDIF
       IF( nn_timing == 1 )  CALL timing_stop('dom_vvl_rst')

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

@@ -23 +23 @@
    USE wrk_nemo        ! Memory allocation
    USE timing          ! Timing
+   USE iom_def, ONLY:lspr
 
    IMPLICIT NONE
@@ -32 +33 @@
    LOGICAL , PUBLIC ::   ln_tsd_init      !: T & S data flag
    LOGICAL , PUBLIC ::   ln_tsd_tradmp    !: internal damping toward input data flag
+   LOGICAL , PUBLIC ::   ln_tsd_sio       !: read file using 1 processor
 
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tsd   ! structure of input SST (file informations, fields read)
@@ -61 +63 @@
       TYPE(FLD_N)                   ::   sn_tem, sn_sal
       !!
-      NAMELIST/namtsd/   ln_tsd_init, ln_tsd_tradmp, cn_dir, sn_tem, sn_sal
+      NAMELIST/namtsd/   ln_tsd_init, ln_tsd_tradmp, cn_dir, sn_tem, sn_sal, ln_tsd_sio
       INTEGER  ::   ios
       !!----------------------------------------------------------------------
@@ -70 +72 @@
       ierr0 = 0  ;  ierr1 = 0  ;  ierr2 = 0  ;  ierr3 = 0
       !
+      ln_tsd_sio = .FALSE.
       REWIND( numnam_ref )              ! Namelist namtsd in reference namelist : 
       READ  ( numnam_ref, namtsd, IOSTAT = ios, ERR = 901)
@@ -154 +157 @@
       IF( nn_timing == 1 )  CALL timing_start('dta_tsd')
       !
+      lspr = ln_tsd_sio
       CALL fld_read( kt, 1, sf_tsd )      !==   read T & S data at kt time step   ==!
+      lspr = .false.
       !
       !