Changeset 9939 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DIU/diurnal_bulk.F90

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/DIU/diurnal_bulk.F90 (modified) (6 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DIU/diurnal_bulk.F90

@@ -78 +78 @@
 
 
-   SUBROUTINE diurnal_sst_takaya_step(kt, psolflux, pqflux, ptauflux, prho, p_rdt,   &
+   SUBROUTINE diurnal_sst_takaya_step(kt, psolflux, pqflux, ptauflux, prho, pdt,   &
             &                  pla, pthick, pcoolthick, pmu, &
             &                  p_fvel_bkginc, p_hflux_bkginc)
@@ -98 +98 @@
       REAL(wp), DIMENSION(jpi,jpj)          , INTENT(in) ::   ptauflux       ! wind stress  (kg/ m s^2)
       REAL(wp), DIMENSION(jpi,jpj)          , INTENT(in) ::   prho           ! water density  (kg/m^3)
-      REAL(wp)                              , INTENT(in) ::   p_rdt          ! time-step
+      REAL(wp)                              , INTENT(in) ::   pdt            ! time-step (s)
       REAL(wp), DIMENSION(jpi,jpj), OPTIONAL, INTENT(in) ::   pLa            ! Langmuir number
       REAL(wp), DIMENSION(jpi,jpj), OPTIONAL, INTENT(in) ::   pthick         ! warm layer thickness (m)
@@ -167 +167 @@
       
       ! Increment the temperature using the implicit solution
-      x_dsst(:,:) = t_imp( x_dsst(:,:), p_rdt, z_abflux(:,:), z_fvel(:,:),   &
+      x_dsst(:,:) = t_imp( x_dsst(:,:), pdt, z_abflux(:,:), z_fvel(:,:),   &
          &                       z_fla(:,:), zmu(:,:), zthick(:,:), prho(:,:) )
       !
@@ -173 +173 @@
 
    
-   FUNCTION t_imp(p_dsst, p_rdt, p_abflux, p_fvel, &
+   FUNCTION t_imp(p_dsst, pdt, p_abflux, p_fvel, &
                           p_fla, pmu, pthick, prho )
                           
@@ -182 +182 @@
       ! Dummy variables
       REAL(wp), DIMENSION(jpi,jpj), INTENT(IN) :: p_dsst     ! Delta SST
-      REAL(wp), INTENT(IN)                     :: p_rdt      ! Time-step
+      REAL(wp), INTENT(IN)                     :: pdt        ! Time-step (s)
       REAL(wp), DIMENSION(jpi,jpj), INTENT(IN) :: p_abflux   ! Heat forcing
       REAL(wp), DIMENSION(jpi,jpj), INTENT(IN) :: p_fvel     ! Friction velocity
@@ -257 +257 @@
             &      ( pthick(ji,jj) * z_stabfunc ) )     
           
-            t_imp(ji,jj) = ( p_dsst(ji,jj) + p_rdt * z_term1 ) / &
-                           ( 1._wp - p_rdt * z_term2 )
+            t_imp(ji,jj) = ( p_dsst(ji,jj) + pdt * z_term1 ) / &
+                           ( 1._wp - pdt * z_term2 )
 
          END DO
       END DO
       
-      END FUNCTION t_imp
-
+   END FUNCTION t_imp
+
+   !!======================================================================
 END MODULE diurnal_bulk