Changeset 5525

Timestamp:

2015-07-01T12:25:53+02:00 (8 years ago)

Author:

dancopsey

Message:

Updated to include dates in iceberg restart files.

File:

• branches/UKMO/dev_r5107_restart_func_and_date/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) (3 diffs)

branches/UKMO/dev_r5107_restart_func_and_date/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

@@ -24 +24 @@
    USE icb_oce        ! define iceberg arrays
    USE icbutl         ! iceberg utility routines
+   USE ioipsl, ONLY : ju2ymds    ! convert julian to years,months,days 
+   USE phycst, ONLY : rday       ! number of seconds in a day
 
    IMPLICIT NONE
@@ -231 +233 @@
       INTEGER ::   jn   ! dummy loop index
       INTEGER ::   ix_dim, iy_dim, ik_dim, in_dim
+      INTEGER                :: iyear, imonth, iday  
+      REAL (wp)              :: zsec
       CHARACTER(len=256)     :: cl_path
       CHARACTER(len=256)     :: cl_filename
+      CHARACTER(LEN=20)      :: clkt     ! ocean time-step defined as a character
       TYPE(iceberg), POINTER :: this
       TYPE(point)  , POINTER :: pt
       !!----------------------------------------------------------------------
+      
+      ! Date or timestep in the filename
+      IF ( ln_rstdate ) THEN 
+         CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )            
+         WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
+      ELSE 
+         IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) kt 
+         ELSE                            ;   WRITE(clkt, '(i8.8)') kt 
+         ENDIF
+      ENDIF
 
       ! Assume we write iceberg restarts to same directory as ocean restarts.
@@ -241 +256 @@
       IF( cl_path(LEN_TRIM(cl_path):) /= '/' ) cl_path = TRIM(cl_path) // '/'
       IF( lk_mpp ) THEN
-         WRITE(cl_filename,'(A,"_icebergs_",I8.8,"_restart_",I4.4,".nc")') TRIM(cexper), kt, narea-1
+         WRITE(cl_filename,'(A,"_icebergs_",A,"_restart_",I4.4,".nc")') TRIM(cexper), TRIM(ADJUSTL(clkt)), narea-1
       ELSE
-         WRITE(cl_filename,'(A,"_icebergs_",I8.8,"_restart.nc")') TRIM(cexper), kt
+         WRITE(cl_filename,'(A,"_icebergs_",A,"_restart.nc")') TRIM(cexper), TRIM(ADJUSTL(clkt))
       ENDIF
       IF (nn_verbose_level >= 0) WRITE(numout,'(2a)') 'icebergs, write_restart: creating ',TRIM(cl_path)//TRIM(cl_filename)