Changeset 9089 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90

Timestamp:

2017-12-15T18:00:09+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: bug correction in zdfdrg + ISOMIP cfg

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) (9 diffs)

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

@@ -59 +59 @@
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE prtctl         ! Print control
-   USE timing         ! Timing
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
 
@@ -253 +252 @@
       !!--------------------------------------------------------------------
       !
-      IF( ln_timing )  CALL timing_start('zdf_osm')
+      IF( nn_timing == 1 )  CALL timing_start('zdf_osm')
       !
       ALLOCATE( lconv(jpi,jpj),  STAT= i_lconv_alloc )
@@ -1352 +1351 @@
       CALL lbc_lnk( p_avt(:,:,:), 'W', 1. )
       !
-      IF( ln_timing )  CALL timing_stop('zdf_osm')
-      !
    END SUBROUTINE zdf_osm
 
@@ -1376 +1373 @@
           & ,ln_kpprimix, rn_riinfty, rn_difri, ln_convmix, rn_difconv
      !!----------------------------------------------------------------------
-     !
-     IF( ln_timing )  CALL timing_start('zdf_osm_init')
      !
      REWIND( numnam_ref )              ! Namelist namzdf_osm in reference namelist : Osmosis ML model
@@ -1503 +1498 @@
      ghamu(:,:,:) = 0.
      ghamv(:,:,:) = 0.
-
-     !
-     IF( ln_timing )  CALL timing_stop('zdf_osm_init')
      !
    END SUBROUTINE zdf_osm_init
@@ -1616 +1608 @@
       INTEGER :: ji, jj, jk
       !
-      IF( ln_timing )  CALL timing_start('tra_osm')
-      !
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -1658 +1648 @@
          &             tab3d_2=tsa(:,:,:,jp_sal), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
       ENDIF
-      !
-      IF( ln_timing )  CALL timing_stop('tra_osm')
       !
    END SUBROUTINE tra_osm
@@ -1695 +1683 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_timing )  CALL timing_start('dyn_osm')
-      !
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -1716 +1702 @@
          END DO
       END DO
-
+      !
       ! code for saving tracer trends removed
       !
-      IF( ln_timing )  CALL timing_stop('dyn_osm')
-      !
    END SUBROUTINE dyn_osm