Index: branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90
===================================================================
--- branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90	(revision 6008)
+++ branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90	(revision 6010)
@@ -234,12 +234,5 @@
       ! cool skin
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<      
-      IF ( ln_diurnal ) THEN 
-         IF ( .NOT. ln_blk_core ) THEN
-            CALL ctl_stop("step.f90: diurnal flux processing not implemented"//&
-            &             " for direct forcing")
-         ENDIF
-         CALL diurnal_sst_coolskin_step( & 
-                    qns, taum, rhop(:,:,1), rdt)
-      ENDIF
+      IF ( ln_diurnal )  CALL stp_diurnal( kstp )
       
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -256,19 +249,4 @@
       !
       IF( ln_crs     )   CALL crs_fld       ( kstp )  ! ocean model: online field coarsening & output
-      
-      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-      ! diurnal warm layer
-      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      IF ( ln_diurnal ) THEN 
-         IF( kstp == nit000 )THEN 
-            CALL diurnal_sst_takaya_step( & 
-            &    qsr, qns, taum, rhop(:,:,1), &
-            &    rdt, ld_calcfrac = .TRUE.) 
-         ELSE 
-            CALL diurnal_sst_takaya_step( & 
-            &    qsr, qns, taum, rhop(:,:,1), rdt ) 
-         ENDIF
-      ENDIF     
-      
       
 #if defined key_top
@@ -382,71 +360,3 @@
    END SUBROUTINE stp
    
-   SUBROUTINE stp_diurnal( kstp ) 
-      INTEGER, INTENT(in) ::   kstp   ! ocean time-step index 
-      !!---------------------------------------------------------------------- 
-      !!                     ***  ROUTINE stp  *** 
-      !!                       
-      !! ** Purpose : - Time stepping of diurnal SST model only 
-      !!   
-      !! ** Method  : -1- Update forcings and data   
-      !!              -2- Update ocean physics   
-      !!              -3- Compute the t and s trends   
-      !!              -4- Update t and s   
-      !!              -5- Compute the momentum trends 
-      !!              -6- Update the horizontal velocity 
-      !!              -7- Compute the diagnostics variables (rd,N2, div,cur,w) 
-      !!              -8- Outputs and diagnostics 
-      !!---------------------------------------------------------------------- 
-      INTEGER ::   jk       ! dummy loop indices
-      INTEGER ::   indic    ! error indicator if < 0 
-      REAL(wp), DIMENSION(jpi,jpj) :: z_fvel_bkginc, z_hflux_bkginc     
-      !! --------------------------------------------------------------------- 
- 
-      indic = 1                                 ! reset to no error condition 
- 
-      IF( kstp /= nit000 )   CALL day( kstp )   ! Calendar (day was already called at nit000 in day_init) 
- 
-      CALL iom_setkt( kstp - nit000 + 1, cxios_context )   ! tell iom we are at time step kstp
-      IF( ln_crs ) THEN
-         CALL iom_setkt( kstp - nit000 + 1, TRIM(cxios_context)//"_crs" ) ! tell iom we are at time step kstp
-      ENDIF
-       
-      CALL sbc    ( kstp )                      ! Sea Boundary Conditions 
-     
-      ! Cool skin
-      IF ( .NOT.ln_diurnal ) CALL ctl_stop(  "stp_diurnal: ln_diurnal not set"  )
-         
-      IF ( .NOT. ln_blk_core ) THEN
-         CALL ctl_stop("step.f90: diurnal flux processing not implemented"//&
-         &             " for direct forcing") 
-      ENDIF
-
-      CALL diurnal_sst_coolskin_step( qns, taum, rhop(:,:,1), rdt)
-
-      CALL dia_wri( kstp )                            ! ocean model: outputs 
-       
-      ! Diurnal warm layer model       
-           
-      IF( kstp == nit000 )THEN 
-         CALL diurnal_sst_takaya_step( & 
-         &    qsr, qns, taum, rhop(:,:,1), &
-         &    rdt, ld_calcfrac = .TRUE.) 
-      ELSE 
-         CALL diurnal_sst_takaya_step( & 
-         &    qsr, qns, taum, rhop(:,:,1), rdt ) 
-      ENDIF
-
-      IF( ln_diaobs  )         CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics (call after dynamics update)
-     
-      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
-      ! Control and restarts 
-      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
-      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( nn_timing == 1 .AND.  kstp == nit000  )   CALL timing_reset 
-       
-   END SUBROUTINE stp_diurnal  
-   
-   !!======================================================================
 END MODULE step
