Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -24 +24 @@
    USE trdmld                  ! ocean active mixed layer tracers trends 
    USE in_out_manager          ! I/O manager
-   USE lib_mpp         ! MPP library
+   USE lib_mpp                 ! MPP library
+   USE wrk_nemo                ! Memory allocation
+
 
    IMPLICIT NONE
@@ -52 +54 @@
       !!              integral constraints
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: ztswu => wrk_2d_1,  &
-                          ztswv => wrk_2d_2,  &
-                          ztbfu => wrk_2d_3,  &
-                          ztbfv => wrk_2d_4,  &
-                          z2dx  => wrk_2d_5,  &
-                          z2dy  => wrk_2d_6
       !
       REAL(wp), DIMENSION(:,:,:), INTENT(inout) ::   ptrdx   ! Temperature or U trend 
@@ -67 +62 @@
       !!
       INTEGER ::   ji, jj   ! dummy loop indices
-      !!----------------------------------------------------------------------
-
-      IF(wrk_in_use(2, 1,2,3,4,5,6))THEN
-         CALL ctl_warn('trd_mod: Requested workspace arrays already in use.')   ;   RETURN
-      END IF
+      REAL(wp), POINTER, DIMENSION(:,:)  :: ztswu, ztswv, ztbfu, ztbfv, z2dx, z2dy 
+      !!----------------------------------------------------------------------
+
+      CALL wrk_alloc( jpi, jpj, ztswu, ztswv, ztbfu, ztbfv, z2dx, z2dy )
 
       z2dx(:,:) = 0._wp   ;   z2dy(:,:) = 0._wp                            ! initialization of workspace arrays
@@ -101 +95 @@
             CASE ( jptra_trd_zad )   ;   CALL trd_icp( ptrdx, ptrdy, jpicpt_zad, ctype )   ! z- vertical adv 
                                          CALL trd_icp( ptrdx, ptrdy, jpicpt_zad, ctype )   
-                                         ! compute the surface flux condition wn(:,:,1)*tn(:,:,1)
-                                         z2dx(:,:) = wn(:,:,1)*tn(:,:,1)/fse3t(:,:,1)
-                                         z2dy(:,:) = wn(:,:,1)*sn(:,:,1)/fse3t(:,:,1)
+                                         ! compute the surface flux condition wn(:,:,1)*tsn(:,:,1,jp_tem)
+                                         z2dx(:,:) = wn(:,:,1)*tsn(:,:,1,jp_tem)/fse3t(:,:,1)
+                                         z2dy(:,:) = wn(:,:,1)*tsn(:,:,1,jp_sal)/fse3t(:,:,1)
                                          CALL trd_icp( z2dx , z2dy , jpicpt_zl1, ctype )   ! 1st z- vertical adv 
             END SELECT
@@ -227 +221 @@
       ENDIF
       !
-      IF( wrk_not_released(2, 1,2,3,4,5,6) )   CALL ctl_warn('trd_mod: Failed to release workspace arrays.')
+      CALL wrk_dealloc( jpi, jpj, ztswu, ztswv, ztbfu, ztbfv, z2dx, z2dy )
       !
    END SUBROUTINE trd_mod