Changeset 2696 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA

Timestamp:

2011-03-16T09:03:19+01:00 (13 years ago)

Author:

rblod

Message:

Compatibility with key_traldf_ano for dynamic memory

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA

Files:

• traldf_iso.F90 (modified) (3 diffs)
• traldf_iso_grif.F90 (modified) (4 diffs)
• trazdf_exp.F90 (modified) (3 diffs)
• trazdf_imp.F90 (modified) (3 diffs)

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

@@ -93 +93 @@
       USE oce     , ONLY:   zftu => ua       , zftv  => va         ! (ua,va) used as workspace
       USE wrk_nemo, ONLY:   zdkt => wrk_2d_1 , zdk1t => wrk_2d_2 , z2d  => wrk_2d_3   ! 2D workspace
-      USE wrk_nemo, ONLY:   zdit => wrk_3d_1 , zdjt  => wrk_3d_2 , ztfw => wrk_3d_3   ! 3D workspace
+      USE wrk_nemo, ONLY:   zdit => wrk_3d_6 , zdjt  => wrk_3d_7 , ztfw => wrk_3d_8   ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -112 +112 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1,2,3) .OR. wrk_in_use(2, 1,2,3) ) THEN
+      IF( wrk_in_use(3, 6,7,8) .OR. wrk_in_use(2, 1,2,3) ) THEN
           CALL ctl_stop('tra_ldf_iso : requested workspace array unavailable')   ;   RETURN
       ENDIF
@@ -291 +291 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2,3) .OR.   &
+      IF( wrk_not_released(3, 6,7,8) .OR.   &
           wrk_not_released(2, 1,2,3) )   CALL ctl_stop('tra_ldf_iso: failed to release workspace arrays')
       !

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

@@ -91 +91 @@
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zftu => ua       , zftv => va            ! (ua,va) used as 3D workspace
-      USE wrk_nemo, ONLY:   zdit => wrk_3d_1 , zdjt => wrk_3d_2 , ztfw => wrk_3d_3   ! 3D workspace
+      USE wrk_nemo, ONLY:   zdit => wrk_3d_6 , zdjt => wrk_3d_7 , ztfw => wrk_3d_8   ! 3D workspace
       USE wrk_nemo, ONLY:   z2d  => wrk_2d_1                                         ! 2D workspace
       !
@@ -118 +118 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1,2,3) .OR. wrk_in_use(2, 1) ) THEN
+      IF( wrk_in_use(3, 6,7,8) .OR. wrk_in_use(2, 1) ) THEN
          CALL ctl_stop('tra_ldf_iso_grif: requested workspace arrays unavailable.')   ;   RETURN
       ENDIF
@@ -125 +125 @@
       ! zdkt(:,:,1:2) instead as then wouldn't need to re-map bounds.
       ! As it is, we make zdkt a module array and allocate it in _alloc().
-      !zdkt(1:jpi,1:jpj,0:1) => wrk_3d_4(:,:,1:2)
+      !zdkt(1:jpi,1:jpj,0:1) => wrk_3d_9(:,:,1:2)
 
       IF( kt == nit000 )  THEN
@@ -348 +348 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2,3,4) .OR.   &
+      IF( wrk_not_released(3, 6,7,8) .OR.   &
           wrk_not_released(2, 1)       )   CALL ctl_stop('tra_ldf_iso_grif: failed to release workspace arrays')
       !

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

@@ -74 +74 @@
       !!---------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zwx => wrk_3d_1, zwy => wrk_3d_2     ! 3D workspace
+      USE wrk_nemo, ONLY:   zwx => wrk_3d_6, zwy => wrk_3d_7     ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt          ! ocean time-step index
@@ -89 +89 @@
       !!---------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1,2) ) THEN
+      IF( wrk_in_use(3, 6,7) ) THEN
          CALL ctl_stop('tra_zdf_exp: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -164 +164 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('tra_zdf_exp: failed to release workspace arrays')
+      IF( wrk_not_released(3, 6,7) )   CALL ctl_stop('tra_zdf_exp: failed to release workspace arrays')
       !
    END SUBROUTINE tra_zdf_exp

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

@@ -76 +76 @@
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zwd => ua       , zws => va         ! (ua,va) used as 3D workspace
-      USE wrk_nemo, ONLY:   zwi => wrk_3d_1 , zwt => wrk_3d_2   ! 3D workspace 
+      USE wrk_nemo, ONLY:   zwi => wrk_3d_6 , zwt => wrk_3d_7   ! 3D workspace 
       !
       INTEGER                              , INTENT(in   ) ::   kt       ! ocean time-step index
@@ -89 +89 @@
       !!---------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1,2) ) THEN
+      IF( wrk_in_use(3, 6,7) ) THEN
          CALL ctl_stop('tra_zdf_imp : requested workspace arrays unavailable.')   ;   RETURN
       ENDIF
@@ -228 +228 @@
       !                                               ! ================= !
       !
-      IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('tra_zdf_imp: failed to release workspace arrays')
+      IF( wrk_not_released(3, 6,7) )   CALL ctl_stop('tra_zdf_imp: failed to release workspace arrays')
       !
    END SUBROUTINE tra_zdf_imp