Changeset 1672

Timestamp:

2009-10-21T15:04:35+02:00 (15 years ago)

Author:

cetlod

Message:

Improvment of dianam.F90 module in offline configuration, see ticket:564

File:

• trunk/NEMO/OFF_SRC/DIA/dianam.F90 (modified) (3 diffs)

trunk/NEMO/OFF_SRC/DIA/dianam.F90

@@ -49 +49 @@
       !! * Local declarations
       CHARACTER (len=2) ::   clave
+      CHARACTER (len=3) ::   clave1
       CHARACTER (len=5) ::   clout
       INTEGER :: jt                       ! dummy loop indices
@@ -240 +241 @@
             WRITE(cdfnam,9004) iyear1,imonth1,iday1,iyear2,imonth2,iday2
          ENDIF
+      ELSE IF( (znbsec == 5.*raass .AND. nleapy > 1) .OR.   &
+               (znbsec >= 5.*365*rjjss .AND. znbsec <= 5.*366*rjjss .AND. nleapy <= 1) ) THEN
+         clave = '5y'
+         IF( iyear2 <= 99 ) THEN
+            WRITE(cdfnam,9001) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ELSE IF( iyear2 <= 999 ) THEN
+            WRITE(cdfnam,9002) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ELSE IF( iyear2 <= 9999 ) THEN
+            WRITE(cdfnam,9003) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ELSE
+            WRITE(cdfnam,9004) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ENDIF
+      ELSE IF( (znbsec == 10.*raass .AND. nleapy > 1) .OR.   &
+               (znbsec >= 10.*365*rjjss .AND. znbsec <= 10.*366*rjjss .AND. nleapy <= 1) ) THEN
+         clave1 = '10y'
+         iout = 1
+         IF( iyear2 <= 99 ) THEN
+            WRITE(cdfnam,9001) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ELSE IF( iyear2 <= 999 ) THEN
+            WRITE(cdfnam,9002) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ELSE IF( iyear2 <= 9999 ) THEN
+            WRITE(cdfnam,9003) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ELSE
+            WRITE(cdfnam,9004) iyear1,imonth1,iday1,iyear2,imonth2,iday2
+         ENDIF
       ELSE
+
          ! others
          iout = kfreq
@@ -275 +302 @@
       IF( iout == 0 ) THEN 
          cdfnam = TRIM(cexper)//"_"//clave//TRIM(cdfnam)//TRIM(cdsuff)
-      ELSE 
+      ELSE IF( iout == 1 .AND. kfreq > 1 ) THEN
+         cdfnam = TRIM(cexper)//"_"//clave1//TRIM(cdfnam)//TRIM(cdsuff)
+      ELSE
          cdfnam = TRIM(cexper)//"_"//clave//TRIM(clout)//TRIM(cdfnam)//TRIM(cdsuff)
       ENDIF