Changeset 2693 for branches

Timestamp:

2011-03-16T08:09:12+01:00 (13 years ago)

Author:

rblod

Message:

Use correct working arrays in dynldf_bilap

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

• dynldf_bilap.F90 (modified) (3 diffs)
• dynldf_bilapg.F90 (modified) (3 diffs)

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

@@ -76 +76 @@
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE wrk_nemo, ONLY:   zcu => wrk_2d_1 , zcv => wrk_2d_2   ! 3D workspace
-      USE wrk_nemo, ONLY:   zuf => wrk_3d_1 , zut => wrk_3d_2   ! 3D workspace
-      USE wrk_nemo, ONLY:   zlu => wrk_3d_3 , zlv => wrk_3d_4
+      USE wrk_nemo, ONLY:   zuf => wrk_3d_3 , zut => wrk_3d_4   ! 3D workspace
+      USE wrk_nemo, ONLY:   zlu => wrk_3d_5 , zlv => wrk_3d_6
       !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
@@ -85 +85 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3, 1,2,3,4) ) THEN
+      IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3, 3,4,5,6) ) THEN
          CALL ctl_stop('dyn_ldf_bilap : requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -208 +208 @@
       !                                                ! ===============
       IF( wrk_not_released(2, 1,2)     .OR.   &
-          wrk_not_released(3, 1,2,3,4) )   CALL ctl_stop('dyn_ldf_bilap: failed to release workspace arrays')
+          wrk_not_released(3, 3,4,5,6) )   CALL ctl_stop('dyn_ldf_bilap: failed to release workspace arrays')
       !
    END SUBROUTINE dyn_ldf_bilap

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

@@ -85 +85 @@
       !!----------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zwk1 => wrk_3d_1 , zwk2 => wrk_3d_2   ! 3D workspace
+      USE wrk_nemo, ONLY:   zwk1 => wrk_3d_3 , zwk2 => wrk_3d_4   ! 3D workspace
       USE oce     , ONLY:   zwk3 => ta       , zwk4 => sa         ! ta, sa used as 3D workspace   
       !
@@ -93 +93 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1,2) ) THEN
+      IF( wrk_in_use(3, 3,4) ) THEN
          CALL ctl_stop('dyn_ldf_bilapg: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -129 +129 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('dyn_ldf_bilapg: failed to release workspace arrays')
+      IF( wrk_not_released(3, 3,4) )   CALL ctl_stop('dyn_ldf_bilapg: failed to release workspace arrays')
       !
    END SUBROUTINE dyn_ldf_bilapg