Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (7 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -14 +14 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE in_out_manager  ! I/O manager
    USE trdmod          ! ocean dynamics trends 
    USE trdmod_oce      ! ocean variables trends
+   USE in_out_manager  ! I/O manager
+   USE lib_mpp         ! MPP library
    USE prtctl          ! Print control
 
@@ -29 +30 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -52 +52 @@
       !!             - save this trends (l_trddyn=T) for post-processing
       !!----------------------------------------------------------------------
-      USE oce, ONLY :   ztrdu => ta   ! use ta as 3D workspace   
-      USE oce, ONLY :   ztrdv => sa   ! use sa as 3D workspace   
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE oce     , ONLY:   ztrdu => ta       , ztrdv => sa   ! (ta,sa) used as 3D workspace   
+      USE wrk_nemo, ONLY:   zhke  => wrk_3d_1                 ! 3D workspace
       !!
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -59 +60 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zu, zv       ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zhke   ! temporary 3D workspace
       !!----------------------------------------------------------------------
+
+      IF( wrk_in_use(3,1) ) THEN
+         CALL ctl_stop('dyn_key: requested workspace array is unavailable')   ;   RETURN
+      ENDIF
 
       IF( kt == nit000 ) THEN
@@ -83 +87 @@
                   &         + vn(ji  ,jj  ,jk) * vn(ji  ,jj  ,jk)  )
                zhke(ji,jj,jk) = zv + zu
+!!gm simplier coding  ==>>   ~ faster
+!    don't forget to suppress local zu zv scalars
+!               zhke(ji,jj,jk) = 0.25 * (   un(ji-1,jj  ,jk) * un(ji-1,jj  ,jk)   &
+!                  &                      + un(ji  ,jj  ,jk) * un(ji  ,jj  ,jk)   &
+!                  &                      + vn(ji  ,jj-1,jk) * vn(ji  ,jj-1,jk)   &
+!                  &                      + vn(ji  ,jj  ,jk) * vn(ji  ,jj  ,jk)   )
+!!gm end <<==
             END DO  
          END DO  
@@ -91 +102 @@
             END DO 
          END DO
+!!gm idea to be tested  ==>>   is it faster on scalar computers ?
+!         DO jj = 2, jpjm1       ! add the gradient of kinetic energy to the general momentum trends
+!            DO ji = fs_2, fs_jpim1   ! vector opt.
+!               ua(ji,jj,jk) = ua(ji,jj,jk) - 0.25 * ( + un(ji+1,jj  ,jk) * un(ji+1,jj  ,jk)   &
+!                  &                                   + vn(ji+1,jj-1,jk) * vn(ji+1,jj-1,jk)   &
+!                  &                                   + vn(ji+1,jj  ,jk) * vn(ji+1,jj  ,jk)   &
+!                  !
+!                  &                                   - un(ji-1,jj  ,jk) * un(ji-1,jj  ,jk)   &
+!                  &                                   - vn(ji  ,jj-1,jk) * vn(ji  ,jj-1,jk)   &
+!                  &                                   - vn(ji  ,jj  ,jk) * vn(ji  ,jj  ,jk)   ) / e1u(ji,jj)
+!                  !
+!               va(ji,jj,jk) = va(ji,jj,jk) - 0.25 * (   un(ji-1,jj+1,jk) * un(ji-1,jj+1,jk)   &
+!                  &                                   + un(ji  ,jj+1,jk) * un(ji  ,jj+1,jk)   &
+!                  &                                   + vn(ji  ,jj+1,jk) * vn(ji  ,jj+1,jk)   &
+!                  !
+!                  &                                   - un(ji-1,jj  ,jk) * un(ji-1,jj  ,jk)   &
+!                  &                                   - un(ji  ,jj  ,jk) * un(ji  ,jj  ,jk)   &
+!                  &                                   - vn(ji  ,jj  ,jk) * vn(ji  ,jj  ,jk)   ) / e2v(ji,jj)
+!            END DO 
+!         END DO
+!!gm en idea            <<==
          !                                             ! ===============
       END DO                                           !   End of slab
@@ -104 +136 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
+      IF( wrk_not_released(3, 1) )   CALL ctl_stop('dyn_key: failed to release workspace array')
+      !
    END SUBROUTINE dyn_keg