Changeset 14063 for NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/IOM/restart.F90

Timestamp:

2020-12-03T17:45:05+01:00 (4 years ago)

Author:

laurent

Message:

Catch up with trunk at r14060

File:

• NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/IOM/restart.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/IOM/restart.F90

@@ -11 +11 @@
    !!            3.7  !  2014-01  (G. Madec) suppression of curl and hdiv from the restart
    !!             -   !  2014-12  (G. Madec) remove KPP scheme
+   !!            4.1  !  2020-11  (S. Techene, G. Madec)  move ssh initiatlisation in DYN/sshwzv:ssh_init_rst
    !!----------------------------------------------------------------------
 
@@ -139 +140 @@
       !! ** Method  :   Write in numrow when kt == nitrst in NetCDF
       !!              file, save fields which are necessary for restart
+      !!
+      !!                NB: ssh is written here (rst_write)
+      !!                    but is read or set in DYN/sshwzv:shh_init_rst
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt         ! ocean time-step
@@ -233 +237 @@
       !!                   ***  ROUTINE rst_read  ***
       !!
-      !! ** Purpose :   Read files for NetCDF restart
-      !!
-      !! ** Method  :   Read in restart.nc file fields which are necessary for restart
+      !! ** Purpose :   Read velocity and T-S fields in the restart file
+      !!
+      !! ** Method  :   Read in restart.nc fields which are necessary for restart
+      !!
+      !!                NB: restart file openned           in DOM/domain.F90:dom_init
+      !!                    before field in restart tested in DOM/domain.F90:dom_init
+      !!                    (sshb)
+      !!
+      !!                NB: ssh is read or set in DYN/sshwzv:shh_init_rst
+      !!                    but is written     in IOM/restart:rst_write
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   Kbb, Kmm   ! ocean time level indices
-      REAL(wp) ::   zrdt
       INTEGER  ::   jk
       REAL(wp), DIMENSION(jpi, jpj, jpk) :: w3d
       !!----------------------------------------------------------------------
-
-      CALL rst_read_open           ! open restart for reading (if not already opened)
-
-      ! Check dynamics and tracer time-step consistency and force Euler restart if changed
-      IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 )   THEN
-         CALL iom_get( numror, 'rdt', zrdt )
-         IF( zrdt /= rn_Dt ) THEN
-            IF(lwp) WRITE( numout,*)
-            IF(lwp) WRITE( numout,*) 'rst_read:  rdt not equal to the read one'
-            IF(lwp) WRITE( numout,*)
-            IF(lwp) WRITE( numout,*) '      ==>>>   forced euler first time-step'
-            l_1st_euler =  .TRUE.
-         ENDIF
-      ENDIF
-
+      !
       IF(.NOT.lrxios ) CALL iom_delay_rst( 'READ', 'OCE', numror )   ! read only ocean delayed global communication variables
-
-      ! Diurnal DSST
-      IF( ln_diurnal ) CALL iom_get( numror, jpdom_auto, 'Dsst' , x_dsst )
+      !
+      !                             !*  Diurnal DSST
+      IF( ln_diurnal )   CALL iom_get( numror, jpdom_auto, 'Dsst' , x_dsst )
       IF ( ln_diurnal_only ) THEN
          IF(lwp) WRITE( numout, * ) &
@@ -269 +265 @@
          RETURN
       ENDIF
-
-      IF( iom_varid( numror, 'ub', ldstop = .FALSE. ) > 0 ) THEN
-         ! before fields
+      !
+      !                             !*  Read Kmm fields
+      IF(lwp) WRITE(numout,*)    '           Kmm u, v and T-S fields read in the restart file'
+      CALL iom_get( numror, jpdom_auto, 'un'     , uu(:,:,:       ,Kmm), cd_type = 'U', psgn = -1._wp )
+      CALL iom_get( numror, jpdom_auto, 'vn'     , vv(:,:,:       ,Kmm), cd_type = 'V', psgn = -1._wp )
+      CALL iom_get( numror, jpdom_auto, 'tn'     , ts(:,:,:,jp_tem,Kmm) )
+      CALL iom_get( numror, jpdom_auto, 'sn'     , ts(:,:,:,jp_sal,Kmm) )
+      !
+      IF( l_1st_euler ) THEN        !*  Euler restart
+         IF(lwp) WRITE(numout,*) '           Kbb u, v and T-S fields set to Kmm values'
+         ts(:,:,:,:,Kbb) = ts(:,:,:,:,Kmm)         ! all before fields set to now values
+         uu(:,:,:  ,Kbb) = uu(:,:,:  ,Kmm)
+         vv(:,:,:  ,Kbb) = vv(:,:,:  ,Kmm)
+      ELSE                          !* Leap frog restart
+         IF(lwp) WRITE(numout,*) '           Kbb u, v and T-S fields read in the restart file'
          CALL iom_get( numror, jpdom_auto, 'ub'     , uu(:,:,:       ,Kbb), cd_type = 'U', psgn = -1._wp )
          CALL iom_get( numror, jpdom_auto, 'vb'     , vv(:,:,:       ,Kbb), cd_type = 'V', psgn = -1._wp )
          CALL iom_get( numror, jpdom_auto, 'tb'     , ts(:,:,:,jp_tem,Kbb) )
          CALL iom_get( numror, jpdom_auto, 'sb'     , ts(:,:,:,jp_sal,Kbb) )
-         CALL iom_get( numror, jpdom_auto, 'sshb'   ,ssh(:,:         ,Kbb) )
-      ELSE
-         l_1st_euler =  .TRUE.      ! before field not found, forced euler 1st time-step
-      ENDIF
-      !
-      ! now fields
-      CALL iom_get( numror, jpdom_auto, 'un'     , uu(:,:,:       ,Kmm), cd_type = 'U', psgn = -1._wp )
-      CALL iom_get( numror, jpdom_auto, 'vn'     , vv(:,:,:       ,Kmm), cd_type = 'V', psgn = -1._wp )
-      CALL iom_get( numror, jpdom_auto, 'tn'     , ts(:,:,:,jp_tem,Kmm) )
-      CALL iom_get( numror, jpdom_auto, 'sn'     , ts(:,:,:,jp_sal,Kmm) )
-      CALL iom_get( numror, jpdom_auto, 'sshn'   ,ssh(:,:         ,Kmm) )
+      ENDIF
+      !
       IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN
          CALL iom_get( numror, jpdom_auto, 'rhop'   , rhop )   ! now    potential density
@@ -293 +292 @@
       ENDIF
       !
-      IF( l_1st_euler ) THEN                                  ! Euler restart
-         ts   (:,:,:,:,Kbb) = ts   (:,:,:,:,Kmm)              ! all before fields set to now values
-         uu   (:,:,:  ,Kbb) = uu   (:,:,:  ,Kmm)
-         vv   (:,:,:  ,Kbb) = vv   (:,:,:  ,Kmm)
-         ssh  (:,:    ,Kbb) = ssh  (:,:    ,Kmm)
-      ENDIF
-      !
    END SUBROUTINE rst_read