Changeset 9939 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DIU/step_diu.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/step_diu.F90 (modified) (7 diffs)

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

@@ -5 +5 @@
    !!======================================================================
    !! History :  3.7  ! 2015-11  (J. While)  Original code
+   !!----------------------------------------------------------------------
 
    USE diurnal_bulk    ! diurnal SST bulk routines  (diurnal_sst_takaya routine) 
@@ -27 +28 @@
    !! Software governed by the CeCILL licence     (./LICENSE)
    !!----------------------------------------------------------------------
-
    CONTAINS
 
    SUBROUTINE stp_diurnal( kstp ) 
-      INTEGER, INTENT(in) ::   kstp   ! ocean time-step index 
       !!---------------------------------------------------------------------- 
       !!                     ***  ROUTINE stp_diurnal  *** 
@@ -46 +45 @@
       !!              -8- Outputs and diagnostics 
       !!---------------------------------------------------------------------- 
+      INTEGER, INTENT(in) ::   kstp   ! ocean time-step index 
+      !
       INTEGER ::   jk       ! dummy loop indices
       INTEGER ::   indic    ! error indicator if < 0 
@@ -51 +52 @@
       !! --------------------------------------------------------------------- 
       
-      IF(ln_diurnal_only) THEN
+      IF( ln_diurnal_only ) THEN
          indic = 0                                 ! reset to no error condition 
          IF( kstp /= nit000 )   CALL day( kstp )   ! Calendar (day was already called at nit000 in day_init) 
@@ -60 +61 @@
          ENDIF
        
-            CALL sbc    ( kstp )                      ! Sea Boundary Conditions 
+         CALL sbc( kstp )                          ! Sea Surface Boundary Conditions 
       ENDIF
      
-      ! Cool skin
       IF( .NOT.ln_diurnal )   CALL ctl_stop( "stp_diurnal: ln_diurnal not set" )
          
       IF( .NOT. ln_blk    )   CALL ctl_stop( "stp_diurnal: diurnal flux processing only implemented for bulk forcing" ) 
 
-      CALL diurnal_sst_coolskin_step( qns, taum, rhop(:,:,1), rdt)
+      !                                            ! Cool skin
+      CALL diurnal_sst_coolskin_step( qns, taum, rhop(:,:,1), rn_Dt )
 
-      CALL iom_put( "sst_wl"   , x_dsst               )    ! warm layer (write out before update below).
-      CALL iom_put( "sst_cs"   , x_csdsst             )    ! cool skin
+      CALL iom_put( "sst_wl", x_dsst   )                 ! warm layer (write out before update below).
+      CALL iom_put( "sst_cs", x_csdsst )                 ! cool skin
 
-      ! Diurnal warm layer model       
-      CALL diurnal_sst_takaya_step( kstp, & 
-      &    qsr, qns, taum, rhop(:,:,1), rdt) 
+      !                                            ! Diurnal warm layer model       
+      CALL diurnal_sst_takaya_step( kstp, qsr, qns, taum, rhop(:,:,1), rn_Dt ) 
 
       IF( ln_diurnal_only ) THEN
-         IF( ln_diaobs )         CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics (call after dynamics update)
+         IF( ln_diaobs )   CALL dia_obs( kstp )    ! obs-minus-model (assimilation) diagnostics (call after dynamics update)
      
          !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
@@ -84 +84 @@
          !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
          IF( kstp == nit000   )   CALL iom_close( numror )     ! close input  ocean restart file 
-         IF( lrst_oce         )   CALL rst_write    ( kstp )   ! write output ocean restart file
+         IF( lrst_oce         )   CALL rst_write( kstp   )     ! write output ocean restart file
      
          IF( ln_timing .AND.  kstp == nit000  )   CALL timing_reset 
@@ -91 +91 @@
    END SUBROUTINE stp_diurnal  
    
+   !!======================================================================
 END MODULE step_diu