Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.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/trdmld.F90 (modified) (10 diffs)

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

@@ -38 +38 @@
    USE restart         ! for lrst_oce
    USE lib_mpp         ! MPP library
+   USE wrk_nemo        ! Memory allocation
 
    IMPLICIT NONE
@@ -93 +94 @@
       !!            surface and the control surface is called "mixed-layer"
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zvlmsk => wrk_2d_10     ! 2D workspace
       !
       INTEGER                         , INTENT( in ) ::   ktrd       ! ocean trend index
@@ -102 +101 @@
       !
       INTEGER ::   ji, jj, jk, isum
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 10) ) THEN
-         CALL ctl_stop('trd_mld_zint : requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
+      REAL(wp), POINTER, DIMENSION(:,:)  :: zvlmsk 
+      !!----------------------------------------------------------------------
+
+      CALL wrk_alloc( jpi, jpj, zvlmsk ) 
 
       ! I. Definition of control surface and associated fields
@@ -195 +193 @@
       END SELECT
       !
-      IF( wrk_not_released(2, 10) )   CALL ctl_stop('trd_mld_zint: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj, zvlmsk ) 
       !
    END SUBROUTINE trd_mld_zint
@@ -247 +245 @@
       !!       - See NEMO documentation (in preparation)
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: ztmltot => wrk_2d_1,  zsmltot => wrk_2d_2 ! dT/dt over the anlysis window (including Asselin)
-      USE wrk_nemo, ONLY: ztmlres => wrk_2d_3,  zsmlres => wrk_2d_4 ! residual = dh/dt entrainment term
-      USE wrk_nemo, ONLY: ztmlatf => wrk_2d_5,  zsmlatf => wrk_2d_6 ! needed for storage only
-      USE wrk_nemo, ONLY: ztmltot2 => wrk_2d_7, ztmlres2 => wrk_2d_8, ztmltrdm2 => wrk_2d_9    ! \  working arrays to diagnose the trends
-      USE wrk_nemo, ONLY: zsmltot2 => wrk_2d_10, zsmlres2 => wrk_2d_11, zsmltrdm2 => wrk_2d_12 !  > associated with the time meaned ML T & S
-      USE wrk_nemo, ONLY: ztmlatf2 => wrk_2d_13, zsmlatf2 => wrk_2d_14    
-      USE wrk_nemo, ONLY: wrk_3d_1, wrk_3d_2                     ! /
       !
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -261 +251 @@
       LOGICAL :: lldebug = .TRUE.
       REAL(wp) :: zavt, zfn, zfn2
+      !                                              ! z(ts)mltot : dT/dt over the anlysis window (including Asselin)
+      !                                              ! z(ts)mlres : residual = dh/dt entrainment term
+      REAL(wp), POINTER, DIMENSION(:,:  ) ::  ztmltot , zsmltot , ztmlres , zsmlres , ztmlatf , zsmlatf
+      REAL(wp), POINTER, DIMENSION(:,:  ) ::  ztmltot2, zsmltot2, ztmlres2, zsmlres2, ztmlatf2, zsmlatf2, ztmltrdm2, zsmltrdm2  
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztmltrd2, zsmltrd2   ! only needed for mean diagnostics
 #if defined key_dimgout
@@ -267 +261 @@
 #endif
       !!----------------------------------------------------------------------
-      
-      ! Check that the workspace arrays are all OK to be used
-      IF( wrk_in_use(2, 1,2,3,4,5,6,7,8,9,10,11,12,13,14)  .OR. &
-          wrk_in_use(3, 1,2)                                 ) THEN
-         CALL ctl_stop('trd_mld : requested workspace arrays unavailable')   ;   RETURN
-      ELSE IF(jpltrd > jpk) THEN
-         ! ARPDBG, is this reasonable or will this cause trouble in the future?
-         CALL ctl_stop('trd_mld : no. of mixed-layer trends (jpltrd) exceeds no. of model levels so cannot use 3D workspaces.')
-         RETURN         
-      END IF
-      ! Set-up pointers into sub-arrays of 3d-workspaces
-      ztmltrd2 => wrk_3d_1(1:,:,1:jpltrd)
-      zsmltrd2 => wrk_3d_2(1:,:,1:jpltrd)
+  
+      CALL wrk_alloc( jpi, jpj,         ztmltot , zsmltot , ztmlres , zsmlres , ztmlatf , zsmlatf                        )
+      CALL wrk_alloc( jpi, jpj,         ztmltot2, zsmltot2, ztmlres2, zsmlres2, ztmlatf2, zsmlatf2, ztmltrdm2, zsmltrdm2 )  
+      CALL wrk_alloc( jpi, jpj, jpltrd, ztmltrd2, zsmltrd2                                                               )
 
       ! ======================================================================
@@ -293 +278 @@
                zavt = avt(ji,jj,ik)
                tmltrd(ji,jj,jpmld_zdf) = - zavt / fse3w(ji,jj,ik) * tmask(ji,jj,ik)  &
-                  &                      * ( tn(ji,jj,ik-1) - tn(ji,jj,ik) )         &
+                  &                      * ( tsn(ji,jj,ik-1,jp_tem) - tsn(ji,jj,ik,jp_tem) )         &
                   &                      / MAX( 1., rmld(ji,jj) ) * tmask(ji,jj,1)
                zavt = fsavs(ji,jj,ik)
                smltrd(ji,jj,jpmld_zdf) = - zavt / fse3w(ji,jj,ik) * tmask(ji,jj,ik)  &
-                  &                      * ( sn(ji,jj,ik-1) - sn(ji,jj,ik) )         &
+                  &                      * ( tsn(ji,jj,ik-1,jp_sal) - tsn(ji,jj,ik,jp_sal) )         &
                   &                      / MAX( 1., rmld(ji,jj) ) * tmask(ji,jj,1)
             END DO
@@ -334 +319 @@
       tml(:,:) = 0.e0   ;   sml(:,:) = 0.e0
       DO jk = 1, jpktrd - 1
-         tml(:,:) = tml(:,:) + wkx(:,:,jk) * tn(:,:,jk)
-         sml(:,:) = sml(:,:) + wkx(:,:,jk) * sn(:,:,jk) 
+         tml(:,:) = tml(:,:) + wkx(:,:,jk) * tsn(:,:,jk,jp_tem)
+         sml(:,:) = sml(:,:) + wkx(:,:,jk) * tsn(:,:,jk,jp_sal)
       END DO
 
@@ -740 +725 @@
       IF( lrst_oce )   CALL trd_mld_rst_write( kt ) 
 
-      IF( wrk_not_released(2, 1,2,3,4,5,6,7,8,9,10,11,12,13,14)  .OR. &
-          wrk_not_released(3, 1,2)                                )   &
-          CALL ctl_stop('trd_mld : failed to release workspace arrays.')
+      CALL wrk_dealloc( jpi, jpj,         ztmltot , zsmltot , ztmlres , zsmlres , ztmlatf , zsmlatf                        )
+      CALL wrk_dealloc( jpi, jpj,         ztmltot2, zsmltot2, ztmlres2, zsmlres2, ztmlatf2, zsmlatf2, ztmltrdm2, zsmltrdm2 )  
+      CALL wrk_dealloc( jpi, jpj, jpltrd, ztmltrd2, zsmltrd2                                                               )
       !
    END SUBROUTINE trd_mld