Changeset 3147 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

Timestamp:

2011-11-17T17:28:03+01:00 (12 years ago)

Author:

cetlod

Message:

branch dev_NEMO_MERGE_2011:New dynamical allocation for TOP

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -33 +33 @@
    USE agrif_opa_interp
 #endif
+   USE wrk_nemo_2      ! Memory allocation
 
    IMPLICIT NONE
@@ -889 +890 @@
       !! Reference  : Leclair, M., and G. Madec, 2009, Ocean Modelling.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zhdiv => wrk_2d_1 , z2d => wrk_2d_2   ! 2D workspace
-      USE wrk_nemo, ONLY:   z3d => wrk_3d_10                      ! 3D workspace
       !
       INTEGER, INTENT(in) ::   kt   ! time step
@@ -897 +895 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zcoefu, zcoefv, zcoeff, z2dt, z1_2dt, z1_rau0   ! local scalars
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3,10) ) THEN
-         CALL ctl_stop('trc_sub_ssh: requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
-
+      REAL(wp), POINTER, DIMENSION(:,:) :: zhdiv
+      !!---------------------------------------------------------------------
+
+      ! Allocate temporary workspace
+      CALL wrk_alloc( jpi, jpj, zhdiv )
 
       IF( kt == nittrc000 ) THEN
@@ -1002 +999 @@
 
       !
-      IF( wrk_not_released(2, 1,2) .OR. wrk_not_released(3, 10) ) THEN
-          CALL ctl_stop('ssh_wzv: failed to release workspace arrays')
-      ENDIF
+      CALL wrk_dealloc( jpi, jpj, zhdiv )
       !
    END SUBROUTINE trc_sub_ssh