Changeset 12477 for NEMO/branches/UKMO/r12083_restart_datestamp/src/OCE/IOM/restart.F90

Timestamp:

2020-02-27T13:20:58+01:00 (4 years ago)

Author:

jcastill

Message:

Changes as in the original branch, plus changes for bgc restart (in branch AMM15_v3_6_STABLE_package_collate)

File:

• NEMO/branches/UKMO/r12083_restart_datestamp/src/OCE/IOM/restart.F90 (modified) (4 diffs)

NEMO/branches/UKMO/r12083_restart_datestamp/src/OCE/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
    USE lib_mpp         ! distribued memory computing library
 
@@ -47 +49 @@
 CONTAINS
 
-   SUBROUTINE rst_opn( kt )
+   SUBROUTINE rst_opn( kt, ndastp )
       !!---------------------------------------------------------------------
       !!                   ***  ROUTINE rst_opn  ***
@@ -58 +60 @@
       !!----------------------------------------------------------------------
       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
       CHARACTER(LEN=52)   ::   clpname   ! ocean output restart file name including prefix for AGRIF
       CHARACTER(LEN=256)  ::   clinfo    ! info character
@@ -90 +96 @@
          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