Changeset 2459

Timestamp:

2010-12-07T12:17:48+01:00 (13 years ago)

Author:

smasson

Message:

nemo_v3_3_beta: bug in multi-year output frequency, see ticket #775

File:

• branches/nemo_v3_3_beta/NEMOGCM/EXTERNAL/IOIPSL/src/calendar.f90 (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/EXTERNAL/IOIPSL/src/calendar.f90

@@ -563 +563 @@
 !---- Here we compute what logically should be the next month
 !-
-      IF (month >= 13) THEN
-        yearp = year+1
+      DO WHILE (monthp1 >= 13)
+        yearp = yearp+1
         monthp1 = monthp1-12
-      ENDIF
-      CALL ymds2ju (year,monthp1,day,sec,date_mpf)
+      END DO
+      CALL ymds2ju (yearp,monthp1,day,sec,date_mpf)
 !-
 !---- But it could be that because of a shorter month or a bad
@@ -577 +577 @@
       monthp1 = month+ABS(freq)
       yearp=year
-      IF (monthp1 >= 13) THEN
-        yearp = year+1
-        monthp1 = monthp1 -12
-      ENDIF
+      DO WHILE (monthp1 >= 13)
+        yearp = yearp+1
+        monthp1 = monthp1-12
+      END DO
       dayp = 1
       secp = 0.0