Changeset 2789 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.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_qck.F90 (modified) (6 diffs)

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

@@ -117 +117 @@
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zwx => ua       ! ua used as workspace
-      USE wrk_nemo, ONLY:   zfu => wrk_3d_1 , zfc => wrk_3d_2, zfd => wrk_3d_3   ! 3D workspace
+      USE wrk_nemo, ONLY:   zfu => wrk_3d_11 , zfc => wrk_3d_12, zfd => wrk_3d_13   ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -131 +131 @@
       !----------------------------------------------------------------------
       !
-      IF( wrk_in_use(3, 1,2,3) ) THEN
+      IF( wrk_in_use(3, 11,12,13) ) THEN
          CALL ctl_stop('tra_adv_qck_i: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -228 +228 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2,3) )   CALL ctl_stop('tra_adv_qck_i: failed to release workspace arrays')
+      IF( wrk_not_released(3, 11,12,13) )   CALL ctl_stop('tra_adv_qck_i: failed to release workspace arrays')
       !
    END SUBROUTINE tra_adv_qck_i
@@ -240 +240 @@
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zwy => ua       ! ua used as workspace
-      USE wrk_nemo, ONLY:   zfu => wrk_3d_1 , zfc => wrk_3d_2, zfd => wrk_3d_3   ! 3D workspace
+      USE wrk_nemo, ONLY:   zfu => wrk_3d_11 , zfc => wrk_3d_12, zfd => wrk_3d_13   ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -254 +254 @@
       !----------------------------------------------------------------------
       !
-      IF(wrk_in_use(3, 1,2,3))THEN
+      IF(wrk_in_use(3, 11,12,13))THEN
          CALL ctl_stop('tra_adv_qck_j: ERROR: requested workspace arrays unavailable')
          RETURN
@@ -359 +359 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2,3) )   CALL ctl_stop('tra_adv_qck_j: failed to release workspace arrays')
+      IF( wrk_not_released(3, 11,12,13) )   CALL ctl_stop('tra_adv_qck_j: failed to release workspace arrays')
       !
    END SUBROUTINE tra_adv_qck_j