Changeset 8882 for branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

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

Author:

flavoni

Message:

dev_CNRS_2017 branch: merged dev_r7881_ENHANCE09_RK3 with trunk r8864

File:

• branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (12 diffs)

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -6 +6 @@
    !! History :  2.0  !  2006-06  (B. Levier, L. Marie)  original code
    !!            3.1  !  2009-02  (G. Madec, M. Leclair, R. Benshila)  pure z* coordinate
-   !!            3.3  !  2011-10  (M. Leclair) totally rewrote domvvl:
-   !!                                          vvl option includes z_star and z_tilde coordinates
+   !!            3.3  !  2011-10  (M. Leclair) totally rewrote domvvl: vvl option includes z_star and z_tilde coordinates
    !!            3.6  !  2014-11  (P. Mathiot) add ice shelf capability
    !!----------------------------------------------------------------------
@@ -31 +30 @@
    USE lib_mpp         ! distributed memory computing library
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE wrk_nemo        ! Memory allocation
    USE timing          ! Timing
 
@@ -122 +120 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('dom_vvl_init')
+      IF( ln_timing )   CALL timing_start('dom_vvl_init')
       !
       IF(lwp) WRITE(numout,*)
@@ -242 +240 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('dom_vvl_init')
+      IF( ln_timing )   CALL timing_stop('dom_vvl_init')
       !
    END SUBROUTINE dom_vvl_init
@@ -276 +274 @@
       REAL(wp)               ::   z2dt, z_tmin, z_tmax  ! local scalars
       LOGICAL                ::   ll_do_bclinic         ! local logical
-      REAL(wp), POINTER, DIMENSION(:,:,:) ::   ze3t
-      REAL(wp), POINTER, DIMENSION(:,:  ) ::   zht, z_scale, zwu, zwv, zhdiv
+      REAL(wp), DIMENSION(jpi,jpj)     ::   zht, z_scale, zwu, zwv, zhdiv
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   ze3t
       !!----------------------------------------------------------------------
       !
       IF( ln_linssh )   RETURN      ! No calculation in linear free surface
       !
-      IF( nn_timing == 1 )   CALL timing_start('dom_vvl_sf_nxt')
-      !
-      CALL wrk_alloc( jpi,jpj,zht,   z_scale, zwu, zwv, zhdiv )
-      CALL wrk_alloc( jpi,jpj,jpk,   ze3t )
-
+      IF( ln_timing )   CALL timing_start('dom_vvl_sf_nxt')
+      !
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -543 +538 @@
       r1_hv_a(:,:) = ssvmask(:,:) / ( hv_a(:,:) + 1._wp - ssvmask(:,:) )
       !
-      CALL wrk_dealloc( jpi,jpj,       zht, z_scale, zwu, zwv, zhdiv )
-      CALL wrk_dealloc( jpi,jpj,jpk,   ze3t )
-      !
-      IF( nn_timing == 1 )  CALL timing_stop('dom_vvl_sf_nxt')
+      IF( ln_timing )   CALL timing_stop('dom_vvl_sf_nxt')
       !
    END SUBROUTINE dom_vvl_sf_nxt
@@ -583 +575 @@
       IF( ln_linssh )   RETURN      ! No calculation in linear free surface
       !
-      IF( nn_timing == 1 )  CALL timing_start('dom_vvl_sf_swp')
+      IF( ln_timing )   CALL timing_start('dom_vvl_sf_swp')
       !
       IF( kt == nit000 )   THEN
@@ -657 +649 @@
       ! write restart file
       ! ==================
-      IF( lrst_oce )   CALL dom_vvl_rst( kt, 'WRITE' )
-      !
-      IF( nn_timing == 1 )   CALL timing_stop('dom_vvl_sf_swp')
+      IF( lrst_oce  )   CALL dom_vvl_rst( kt, 'WRITE' )
+      !
+      IF( ln_timing )   CALL timing_stop('dom_vvl_sf_swp')
       !
    END SUBROUTINE dom_vvl_sf_swp
@@ -683 +675 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('dom_vvl_interpol')
+      IF( ln_timing )   CALL timing_start('dom_vvl_interpol')
       !
       IF(ln_wd) THEN
@@ -770 +762 @@
       END SELECT
       !
-      IF( nn_timing == 1 )   CALL timing_stop('dom_vvl_interpol')
+      IF( ln_timing )   CALL timing_stop('dom_vvl_interpol')
       !
    END SUBROUTINE dom_vvl_interpol
@@ -794 +786 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('dom_vvl_rst')
+      IF( ln_timing )   CALL timing_start('dom_vvl_rst')
+      !
       IF( TRIM(cdrw) == 'READ' ) THEN        ! Read/initialise 
          !                                   ! ===============
@@ -947 +940 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('dom_vvl_rst')
+      IF( ln_timing )   CALL timing_stop('dom_vvl_rst')
       !
    END SUBROUTINE dom_vvl_rst