Changeset 8319 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90

Timestamp:

2017-07-11T17:00:44+02:00 (7 years ago)

Author:

clem

Message:

STEP2 (4): remove obsolete features (change time step for the ice => remove numit, nstart, nlast, nitrun and create kt_ice which follows kt)

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) (6 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90

@@ -130 +130 @@
       IF( iom_use('sbgheat_tot') )  CALL iom_put( 'sbgheat_tot' , zbg_stem     )   ! snow heat content                 (1.e20 J)
       !
-      IF( lrst_ice )   CALL lim_diahsb_rst( numit, 'WRITE' )
+      IF( lrst_ice )   CALL lim_diahsb_rst( 'WRITE', kt_ice )
       !
       IF( nn_timing == 1 )   CALL timing_stop('lim_diahsb')
@@ -169 +169 @@
       ENDIF
 
-      CALL lim_diahsb_rst( nstart, 'READ' )  !* read or initialize all required files
+      CALL lim_diahsb_rst( 'READ' )  !* read or initialize all required files
       !
    END SUBROUTINE lim_diahsb_init
 
-   SUBROUTINE lim_diahsb_rst( kt, cdrw )
+   SUBROUTINE lim_diahsb_rst( cdrw, kt )
      !!---------------------------------------------------------------------
      !!                   ***  ROUTINE limdia_rst  ***
@@ -181 +181 @@
      !! ** Method  :   use of IOM library
      !!----------------------------------------------------------------------
-     INTEGER         , INTENT(in) ::   kt     ! ice time-step
      CHARACTER(len=*), INTENT(in) ::   cdrw   ! "READ"/"WRITE" flag
+     INTEGER         , INTENT(in), OPTIONAL ::   kt     ! ice time-step
+     REAL(wp)                     ::   ziter
+     INTEGER                      ::   iter
      !
      !!----------------------------------------------------------------------
@@ -189 +191 @@
         IF( ln_rstart ) THEN                   !* Read the restart file
            !
-           IF(lwp) WRITE(numout,*) '~~~~~~~'
-           IF(lwp) WRITE(numout,*) ' lim_diahsb_rst read at it= ', kt,' date= ', ndastp
+           CALL iom_get( numrir, 'kt_ice' , ziter )
+           IF(lwp) WRITE(numout,*)
+           IF(lwp) WRITE(numout,*) ' lim_diahsb_rst read at time step = ', ziter
            IF(lwp) WRITE(numout,*) '~~~~~~~'
            CALL iom_get( numrir, 'frc_voltop' , frc_voltop  )
@@ -201 +204 @@
            CALL iom_get( numrir, jpdom_autoglo, 'sal_loc_ini', sal_loc_ini )
         ELSE
-           IF(lwp) WRITE(numout,*) '~~~~~~~'
+           IF(lwp) WRITE(numout,*)
            IF(lwp) WRITE(numout,*) ' lim_diahsb at initial state '
            IF(lwp) WRITE(numout,*) '~~~~~~~'
@@ -219 +222 @@
      ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN   ! Create restart file
         !                                   ! -------------------
-        IF(lwp) WRITE(numout,*) '~~~~~~~'
-        IF(lwp) WRITE(numout,*) ' lim_diahsb_rst write at it= ', kt,' date= ', ndastp
-        IF(lwp) WRITE(numout,*) '~~~~~~~'
-        CALL iom_rstput( kt, nitrst, numriw, 'frc_voltop' , frc_voltop  )
-        CALL iom_rstput( kt, nitrst, numriw, 'frc_volbot' , frc_volbot  )
-        CALL iom_rstput( kt, nitrst, numriw, 'frc_temtop' , frc_temtop  )
-        CALL iom_rstput( kt, nitrst, numriw, 'frc_tembot' , frc_tembot  )
-        CALL iom_rstput( kt, nitrst, numriw, 'frc_sal'    , frc_sal     )
-        CALL iom_rstput( kt, nitrst, numriw, 'vol_loc_ini', vol_loc_ini )
-        CALL iom_rstput( kt, nitrst, numriw, 'tem_loc_ini', tem_loc_ini )
-        CALL iom_rstput( kt, nitrst, numriw, 'sal_loc_ini', sal_loc_ini )
+        iter = kt + nn_fsbc - 1   ! ice restarts are written at kt == nitrst - nn_fsbc + 1
+
+        IF( iter == nitrst ) THEN
+           IF(lwp) WRITE(numout,*)
+           IF(lwp) WRITE(numout,*) ' lim_diahsb_rst write at time step = ', kt
+           IF(lwp) WRITE(numout,*) '~~~~~~~'
+        ENDIF
+
+        ! Write in numriw (if iter == nitrst)
+        ! ------------------ 
+        CALL iom_rstput( iter, nitrst, numriw, 'frc_voltop' , frc_voltop  )
+        CALL iom_rstput( iter, nitrst, numriw, 'frc_volbot' , frc_volbot  )
+        CALL iom_rstput( iter, nitrst, numriw, 'frc_temtop' , frc_temtop  )
+        CALL iom_rstput( iter, nitrst, numriw, 'frc_tembot' , frc_tembot  )
+        CALL iom_rstput( iter, nitrst, numriw, 'frc_sal'    , frc_sal     )
+        CALL iom_rstput( iter, nitrst, numriw, 'vol_loc_ini', vol_loc_ini )
+        CALL iom_rstput( iter, nitrst, numriw, 'tem_loc_ini', tem_loc_ini )
+        CALL iom_rstput( iter, nitrst, numriw, 'sal_loc_ini', sal_loc_ini )
         !
      ENDIF