Changeset 10765 for NEMO/branches/UKMO/r8395_restart_datestamp/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

Timestamp:

2019-03-15T13:14:30+01:00 (23 months ago)

Author:

jcastill

Message:

First set of changes

File:

• NEMO/branches/UKMO/r8395_restart_datestamp/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) (4 diffs)

NEMO/branches/UKMO/r8395_restart_datestamp/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -27 +27 @@
    USE in_out_manager  ! I/O manager
    USE iom             ! I/O module
+   USE ioipsl, ONLY : ju2ymds    ! for calendar
    USE diurnal_bulk
+   USE sbc_oce         ! for icesheet freshwater input variables
    
    IMPLICIT NONE
@@ -46 +48 @@
 CONTAINS
 
-   SUBROUTINE rst_opn( kt )
+   SUBROUTINE rst_opn( kt, ndastp )
       !!---------------------------------------------------------------------
       !!                   ***  ROUTINE rst_opn  ***
@@ -57 +59 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt     ! ocean time-step
+      INTEGER, INTENT(in) ::   ndastp ! ocean date
       !!
+
+      INTEGER             ::   iyear, imonth, iday 
+      REAL (wp)           ::   zsec 
+      REAL (wp)           ::   zfjulday      !!
       CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character
       CHARACTER(LEN=50)   ::   clname   ! ocean output restart file name
-      CHARACTER(lc)       ::   clpath   ! full path to ocean output restart file
+      CHARACTER(LEN=150)  ::   clpath   ! full path to ocean output restart file
       !!----------------------------------------------------------------------
       !
@@ -85 +92 @@
          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 > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst
-            ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst
+            IF ( ln_rstdate ) THEN 
+               zfjulday = fjulday + 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 > 999999999 ) THEN    
+                  WRITE(clkt, *       ) nitrst 
+               ELSE               
+                  WRITE(clkt, '(i8.8)') nitrst 
+               ENDIF
             ENDIF
             ! create the file