Changeset 2625 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

Timestamp:

2011-02-27T17:36:24+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; OPA_SRC mpp compilation: suppression of the USE in_out_manager in lib_mpp + style in DYN

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (6 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -29 +29 @@
    !! 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 +51 @@
       !!             - 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_use, wrk_release
-      USE wrk_nemo, ONLY: zhke => wrk_3d_1
+      USE wrk_nemo, ONLY:   wrk_use, wrk_release
+      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
@@ -63 +61 @@
       !!----------------------------------------------------------------------
 
-      IF(.NOT. wrk_use(3,1))THEN
-         CALL ctl_stop('dyn_key: requested workspace array is unavailable.')
-      END IF
+      IF(.NOT. wrk_use(3,1) ) THEN
+         CALL ctl_stop('dyn_key: requested workspace array is unavailable.')   ;   RETURN
+      ENDIF
 
       IF( kt == nit000 ) THEN
@@ -88 +86 @@
                   &         + 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  
@@ -96 +101 @@
             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
@@ -109 +135 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF(.NOT. wrk_release(3,1))THEN
-         CALL ctl_stop('dyn_key: failed to release workspace array.')
-      END IF
-
+      IF(.NOT. wrk_release(3, 1) )   CALL ctl_stop('dyn_key: failed to release workspace array')
+      !
    END SUBROUTINE dyn_keg