Changeset 2710 for branches

Timestamp:

2011-03-28T16:29:54+02:00 (13 years ago)

Author:

smasson

Message:

dynamic memory: correction for trdmld

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRD

Files:

• trdmld.F90 (modified) (3 diffs)
• trdtra.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90

@@ -94 +94 @@
       !!----------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zvlmsk => wrk_2d_1     ! 2D workspace
+      USE wrk_nemo, ONLY:   zvlmsk => wrk_2d_10     ! 2D workspace
       !
       INTEGER                         , INTENT( in ) ::   ktrd       ! ocean trend index
@@ -104 +104 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1) ) THEN
+      IF( wrk_in_use(2, 10) ) THEN
          CALL ctl_stop('trd_mld_zint : requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -195 +195 @@
       END SELECT
       !
-      IF( wrk_not_released(2, 1) )   CALL ctl_stop('trd_mld_zint: failed to release workspace arrays')
+      IF( wrk_not_released(2, 10) )   CALL ctl_stop('trd_mld_zint: failed to release workspace arrays')
       !
    END SUBROUTINE trd_mld_zint

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90

@@ -62 +62 @@
       !!----------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   ztrds => wrk_3d_1   ! 3D workspace
+      USE wrk_nemo, ONLY:   ztrds => wrk_3d_10   ! 3D workspace
       !
       INTEGER                         , INTENT(in)           ::  kt      ! time step
@@ -73 +73 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(3, 1) ) THEN
+      IF( wrk_in_use(3, 10) ) THEN
          CALL ctl_stop('trd_tra: requested workspace array unavailable')   ;   RETURN
       ENDIF
@@ -138 +138 @@
       ENDIF
       !
-      IF( wrk_not_released(3, 1) )   CALL ctl_stop('trd_tra: failed to release workspace array')
+      IF( wrk_not_released(3, 10) )   CALL ctl_stop('trd_tra: failed to release workspace array')
       !
    END SUBROUTINE trd_tra