Changeset 9015 for branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90

Timestamp:

2017-12-13T15:10:30+01:00 (6 years ago)

Author:

acc

Message:

Branch dev_CNRS_2017. Tidy up timing calls. Correct a few inconsistent labels and fix incorrect call in trc_sub_stp. Remove timing from icethd_pnd which is not always called by all processors

File:

• branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) (8 diffs)

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90

@@ -253 +253 @@
       !!--------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('zdf_osm')
+      IF( ln_timing )  CALL timing_start('zdf_osm')
       !
       ALLOCATE( lconv(jpi,jpj),  STAT= i_lconv_alloc )
@@ -1352 +1352 @@
       CALL lbc_lnk( p_avt(:,:,:), 'W', 1. )
       !
+      IF( ln_timing )  CALL timing_stop('zdf_osm')
+      !
    END SUBROUTINE zdf_osm
 
@@ -1375 +1377 @@
      !!----------------------------------------------------------------------
      !
-     IF( nn_timing == 1 )  CALL timing_start('zdf_osm_init')
+     IF( ln_timing )  CALL timing_start('zdf_osm_init')
      !
      REWIND( numnam_ref )              ! Namelist namzdf_osm in reference namelist : Osmosis ML model
@@ -1503 +1505 @@
 
      !
-     IF( nn_timing == 1 )  CALL timing_stop('zdf_osm_init')
+     IF( ln_timing )  CALL timing_stop('zdf_osm_init')
      !
    END SUBROUTINE zdf_osm_init
@@ -1614 +1616 @@
       INTEGER :: ji, jj, jk
       !
-      IF( nn_timing == 1 )  CALL timing_start('tra_osm')
+      IF( ln_timing )  CALL timing_start('tra_osm')
       !
       IF( kt == nit000 ) THEN
@@ -1657 +1659 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('tra_osm')
+      IF( ln_timing )  CALL timing_stop('tra_osm')
       !
    END SUBROUTINE tra_osm
@@ -1693 +1695 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('dyn_osm')
+      IF( ln_timing )  CALL timing_start('dyn_osm')
       !
       IF( kt == nit000 ) THEN
@@ -1717 +1719 @@
       ! code for saving tracer trends removed
       !
-      IF( nn_timing == 1 )  CALL timing_stop('dyn_osm')
+      IF( ln_timing )  CALL timing_stop('dyn_osm')
       !
    END SUBROUTINE dyn_osm