Changeset 6144 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO

Timestamp:

2015-12-21T13:21:24+01:00 (8 years ago)

Author:

jpalmier

Message:

JPALM --21-12-2015 -- add print statement on restarts writing

Location:

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO

Files:

• OPA_SRC/IOM/restart.F90 (modified) (3 diffs)
• TOP_SRC/trcrst.F90 (modified) (1 diff)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -54 +54 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt     ! ocean time-step
+      INTEGER             ::   iyear, imonth, iday
+      REAL (wp)           ::   zsec
       !!
       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
       !!----------------------------------------------------------------------
       !
       IF( kt == nit000 ) THEN   ! default definitions
-         lrst_oce = .FALSE.   
+         lrst_oce = .FALSE.
          IF( ln_rst_list ) THEN
             nrst_lst = 1
@@ -71 +73 @@
 
       ! frequency-based restart dumping (nn_stock)
-      IF( .NOT. ln_rst_list .AND. MOD( kt - 1, nstock ) == 0 ) THEN   
+      IF( .NOT. ln_rst_list .AND. MOD( kt - 1, nstock ) == 0 ) THEN
          ! we use kt - 1 and not kt - nit000 to keep the same periodicity from the beginning of the experiment
          nitrst = kt + nstock - 1                  ! define the next value of nitrst for restart writing
@@ -80 +82 @@
       ! except if we write ocean restart files every time step or if an ocean restart file was writen at nitend - 1
       IF( kt == nitrst - 1 .OR. nstock == 1 .OR. ( kt == nitend .AND. .NOT. lrst_oce ) ) THEN
-         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( nitrst <= nitend .AND. nitrst > 0 ) THEN
+            IF ( ln_rstdate ) THEN
+            WRITE(numout,*) 'JPALM - oce restart kt = ',kt,'==', nitrst - 1
+            WRITE(numout,*) 'JPALM - oce restart nstock = ',nstock,'== 1 '
+            WRITE(numout,*) 'JPALM - oce restart kt = ',kt,'==',nitend
+            WRITE(numout,*) 'JPALM - oce restart nitrst = ',nitrst,'<=',nitend,' and > 0'
+            WRITE(numout,*) '-----------------------------'
+
+               CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )
+               WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday
+            ELSE
+               ! 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
+               ENDIF
             ENDIF
             ! create the file

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -86 +86 @@
       IF( kt == nitrst - 2*nn_dttrc .OR. nstock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN
          IF ( ln_rstdate ) THEN
+            WRITE(numout,*) 'JPALM - trc restart kt = ',kt,'==', nitrst - 2*nn_dttrc
+            WRITE(numout,*) 'JPALM - trc restart nstock = ',nstock,'==',nn_dttrc
+            WRITE(numout,*) 'JPALM - trc restart kt = ',kt,'==',nitend - nn_dttrc
+            WRITE(numout,*) '-----------------------------'
             CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )
             WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday