Changeset 10897 for NEMO/branches/UKMO/NEMO_4.0_GO8_package/src/ICE

Timestamp:

2019-04-26T12:17:40+02:00 (5 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0_GO8_package branch: Copy over changes from previous version of the branch.

1. Implement datestamping of restarts.
2. Local diagnostics, particularly vertically-interpolated MLD diagnostics.
3. Restrict write-out in tra_bbl_init with IF(lwp).

File:

• NEMO/branches/UKMO/NEMO_4.0_GO8_package/src/ICE/icerst.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0_GO8_package/src/ICE/icerst.F90

@@ -21 +21 @@
    USE in_out_manager ! I/O manager
    USE iom            ! I/O manager library
+   USE ioipsl, ONLY : ju2ymds    ! for calendar
    USE lib_mpp        ! MPP library
    USE lib_fortran    ! fortran utilities (glob_sum + no signed zero)
@@ -46 +47 @@
       INTEGER, INTENT(in) ::   kt       ! number of iteration
       !
+      INTEGER             ::   iyear, imonth, iday
+      REAL (wp)           ::   zsec
+      REAL (wp)           ::   zfjulday
       CHARACTER(len=20)   ::   clkt     ! ocean time-step define as a character
       CHARACTER(len=50)   ::   clname   ! ice output restart file name
@@ -60 +64 @@
          IF( nitrst <= nitend .AND. nitrst > 0 ) THEN
             ! beware of the format used to write kt (default is i8.8, that should be large enough...)
-            IF( nitrst > 99999999 ) THEN   ;   WRITE(clkt, *       ) nitrst
-            ELSE                           ;   WRITE(clkt, '(i8.8)') nitrst
+            IF ( ln_rstdate ) THEN
+               zfjulday = fjulday + (2*nn_fsbc+1)*rdt / rday
+               IF( ABS(zfjulday - REAL(NINT(zfjulday),wp)) < 0.1 / rday )   zfjulday = REAL(NINT(zfjulday),wp)   ! avoid truncation error
+               CALL ju2ymds( zfjulday, iyear, imonth, iday, zsec )           
+               WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday
+            ELSE
+               IF( nitrst > 99999999 ) THEN   ;   WRITE(clkt, *       ) nitrst
+               ELSE                           ;   WRITE(clkt, '(i8.8)') nitrst
+               ENDIF
             ENDIF
             ! create the file