Changeset 1713

Timestamp:

2009-11-05T14:49:10+01:00 (14 years ago)

Author:

smasson

Message:

suppress nbiss and nobis, see ticket:589

Location:

trunk/NEMO

Files:

• OFF_SRC/daymod.F90 (modified) (1 diff)
• OPA_SRC/BDY/bdydta.F90 (modified) (10 diffs)
• OPA_SRC/daymod.F90 (modified) (1 diff)

trunk/NEMO/OFF_SRC/daymod.F90

@@ -56 +56 @@
    REAL(wp), PUBLIC, DIMENSION(0:13) ::   rmonth_end   !: second since the beginning of the year and the end of the months
    REAL(wp), PUBLIC                  ::   sec1jan000   !: second since Jan. 1st 00h of nit000 year and Jan. 1st 00h of the current year
-
-   ! this two variables are wrong DO NOT USE THEM !!!
-   INTEGER, PUBLIC, DIMENSION(12) ::   nbiss = (/ 31, 29, 31, 30, 31, 30,    &  !: number of days per month
-      &                                           31, 31, 30, 31, 30, 31 /)     !: (leap-year)
-   INTEGER, PUBLIC, DIMENSION(12) ::   nobis = (/ 31, 28, 31, 30, 31, 30,    &  !: number of days per month
-      &                                           31, 31, 30, 31, 30, 31 /)     !: (365 days a year)
-
 
    !!----------------------------------------------------------------------

trunk/NEMO/OPA_SRC/BDY/bdydta.F90

@@ -107 +107 @@
       iman = INT( raamo )      ! Number of months in a year
 
-      i15 = INT( 2*FLOAT( nday ) / ( FLOAT( nobis(nmonth) ) + 0.5 ) )
+      i15 = INT( 2*REAL( nday, wp ) / ( REAL( nmonth_len(nmonth), wp ) + 0.5 ) )
       ! i15=0 if the current day is in the first half of the month, else i15=1
 
@@ -140 +140 @@
             IF(lwp) WRITE(numout,*) '          Bdy data are read in netcdf files'
             !
-            dayfrac = adatrj  - FLOAT( itimer ) / 86400.   ! day fraction at time step kt-1
-            dayfrac = dayfrac - INT  ( dayfrac )           !
-            totime  = ( nitend - nit000 + 1 ) * rdt        ! Total time of the run to verify that all the
-            !                                              ! necessary time dumps in file are included
+            dayfrac = adatrj  - REAL( itimer, wp ) / 86400.   ! day fraction at time step kt-1
+            dayfrac = dayfrac - INT ( dayfrac )               !
+            totime  = ( nitend - nit000 + 1 ) * rdt           ! Total time of the run to verify that all the
+            !                                                 ! necessary time dumps in file are included
             !
             clfile(1) = filbdy_data_T
@@ -178 +178 @@
                ! Convert time origin in file to julian days 
                isec0 = isec0 + ihours0*60.*60. + iminutes0*60.
-               CALL ymds2ju(iyear0, imonth0, iday0, real(isec0), dayjul0)
+               CALL ymds2ju(iyear0, imonth0, iday0, REAL(isec0, wp), dayjul0)
                ! Compute model initialization time 
                iyear  = ndastp / 10000
@@ -184 +184 @@
                iday   = ndastp - iyear * 10000 - imonth * 100
                isecs  = dayfrac * 86400
-               CALL ymds2ju(iyear, imonth, iday, real(isecs) , zdayjulini)
+               CALL ymds2ju(iyear, imonth, iday, REAL(isecs, wp) , zdayjulini)
                ! offset from initialization date:
                zoffset = (dayjul0-zdayjulini)*86400
@@ -560 +560 @@
        ! ********************
        ! 
-       IF( ln_bdy_clim ) THEN   ;   zxy = FLOAT( nday                  ) / FLOAT( nobis(nbdy_b) ) + 0.5 - i15
-       ELSE                     ;   zxy = FLOAT( istep(nbdy_b) - itimer ) / FLOAT( istep(nbdy_b) - istep(nbdy_a) )
+       IF( ln_bdy_clim ) THEN   ;   zxy = REAL( nday                  , wp ) / REAL( nmonth_len(nbdy_b), wp ) + 0.5 - i15
+       ELSE                     ;   zxy = REAL( istep(nbdy_b) - itimer, wp ) / REAL( istep(nbdy_b) - istep(nbdy_a), wp )
        END IF
 
@@ -660 +660 @@
       iman  = INT( raamo ) ! Number of months in a year
 
-      i15 = INT( 2*FLOAT( nday ) / ( FLOAT( nobis(nmonth) ) + 0.5 ) )
+      i15 = INT( 2*REAL( nday, wp ) / ( REAL( nmonth_len(nmonth), wp ) + 0.5 ) )
       ! i15=0 if the current day is in the first half of the month, else i15=1
 
@@ -708 +708 @@
           IF(lwp) WRITE(numout,*)  'Bdy data are read in netcdf files'
 
-          dayfrac = adatrj-float(itimer)/86400. ! day fraction at time step kt-1
-          dayfrac = dayfrac - INT(dayfrac)      !
-          totime = (nitend-nit000+1)*rdt ! Total time of the run to verify that all the
-                                           ! necessary time dumps in file are included
+          dayfrac = adatrj  - REAL(itimer,wp)/86400. ! day fraction at time step kt-1
+          dayfrac = dayfrac - INT (dayfrac)          !
+          totime = (nitend-nit000+1)*rdt             ! Total time of the run to verify that all the
+                                                     ! necessary time dumps in file are included
 
           clfile(1) = filbdy_data_bt_T
@@ -735 +735 @@
             ! Convert time origin in file to julian days 
             isec0 = isec0 + ihours0*60.*60. + iminutes0*60.
-            CALL ymds2ju(iyear0, imonth0, iday0, real(isec0), dayjul0)
+            CALL ymds2ju(iyear0, imonth0, iday0, REAL(isec0, wp), dayjul0)
             ! Compute model initialization time 
             iyear  = ndastp / 10000
@@ -741 +741 @@
             iday   = ndastp - iyear * 10000 - imonth * 100
             isecs  = dayfrac * 86400
-            CALL ymds2ju(iyear, imonth, iday, real(isecs) , zdayjulini)
+            CALL ymds2ju(iyear, imonth, iday, REAL(isecs, wp) , zdayjulini)
             ! zoffset from initialization date:
             zoffset = (dayjul0-zdayjulini)*86400
@@ -1060 +1060 @@
     
         IF (ln_bdy_clim) THEN
-          zxy = FLOAT( nday ) / FLOAT( nobis(nbdy_b_bt) ) + 0.5 - i15
+          zxy = REAL( nday, wp ) / REAL( nmonth_len(nbdy_b_bt), wp ) + 0.5 - i15
         ELSE          
-          zxy = FLOAT(istep_bt(nbdy_b_bt)-itimer) / FLOAT(istep_bt(nbdy_b_bt)-istep_bt(nbdy_a_bt))
+          zxy = REAL(istep_bt(nbdy_b_bt)-itimer, wp) / REAL(istep_bt(nbdy_b_bt)-istep_bt(nbdy_a_bt), wp)
         END IF
 

trunk/NEMO/OPA_SRC/daymod.F90

@@ -58 +58 @@
    REAL(wp), PUBLIC                  ::   sec1jan000   !: second since Jan 1st 0h of nit000 year and Jan 1st 0h the current year
 
-   ! this two variables are wrong DO NOT USE THEM !!!
-   INTEGER, PUBLIC, DIMENSION(12) ::   nbiss = (/ 31, 29, 31, 30, 31, 30,    &  !: number of days per month
-      &                                           31, 31, 30, 31, 30, 31 /)     !: (leap-year)
-   INTEGER, PUBLIC, DIMENSION(12) ::   nobis = (/ 31, 28, 31, 30, 31, 30,    &  !: number of days per month
-      &                                           31, 31, 30, 31, 30, 31 /)     !: (365 days a year)
-
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009)