Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

Timestamp:

2017-12-19T09:26:25+01:00 (7 years ago)

Author:

gm

Message:

dev_merge_2017: ln_timing instead of nn_timing + restricted timing to nemo_init and routine called by step in OPA_SRC

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) (14 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -19 +19 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE wrk_nemo        ! work arrays
-   USE timing          ! Timing
    USE daymod          ! calendar
    USE fldread         ! read input fields
@@ -127 +126 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('sbc_ice_cice')
-      !
       !                                        !----------------------!
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN     !  Ice time-step only  !
@@ -148 +145 @@
       ENDIF                                          ! End sea-ice time step only
       !
-      IF( nn_timing == 1 )  CALL timing_stop('sbc_ice_cice')
-
    END SUBROUTINE sbc_ice_cice
 
@@ -164 +159 @@
       INTEGER  ::   ji, jj, jl, jk                    ! dummy loop indices
       !!---------------------------------------------------------------------
-
-      IF( nn_timing == 1 )  CALL timing_start('cice_sbc_init')
       !
       CALL wrk_alloc( jpi,jpj, ztmp1, ztmp2 )
@@ -281 +274 @@
       CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init')
-      !
    END SUBROUTINE cice_sbc_init
 
@@ -299 +290 @@
       REAL(wp) ::   zintb, zintn  ! dummy argument
       !!---------------------------------------------------------------------
-
-      IF( nn_timing == 1 )  CALL timing_start('cice_sbc_in')
       !
       CALL wrk_alloc( jpi,jpj, ztmp, zpice )
@@ -507 +496 @@
       CALL wrk_dealloc( jpi,jpj,ncat, ztmpn )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_in')
-      !
    END SUBROUTINE cice_sbc_in
 
@@ -523 +510 @@
       REAL(wp), DIMENSION(:,:), POINTER :: ztmp1, ztmp2
       !!---------------------------------------------------------------------
-
-      IF( nn_timing == 1 )  CALL timing_start('cice_sbc_out')
       !
       CALL wrk_alloc( jpi,jpj, ztmp1, ztmp2 )
@@ -680 +665 @@
       CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_out')
-      !
    END SUBROUTINE cice_sbc_out
 
@@ -691 +674 @@
       !! 
       !!
+      !!---------------------------------------------------------------------
       INTEGER, INTENT( in  ) ::   kt   ! ocean time step
-      !!---------------------------------------------------------------------
-
+      !!
       INTEGER  ::   jl                        ! dummy loop index
       INTEGER  ::   ierror
-
-      IF( nn_timing == 1 )  CALL timing_start('cice_sbc_hadgam')
+      !!---------------------------------------------------------------------
       !
       IF( kt == nit000 )  THEN
@@ -722 +704 @@
       END DO
       !
-      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_hadgam')
-      !
    END SUBROUTINE cice_sbc_hadgam
 
@@ -732 +712 @@
       !! ** Purpose: Finalize CICE
       !!---------------------------------------------------------------------
-
+      !
       IF(lwp) WRITE(numout,*)'cice_sbc_final'
-
+      !
       CALL CICE_Finalize
-
+      !
    END SUBROUTINE cice_sbc_final
+
 
    SUBROUTINE cice_sbc_force (kt)
@@ -755 +736 @@
       !! History :
       !!----------------------------------------------------------------------
-      !! * Modules used
       USE iom
-
-      !! * arguments
-      INTEGER, INTENT( in  ) ::   kt ! ocean time step
-
+      !!
+      INTEGER, INTENT( in  ) ::   kt   ! ocean time step
+      !!
       INTEGER  ::   ierror             ! return error code
       INTEGER  ::   ifpr               ! dummy loop index
@@ -769 +748 @@
       TYPE(FLD_N) ::   sn_top1, sn_top2, sn_top3, sn_top4, sn_top5
       TYPE(FLD_N) ::   sn_bot1, sn_bot2, sn_bot3, sn_bot4, sn_bot5 
-
       !!
       NAMELIST/namsbc_cice/ cn_dir, sn_snow, sn_rain, sn_sblm,   &