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

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -22 +22 @@
    USE lib_mpp         ! MPP library
    USE prtctl          ! Print control
-   USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
    USE bdy_oce         ! ocean open boundary conditions
@@ -39 +38 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.6 , NEMO Consortium (2015)
+   !! NEMO/OPA 4.0 , NEMO Consortium (2017)
    !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -75 +74 @@
       INTEGER, INTENT( in ) ::   kscheme   ! =0/1   type of KEG scheme 
       !
-      INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp) ::   zu, zv       ! temporary scalars
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zhke
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdu, ztrdv 
-      INTEGER  ::   jb                 ! dummy loop indices
-      INTEGER  ::   ii, ij, igrd, ib_bdy   ! local integers
-      INTEGER  ::   fu, fv
+      INTEGER  ::   ji, jj, jk, jb    ! dummy loop indices
+      INTEGER  ::   ii, ifu, ib_bdy   ! local integers
+      INTEGER  ::   ij, ifv, igrd     !   -       -
+      REAL(wp) ::   zu, zv            ! local scalars
+      REAL(wp), DIMENSION(jpi,jpj,jpk)        ::   zhke
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   ztrdu, ztrdv 
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('dyn_keg')
-      !
-      CALL wrk_alloc( jpi,jpj,jpk,   zhke )
+      IF( ln_timing )   CALL timing_start('dyn_keg')
       !
       IF( kt == nit000 ) THEN
@@ -94 +90 @@
       ENDIF
 
-      IF( l_trddyn ) THEN           ! Save ua and va trends
-         CALL wrk_alloc( jpi,jpj,jpk,   ztrdu, ztrdv )
+      IF( l_trddyn ) THEN           ! Save the input trends
+         ALLOCATE( ztrdu(jpi,jpj,jpk) , ztrdv(jpi,jpj,jpk) )
          ztrdu(:,:,:) = ua(:,:,:) 
          ztrdv(:,:,:) = va(:,:,:) 
@@ -112 +108 @@
                      ii   = idx_bdy(ib_bdy)%nbi(jb,igrd)
                      ij   = idx_bdy(ib_bdy)%nbj(jb,igrd)
-                     fu   = NINT( idx_bdy(ib_bdy)%flagu(jb,igrd) )
-                     un(ii-fu,ij,jk) = un(ii,ij,jk) * umask(ii,ij,jk)
+                     ifu   = NINT( idx_bdy(ib_bdy)%flagu(jb,igrd) )
+                     un(ii-ifu,ij,jk) = un(ii,ij,jk) * umask(ii,ij,jk)
                   END DO
                END DO
@@ -122 +118 @@
                      ii   = idx_bdy(ib_bdy)%nbi(jb,igrd)
                      ij   = idx_bdy(ib_bdy)%nbj(jb,igrd)
-                     fv   = NINT( idx_bdy(ib_bdy)%flagv(jb,igrd) )
-                     vn(ii,ij-fv,jk) = vn(ii,ij,jk) * vmask(ii,ij,jk)
+                     ifv   = NINT( idx_bdy(ib_bdy)%flagv(jb,igrd) )
+                     vn(ii,ij-ifv,jk) = vn(ii,ij,jk) * vmask(ii,ij,jk)
                   END DO
                END DO
@@ -172 +168 @@
       ENDIF      
 
-
       !
       DO jk = 1, jpkm1                    !==  grad( KE ) added to the general momentum trends  ==!
@@ -187 +182 @@
          ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_keg, kt )
-         CALL wrk_dealloc( jpi,jpj,jpk,   ztrdu, ztrdv )
+         DEALLOCATE( ztrdu , ztrdv )
       ENDIF
       !
@@ -193 +188 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      CALL wrk_dealloc( jpi,jpj,jpk,   zhke )
-      !
-      IF( nn_timing == 1 )   CALL timing_stop('dyn_keg')
+      IF( ln_timing )   CALL timing_stop('dyn_keg')
       !
    END SUBROUTINE dyn_keg