Changeset 8882 for branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.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/dommsk.F90 (modified) (6 diffs)

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

@@ -30 +30 @@
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp        ! Massively Parallel Processing library
-   USE wrk_nemo       ! Memory allocation
    USE timing         ! Timing
 
@@ -92 +91 @@
       INTEGER  ::   iktop, ikbot   !   -       -
       INTEGER  ::   ios, inum
-      REAL(wp), POINTER, DIMENSION(:,:) ::   zwf   ! 2D workspace
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   zwf   ! 2D workspace
       !!
       NAMELIST/namlbc/ rn_shlat, ln_vorlat
@@ -104 +103 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('dom_msk')
+      IF( ln_timing )   CALL timing_start('dom_msk')
       !
       REWIND( numnam_ref )              ! Namelist namlbc in reference namelist : Lateral momentum boundary condition
@@ -248 +247 @@
       IF( rn_shlat /= 0 ) THEN      ! Not free-slip lateral boundary condition
          !
-         CALL wrk_alloc( jpi,jpj,   zwf )
+         ALLOCATE( zwf(jpi,jpj) )
          !
          DO jk = 1, jpk
@@ -278 +277 @@
          END DO
          !
-         CALL wrk_dealloc( jpi,jpj,   zwf )
+         DEALLOCATE( zwf )
          !
          CALL lbc_lnk( fmask, 'F', 1._wp )      ! Lateral boundary conditions on fmask
@@ -292 +291 @@
       !
       !
-      IF( nn_timing == 1 )  CALL timing_stop('dom_msk')
+      IF( ln_timing )   CALL timing_stop('dom_msk')
       !
    END SUBROUTINE dom_msk