Changeset 2789 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90

Timestamp:

2011-06-27T13:18:25+02:00 (13 years ago)

Author:

cetlod

Message:

Implementation of the merge of TRA/TRP : first guess, see ticket #842

File:

• branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (3 diffs)

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -111 +111 @@
       !!----------------------------------------------------------------------
       USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE oce     , ONLY:   zwx => ua       , zwy  => va         ! (ua,va) used as 3D workspace
-      USE wrk_nemo, ONLY:   zwz => wrk_3d_1 , zind => wrk_3d_2   ! 3D workspace
-      USE wrk_nemo, ONLY:   ztfreez => wrk_2d_1                  ! 2D     -
+      USE oce     , ONLY:   zwx => ua        , zwy  => va          ! (ua,va) used as 3D workspace
+      USE wrk_nemo, ONLY:   zwz => wrk_3d_12 , zind => wrk_3d_13   ! 3D workspace
+      USE wrk_nemo, ONLY:   ztfreez => wrk_2d_1                    ! 2D     -
       !
       INTEGER                              , INTENT(in   ) ::   kt              ! ocean time-step index
@@ -131 +131 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 1,2) ) THEN
+      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 12,13) ) THEN
          CALL ctl_stop('tra_adv_cen2: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -276 +276 @@
       !
       IF( wrk_not_released(2, 1)   .OR.   &
-          wrk_not_released(3, 1,2) )   CALL ctl_stop('tra_adv_cen2: failed to release workspace arrays')
+          wrk_not_released(3, 12,13) )   CALL ctl_stop('tra_adv_cen2: failed to release workspace arrays')
       !
    END SUBROUTINE tra_adv_cen2