Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC

Timestamp:

2017-12-19T09:26:25+01:00 (6 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

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC

Files:

• daymod.F90 (modified) (2 diffs)
• diawri.F90 (modified) (4 diffs)
• nemogcm.F90 (modified) (1 diff)
• sbcssm.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/daymod.F90

@@ -223 +223 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('day')
+      IF( ln_timing )   CALL timing_start('day')
       !
       zprec = 0.1 / rday
@@ -277 +277 @@
       IF( lrst_oce         ) CALL day_rst( kt, 'WRITE' )      ! write day restart information
       !
-      IF( nn_timing == 1 )  CALL timing_stop('day')
+      IF( ln_timing )   CALL timing_stop('day')
       !
    END SUBROUTINE day

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/diawri.F90

@@ -136 +136 @@
       !!----------------------------------------------------------------------
       ! 
-      IF( nn_timing == 1 )   CALL timing_start('dia_wri')
+      IF( ln_timing )   CALL timing_start('dia_wri')
       !
       ! Output the initial state and forcings
@@ -322 +322 @@
       ENDIF
       !
-      IF( nn_timing == 1 )   CALL timing_stop('dia_wri')
+      IF( ln_timing )   CALL timing_stop('dia_wri')
       !
    END SUBROUTINE dia_wri
@@ -350 +350 @@
       !!----------------------------------------------------------------------
       ! 
-      IF( nn_timing == 1 )   CALL timing_start('dia_wri_state')
+      IF( ln_timing )   CALL timing_start('dia_wri_state')
 
       ! 0. Initialisation
@@ -428 +428 @@
       ENDIF
 #endif
-       
-      IF( nn_timing == 1 )   CALL timing_stop('dia_wri_state')
-      ! 
-
+      !
+      IF( ln_timing )   CALL timing_stop('dia_wri_state')
+      !
    END SUBROUTINE dia_wri_state
+
    !!======================================================================
 END MODULE diawri

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -424 +424 @@
       isplt     = nn_isplt
       jsplt     = nn_jsplt
-!!gm to be remove at the end of the 2017 merge party
-      if( ln_timing ) then  ;  nn_timing = 1
-      else                  ;  nn_timing = 0
-      endif
-!!gm end
 
       IF(lwp) THEN                  ! control print

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

@@ -23 +23 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE zpshde          ! z-coord. with partial steps: horizontal derivatives
+   !
    USE in_out_manager  ! I/O manager
    USE iom             ! I/O library
@@ -72 +73 @@
       !!             - interpolates data if needed
       !!----------------------------------------------------------------------
-      !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
@@ -79 +79 @@
       REAL(wp) ::   ztintb     ! ratio applied to before records when doing time interpolation
       !!----------------------------------------------------------------------
-      
-      !
-      IF( nn_timing == 1 )  CALL timing_start( 'sbc_ssm')
+      !
+      IF( ln_timing )   CALL timing_start( 'sbc_ssm')
      
       IF ( l_sasread ) THEN
@@ -153 +152 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop( 'sbc_ssm')
+      IF( ln_timing )   CALL timing_stop( 'sbc_ssm')
       !
    END SUBROUTINE sbc_ssm