Changeset 2590 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.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/TRA/traadv_eiv.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90

@@ -64 +64 @@
       !! ** Action  : - add to p.n the eiv component
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: zu_eiv => wrk_2d_1, zv_eiv => wrk_2d_2, &
+                          zw_eiv => wrk_2d_3
+# if defined key_diaeiv 
+      USE wrk_nemo, ONLY: z2d => wrk_2d_4
+#endif
       INTEGER                         , INTENT(in   ) ::   kt       ! ocean time-step index
       CHARACTER(len=3)                , INTENT(in   ) ::   cdtype   ! =TRA or TRC (tracer indicator)
@@ -73 +79 @@
       REAL(wp) ::   zuwk, zuwk1, zuwi, zuwi1   ! local scalars
       REAL(wp) ::   zvwk, zvwk1, zvwj, zvwj1   !   -      -
-      REAL(wp), DIMENSION(jpi,jpj) ::   zu_eiv, zv_eiv, zw_eiv     ! 2D workspace
 # if defined key_diaeiv 
       REAL(wp) ::   zztmp                      ! local scalar
-      REAL(wp), DIMENSION(jpi,jpj) ::   z2d    ! 2D workspace
 # endif  
       !!----------------------------------------------------------------------
+
+# if defined key_diaeiv 
+      IF(.not. wrk_use(2, 1,2,3,4))THEN
+#else
+      IF(.not. wrk_use(2, 1,2,3))THEN
+#endif
+         CALL ctl_stop('tra_adv_eiv: ERROR: requested workspace arrays are unavailable.')
+         RETURN
+      END IF
 
       IF( kt == nit000 )  THEN
@@ -180 +193 @@
 # endif  
       ! 
+# if defined key_diaeiv 
+      IF(.not. wrk_release(2, 1,2,3,4))THEN
+#else
+      IF(.not. wrk_release(2, 1,2,3))THEN
+#endif
+         CALL ctl_stop('tra_adv_eiv: ERROR: failed to release workspace arrays.')
+      END IF
+      !
     END SUBROUTINE tra_adv_eiv