Changeset 3851 for trunk/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2013-03-27T11:03:54+01:00 (11 years ago)

Author:

smasson

Message:

trunk: bugfix in fldread when nn_fsbc * rn_rdt > frcing file period, see #958

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• daymod.F90 (modified) (1 diff)
• dom_oce.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -153 +153 @@
          IF ( nleapy == 1 ) THEN   ! we are using calandar with leap years
             IF ( MOD(nyear-1, 4) == 0 .AND. ( MOD(nyear-1, 400) == 0 .OR. MOD(nyear-1, 100) /= 0 ) ) THEN
-               nyear_len(0) = 366
-            ENDIF
-            IF ( MOD(nyear, 4) == 0 .AND. ( MOD(nyear, 400) == 0 .OR. MOD(nyear, 100) /= 0 ) ) THEN
+               nyear_len(0)  = 366
+            ENDIF
+            IF ( MOD(nyear  , 4) == 0 .AND. ( MOD(nyear  , 400) == 0 .OR. MOD(nyear  , 100) /= 0 ) ) THEN
                nmonth_len(2) = 29
-               nyear_len(1) = 366
+               nyear_len(1)  = 366
+            ENDIF
+            IF ( MOD(nyear+1, 4) == 0 .AND. ( MOD(nyear+1, 400) == 0 .OR. MOD(nyear+1, 100) /= 0 ) ) THEN
+               nyear_len(2)  = 366
             ENDIF
          ENDIF

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -218 +218 @@
    REAL(wp), PUBLIC ::   adatrj        !: number of elapsed days since the begining of the whole simulation
    !                                   !: (cumulative duration of previous runs that may have used different time-step size)
-   INTEGER , PUBLIC, DIMENSION(0: 1) ::   nyear_len     !: length in days of the previous/current year
+   INTEGER , PUBLIC, DIMENSION(0: 2) ::   nyear_len     !: length in days of the previous/current/next year
    INTEGER , PUBLIC, DIMENSION(0:13) ::   nmonth_len    !: length in days of the months of the current year
    INTEGER , PUBLIC, DIMENSION(0:13) ::   nmonth_half   !: second since Jan 1st 0h of the current year and the half of the months