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

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

@@ -63 +63 @@
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zwx   => ua       , zwy   => va          ! (ua,va) used as workspace
-      USE wrk_nemo, ONLY:   zslpx => wrk_3d_1 , zslpy => wrk_3d_2    ! 3D workspace
+      USE wrk_nemo, ONLY:   zslpx => wrk_3d_11 , zslpy => wrk_3d_12    ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt              ! ocean time-step index
@@ -79 +79 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1,2) ) THEN
+      IF( wrk_in_use(3, 11,12) ) THEN
          CALL ctl_stop('tra_adv_muscl: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -252 +252 @@
       ENDDO
       !
-      IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('tra_adv_muscl: requested workspace arrays unavailable')
+      IF( wrk_not_released(3, 11,12) )   CALL ctl_stop('tra_adv_muscl: requested workspace arrays unavailable')
       !
    END SUBROUTINE tra_adv_muscl