Changeset 6737

Timestamp:

2016-06-24T11:00:27+02:00 (9 years ago)

Author:

malcolmroberts

Message:

Bug fixes from Tim's local GO6 package to fix age tracer output file naming

Location:

branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC

Files:

• trcnam.F90 (modified) (3 diffs)
• trcrst.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -62 +62 @@
       
       !                                        !  passive tracer informations
-                             CALL trc_nam_trc
+      CALL trc_nam_trc
       
       !                                        !   Parameters of additional diagnostics
-      IF( .NOT. lk_iomput)   CALL trc_nam_dia
+      CALL trc_nam_dia
 
       !                                        !   namelist of transport
-                             CALL trc_nam_trp
+      CALL trc_nam_trp
 
 
@@ -364 +364 @@
       ENDIF
 
-      IF( ln_diatrc ) THEN 
+      IF( ln_diatrc .AND. .NOT. lk_iomput ) THEN 
          ALLOCATE( trc2d(jpi,jpj,jpdia2d), trc3d(jpi,jpj,jpk,jpdia3d),  &
            &       ctrc2d(jpdia2d), ctrc2l(jpdia2d), ctrc2u(jpdia2d) ,  & 
@@ -375 +375 @@
       ENDIF
 
-      IF( ln_diabio .OR. l_trdtrc ) THEN
+      IF( ( ln_diabio .AND. .NOT. lk_iomput ) .OR. l_trdtrc ) THEN
          ALLOCATE( trbio (jpi,jpj,jpk,jpdiabio) , &
            &       ctrbio(jpdiabio), ctrbil(jpdiabio), ctrbiu(jpdiabio), STAT = ierr ) 

branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -27 +27 @@
    USE trcnam_trp
    USE iom
+   USE in_out_manager , ONLY : ln_rstdate
    USE daymod
    IMPLICIT NONE
@@ -48 +49 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt       ! number of iteration
+      INTEGER             ::   iyear, imonth, iday
+      REAL (wp)           ::   zsec
       !
       CHARACTER(LEN=20)   ::   clkt     ! ocean time-step define as a character
@@ -78 +81 @@
       ! except if we write tracer restart files every tracer time step or if a tracer restart file was writen at nitend - 2*nn_dttrc + 1
       IF( kt == nitrst - 2*nn_dttrc .OR. nstock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN
-         ! beware of the format used to write kt (default is i8.8, that should be large enough)
-         IF( nitrst > 1.0e9 ) THEN   ;   WRITE(clkt,*       ) nitrst
-         ELSE                        ;   WRITE(clkt,'(i8.8)') nitrst
+         IF ( ln_rstdate ) THEN
+            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