Changeset 6332 for branches/UKMO/CO6_KD490/NEMOGCM/NEMO/OPA_SRC/ICB

Timestamp:

2016-02-19T08:20:00+01:00 (8 years ago)

Author:

deazer

Message:

Tested Initial run one day physics only in rose suite.

File:

• branches/UKMO/CO6_KD490/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) (4 diffs)

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

@@ -18 +18 @@
    !!----------------------------------------------------------------------
    USE par_oce        ! NEMO parameters
+   USE phycst         ! for rday
    USE dom_oce        ! NEMO domain
    USE in_out_manager ! NEMO IO routines
    USE lib_mpp        ! NEMO MPI library, lk_mpp in particular
+   USE ioipsl, ONLY : ju2ymds    ! for calendar 
    USE netcdf         ! netcdf routines for IO
    USE icb_oce        ! define iceberg arrays
@@ -64 +66 @@
                                                                                             ! start and count arrays
       LOGICAL                      ::   ll_found_restart
-      CHARACTER(len=256)           ::   cl_path
-      CHARACTER(len=256)           ::   cl_filename
+      CHARACTER(len=256)  :: cl_path 
+      CHARACTER(len=256)  :: cl_filename 
       CHARACTER(len=NF90_MAX_NAME) ::   cl_dname
       TYPE(iceberg)                ::   localberg ! NOT a pointer but an actual local variable
@@ -233 +235 @@
       CHARACTER(len=256)     :: cl_path
       CHARACTER(len=256)     :: cl_filename
+      INTEGER             ::   iyear, imonth, iday 
+      REAL (wp)           ::   zsec 
+      CHARACTER(len=256)  :: cl_path 
+      CHARACTER(len=256)  :: cl_filename 
+      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character
       TYPE(iceberg), POINTER :: this
       TYPE(point)  , POINTER :: pt
@@ -240 +247 @@
       cl_path = TRIM(cn_ocerst_outdir)
       IF( cl_path(LEN_TRIM(cl_path):) /= '/' ) cl_path = TRIM(cl_path) // '/'
+      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( kt > 999999999 ) THEN   ;   WRITE(clkt, *       ) kt 
+         ELSE                        ;   WRITE(clkt, '(i8.8)') kt 
+         ENDIF 
+      ENDIF 
       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)