Changeset 9939 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/OBS

Timestamp:

2018-07-13T09:28:50+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branche phased with MLF@9937 branche

Location:

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3

Files:

• . (copied) (copied from NEMO/trunk)
• src/OCE/OBS/diaobs.F90 (modified) (9 diffs)
• src/OCE/OBS/obs_prep.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/OBS/diaobs.F90

@@ -539 +539 @@
       ENDIF
 
-      idaystp = NINT( rday / rdt )
+      idaystp = NINT( rday / rn_Dt )
 
       !-----------------------------------------------------------------------
@@ -630 +630 @@
 
       ENDIF
-
+      !
    END SUBROUTINE dia_obs
+
 
    SUBROUTINE dia_obs_wri
@@ -651 +652 @@
       !!        !  15-08  (M. Martin) Combined writing for prof and surf types
       !!----------------------------------------------------------------------
-      !! * Modules used
       USE obs_rot_vel          ! Rotation of velocities
 
       IMPLICIT NONE
 
-      !! * Local declarations
       INTEGER :: jtype                    ! Data set loop variable
       INTEGER :: jo, jvar, jk
-      REAL(wp), DIMENSION(:), ALLOCATABLE :: &
-         & zu, &
-         & zv
+      REAL(wp), DIMENSION(:), ALLOCATABLE ::   zu, zv
 
       !-----------------------------------------------------------------------
@@ -771 +768 @@
       !!        !  2014-09  (D. Lea) New generic routine now deals with arbitrary initial time of day
       !!----------------------------------------------------------------------
-      USE phycst, ONLY : &            ! Physical constants
-         & rday
-      USE dom_oce, ONLY : &           ! Ocean space and time domain variables
-         & rdt
+      USE phycst , ONLY :   rday    ! Physical constants
+      USE dom_oce, ONLY :   rn_Dt   ! Ocean space and time domain variables
 
       IMPLICIT NONE
 
-      !! * Arguments
-      REAL(KIND=dp), INTENT(OUT) :: ddobs                        ! Date in YYYYMMDD.HHMMSS
-      INTEGER :: kstp
-
-      !! * Local declarations
+      REAL(KIND=dp), INTENT(  out) ::   ddobs   ! Date in YYYYMMDD.HHMMSS
+      INTEGER      , INTENT(in   ) ::   kstp
+
       INTEGER :: iyea        ! date - (year, month, day, hour, minute)
       INTEGER :: imon
@@ -805 +798 @@
       !! Compute number of days + number of hours + min since initial time
       !!----------------------------------------------------------------------
-      zdayfrc = kstp * rdt / rday
+      zdayfrc = kstp * rn_Dt / rday
       zdayfrc = zdayfrc - aint(zdayfrc)
       imin = imin + int( zdayfrc * 24 * 60 ) 
@@ -816 +809 @@
         iday=iday+1
       END DO 
-      iday = iday + kstp * rdt / rday 
+      iday = iday + kstp * rn_Dt / rday 
 
       !-----------------------------------------------------------------------
@@ -842 +835 @@
    END SUBROUTINE calc_date
 
+
    SUBROUTINE ini_date( ddobsini )
       !!----------------------------------------------------------------------
@@ -859 +853 @@
       !!        !  2014-09  (D. Lea) Change to call generic routine calc_date
       !!----------------------------------------------------------------------
-
       IMPLICIT NONE
-
-      !! * Arguments
-      REAL(KIND=dp), INTENT(OUT) :: ddobsini                   ! Initial date in YYYYMMDD.HHMMSS
-
+      !
+      REAL(KIND=dp), INTENT(out) ::   ddobsini   ! Initial date in YYYYMMDD.HHMMSS
+      !!----------------------------------------------------------------------
+      !
       CALL calc_date( nit000 - 1, ddobsini )
-
+      !
    END SUBROUTINE ini_date
+
 
    SUBROUTINE fin_date( ddobsfin )
@@ -1011 +1005 @@
     END SUBROUTINE obs_setinterpopts
 
+   !!======================================================================
 END MODULE diaobs

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/OBS/obs_prep.F90

@@ -610 +610 @@
       !!        !  2010-05  (D. Lea) Fix in leap year calculation for NEMO vn3.2
       !!----------------------------------------------------------------------
-      !! * Modules used
-      USE dom_oce, ONLY : &  ! Geographical information
-         & rdt
-      USE phycst, ONLY : &   ! Physical constants
-         & rday,  &             
-         & rmmss, &             
-         & rhhmm                        
-      !! * Arguments
+      USE dom_oce, ONLY :   rn_Dt                ! Geographical information
+      USE phycst , ONLY :   rday, rmmss, rhhmm   ! Physical constants
+
       INTEGER, INTENT(IN) :: kcycle     ! Current cycle
       INTEGER, INTENT(IN) :: kyea0      ! Initial date coordinates
@@ -632 +627 @@
          & kobshou,  &
          & kobsmin
-      INTEGER, DIMENSION(kobsno), INTENT(INOUT) :: &
-         & kobsqc           ! Quality control flag
-      INTEGER, DIMENSION(kobsno), INTENT(OUT) :: &
-         & kobsstp          ! Number of time steps up to the 
-                            ! observation time
-
-      !! * Local declarations
+      INTEGER, DIMENSION(kobsno), INTENT(inout) ::   kobsqc    ! Quality control flag
+      INTEGER, DIMENSION(kobsno), INTENT(  out) ::   kobsstp   ! Number of time steps up to the observation time
+      !
       INTEGER :: jyea
       INTEGER :: jmon
@@ -661 +652 @@
 
       ! Intialize the number of time steps per day
-      idaystp = NINT( rday / rdt )
+      idaystp = NINT( rday / rn_Dt )
 
       !---------------------------------------------------------------------
@@ -731 +722 @@
 
          ! Add in the number of time steps to the observation minute
-         zminstp = rmmss / rdt
+         zminstp = rmmss / rn_Dt
          zhoustp = rhhmm * zminstp