Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

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

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

@@ -39 +39 @@
    USE asminc          ! Assimilation increment
 #endif
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -75 +77 @@
       !! Reference  : Leclair, M., and G. Madec, 2009, Ocean Modelling.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE oce     , ONLY:   z3d   => ta                           ! ta used as 3D workspace
-      USE wrk_nemo, ONLY:   zhdiv => wrk_2d_1 , z2d => wrk_2d_2   ! 2D workspace
-      !
       INTEGER, INTENT(in) ::   kt   ! time step
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zcoefu, zcoefv, zcoeff, z2dt, z1_2dt, z1_rau0   ! local scalars
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 1,2) ) THEN
-         CALL ctl_stop('ssh_wzv: requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
-
+      REAL(wp), POINTER, DIMENSION(:,:  ) ::  z2d, zhdiv
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  z3d
+      !!----------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start('ssh_wzv')
+      !
+      CALL wrk_alloc( jpi, jpj, z2d, zhdiv ) 
+      !
       IF( kt == nit000 ) THEN
          !
@@ -182 +182 @@
 #if defined key_bdy
       ssha(:,:) = ssha(:,:) * bdytmask(:,:)
-      CALL lbc_lnk( ssha, 'T', 1. ) 
+      CALL lbc_lnk( ssha, 'T', 1. )                 ! absolutly compulsory !! (jmm)
 #endif
 
@@ -230 +230 @@
       IF( lk_diaar5 ) THEN                            ! vertical mass transport & its square value
          ! Caution: in the VVL case, it only correponds to the baroclinic mass transport.
+         CALL wrk_alloc( jpi,jpj,jpk, z3d )
          z2d(:,:) = rau0 * e1t(:,:) * e2t(:,:)
          DO jk = 1, jpk
@@ -236 +237 @@
          CALL iom_put( "w_masstr" , z3d                     )  
          CALL iom_put( "w_masstr2", z3d(:,:,:) * z3d(:,:,:) )
+         CALL wrk_dealloc( jpi,jpj,jpk, z3d )
       ENDIF
       !
       IF(ln_ctl)   CALL prt_ctl( tab2d_1=ssha, clinfo1=' ssha  - : ', mask1=tmask, ovlap=1 )
       !
-      IF( wrk_not_released(2, 1,2) )   CALL ctl_stop('ssh_wzv: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj, z2d, zhdiv ) 
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('ssh_wzv')
       !
    END SUBROUTINE ssh_wzv
@@ -269 +273 @@
       REAL(wp) ::   zec      ! temporary scalar
       !!----------------------------------------------------------------------
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('ssh_nxt')
+      !
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -354 +360 @@
       IF(ln_ctl)   CALL prt_ctl( tab2d_1=sshb, clinfo1=' sshb  - : ', mask1=tmask, ovlap=1 )
       !
+      IF( nn_timing == 1 )  CALL timing_stop('ssh_nxt')
+      !
    END SUBROUTINE ssh_nxt