Changeset 2977 for branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90

Timestamp:

2011-10-22T15:46:41+02:00 (13 years ago)

Author:

cetlod

Message:

Add in branch 2011/dev_LOCEAN_2011 changes from 2011/dev_r2787_PISCES_improvment, 2011/dev_r2787_LOCEAN_offline_fldread and 2011/dev_r2787_LOCEAN3_TRA_TRP branches, see ticket #877

File:

• branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90 (modified) (3 diffs)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90

@@ -55 +55 @@
       !!---------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE oce     , ONLY:   zwx => ta       , zwy => sa         ! (ta,sa) used as 3D workspace
-      USE wrk_nemo, ONLY:   zwz => wrk_3d_1 , zww => wrk_3d_2   ! 3D workspace
+      USE oce     , ONLY:   tsa             ! tsa used as 2 3D workspace
+      USE wrk_nemo, ONLY:   zwz => wrk_3d_3 , zww => wrk_3d_4   ! 3D workspace
       !
       INTEGER , INTENT(in) ::   kt     ! ocean time-step index
@@ -63 +63 @@
       INTEGER  ::   ji, jj, jk, jl   ! dummy loop indices
       REAL(wp) ::   zrau0r, zlavmr, zua, zva   ! local scalars
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwx, zwy
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1,2) ) THEN
+      IF( wrk_in_use(3, 3,4) ) THEN
          CALL ctl_stop('dyn_zdf_exp: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
-
+      !
+      zwx => tsa(:,:,:,1) 
+      zwy => tsa(:,:,:,2) 
+      !
       IF( kt == nit000 .AND. lwp ) THEN
          WRITE(numout,*)
@@ -120 +124 @@
       END DO                           ! End of time splitting
       !
-      IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('dyn_zdf_exp: failed to release workspace arrays')
+      IF( wrk_not_released(3, 3,4) )   CALL ctl_stop('dyn_zdf_exp: failed to release workspace arrays')
       !
    END SUBROUTINE dyn_zdf_exp