Changeset 14072 for NEMO/trunk/src/OCE/DOM/daymod.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/DOM/daymod.F90 (modified) (7 diffs)

NEMO/trunk/src/OCE/DOM/daymod.F90

@@ -19 +19 @@
    !!                    ----------- WARNING -----------
    !!                    -------------------------------
-   !!   sbcmod assume that the time step is dividing the number of second of 
-   !!   in a day, i.e. ===> MOD( rday, rn_Dt ) == 0 
+   !!   sbcmod assume that the time step is dividing the number of second of
+   !!   in a day, i.e. ===> MOD( rday, rn_Dt ) == 0
    !!   except when user defined forcing is used (see sbcmod.F90)
    !!----------------------------------------------------------------------
@@ -84 +84 @@
       lrst_oce = .NOT. l_offline   ! force definition of offline
       IF( lrst_oce )   CALL day_rst( nit000, 'READ' )
-      
+
       ! set the calandar from ndastp (read in restart file and namelist)
       nyear   =   ndastp / 10000
@@ -94 +94 @@
       isecrst = ( nhour * NINT(rhhmm) + nminute ) * NINT(rmmss)
 
-      CALL ymds2ju( nyear, nmonth, nday, REAL(isecrst,wp), fjulday )  
+      CALL ymds2ju( nyear, nmonth, nday, REAL(isecrst,wp), fjulday )
       IF( ABS(fjulday - REAL(NINT(fjulday),wp)) < 0.1 / rday )   fjulday = REAL(NINT(fjulday),wp)   ! avoid truncation error
       IF( nhour*NINT(rhhmm*rmmss) + nminute*NINT(rmmss) - ndt05 .LT. 0 ) fjulday = fjulday+1.       ! move back to the day at nit000 (and not at nit000 - 1)
@@ -124 +124 @@
       IF( isecrst - ndt05 .GT. 0 ) THEN
          ! 1 timestep before current middle of first time step is still the same day
-         nsec_year  = (nday_year-1) * nsecd + isecrst - ndt05 
-         nsec_month = (nday-1)      * nsecd + isecrst - ndt05    
+         nsec_year  = (nday_year-1) * nsecd + isecrst - ndt05
+         nsec_month = (nday-1)      * nsecd + isecrst - ndt05
       ELSE
-         ! 1 time step before the middle of the first time step is the previous day 
-         nsec_year  = nday_year     * nsecd + isecrst - ndt05 
-         nsec_month = nday          * nsecd + isecrst - ndt05   
+         ! 1 time step before the middle of the first time step is the previous day
+         nsec_year  = nday_year     * nsecd + isecrst - ndt05
+         nsec_month = nday          * nsecd + isecrst - ndt05
       ENDIF
       nsec_monday   = imonday       * nsecd + isecrst - ndt05
-      nsec_day      =                         isecrst - ndt05 
+      nsec_day      =                         isecrst - ndt05
       IF( nsec_day    .LT. 0 ) nsec_day    = nsec_day    + nsecd
       IF( nsec_monday .LT. 0 ) nsec_monday = nsec_monday + nsecd*7
@@ -144 +144 @@
       nsec000_1jan000 = nsec1jan000 + nsec_year + ndt05
       nsecend_1jan000 = nsec000_1jan000 + ndt * ( nitend - nit000 + 1 )
-      
+
       ! Up to now, calendar parameters are related to the end of previous run (nit000-1)
       ! call day to set the calendar parameters at the begining of the current simulaton. needed by iom_init
@@ -344 +344 @@
                ! calculate start time in hours and minutes
                zdayfrac = adatrj - REAL(INT(adatrj), wp)
-          ksecs = NINT(zdayfrac * rday)          ! Nearest second to catch rounding errors in adatrj         
+          ksecs = NINT(zdayfrac * rday)          ! Nearest second to catch rounding errors in adatrj
                ihour = ksecs / NINT( rhhmm*rmmss )
           iminute = ksecs / NINT(rmmss) - ihour*NINT(rhhmm)
-           
+
                ! Add to nn_time0
                nhour   =   nn_time0 / 100
                nminute = ( nn_time0 - nhour * 100 )
           nminute = nminute + iminute
-          
+
                IF( nminute >= NINT(rhhmm) ) THEN
              nminute = nminute - NINT(rhhmm)
@@ -361 +361 @@
         nhour = nhour - NINT(rjjhh)
              adatrj = adatrj + 1.
-          ENDIF          
+          ENDIF
           nn_time0 = nhour * 100 + nminute
-               adatrj = REAL(INT(adatrj), wp)                    ! adatrj set to integer as nn_time0 updated          
+               adatrj = REAL(INT(adatrj), wp)                    ! adatrj set to integer as nn_time0 updated
             ELSE
                ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)