Changeset 2590 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90

Timestamp:

2011-02-18T13:49:27+01:00 (13 years ago)

Author:

trackstand2

Message:

Merge branch 'dynamic_memory' into master-svn-dyn

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) (4 diffs)

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

@@ -49 +49 @@
       USE oce, ONLY:   zfu => ta   ! use ta as 3D workspace
       USE oce, ONLY:   zfv => sa   ! use sa as 3D workspace
+      USE wrk_nemo, ONLY: zfu_t => wrk_3d_1, & ! 3D workspaces
+                          zfu_f => wrk_3d_2, &
+                          zfu_uw =>wrk_3d_3, &
+                          zfv_t => wrk_3d_4, & 
+                          zfv_f => wrk_3d_5, & 
+                          zfv_vw =>wrk_3d_6, &
+                          zfw   => wrk_3d_7, &
+                          wrk_use, wrk_release
+      IMPLICIT none
       !!
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -54 +63 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zbu, zbv     ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zfu_t, zfu_f, zfu_uw   ! 3D workspace
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zfv_t, zfv_f, zfv_vw   !  -      -
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zfw                    !  -      -
       !!----------------------------------------------------------------------
 
@@ -64 +70 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
       ENDIF
+
+      ! Check that global workspace arrays aren't already in use
+      IF( .not. wrk_use(3, 1, 2, 3, 4, 5, 6, 7) )THEN
+         IF(lwp) WRITE(numout, *) 'dyn_adv_cen2 : run-time error - global workspace arrays already in use.'
+         CALL ctl_stop('dyn_adv_cen2 : run-time error - global workspace arrays already in use.')
+      END IF
 
       IF( l_trddyn ) THEN           ! Save ua and va trends
@@ -157 +169 @@
          &                       tab3d_2=va, clinfo2=           ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
+      ! Flag that the global workspace arrays are no longer in use
+      IF( .not. wrk_release(3, 1, 2, 3, 4, 5, 6, 7) )THEN
+         IF(lwp) WRITE(numout, *) 'dyn_adv_cen2 : run-time error - failed to release global workspace arrays.'
+      END IF
+      !
    END SUBROUTINE dyn_adv_cen2