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

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

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (3 diffs)

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

@@ -205 +205 @@
          CALL Agrif_ParentGrid_To_ChildGrid()
          IF( ln_diaobs )        CALL dia_obs_wri
-         IF( nn_timing == 1 )   CALL timing_finalize
+         IF( ln_timing )   CALL timing_finalize
          CALL Agrif_ChildGrid_To_ParentGrid()
       ENDIF
 #endif
-      IF( ln_timing    )   CALL timing_finalize
+      IF( ln_timing )   CALL timing_finalize
       !
       CALL nemo_closefile
@@ -550 +550 @@
       njctle    = nn_jctle
       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
-      
+      jsplt     = nn_jsplt      
 
       IF(lwp) THEN                  ! control print
@@ -613 +607 @@
       !
 #if defined key_agrif
-      IF( nn_timing == 1 ) CALL ctl_stop( 'AGRIF not implemented with nn_timing = 1')
+      IF( ln_timing )   CALL ctl_stop( 'AGRIF not implemented with ln_timing = true')
 #endif
       !