Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.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/DIA/diaar5.F90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90

@@ -19 +19 @@
    USE lib_mpp        ! distribued memory computing library
    USE iom            ! I/O manager library
+   USE timing         ! preformance summary
+   USE wrk_nemo       ! working arrays
 
    IMPLICIT NONE
@@ -65 +67 @@
       !! ** Purpose :   compute and output some AR5 diagnostics
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zarea_ssh => wrk_2d_1 , zbotpres => wrk_2d_2   ! 2D workspace
-      USE wrk_nemo, ONLY:   zrhd      => wrk_3d_1 , zrhop    => wrk_3d_2   ! 3D      -
-      USE wrk_nemo, ONLY:   ztsn      => wrk_4d_1                          ! 4D      -
       !
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -74 +72 @@
       INTEGER  ::   ji, jj, jk                      ! dummy loop arguments
       REAL(wp) ::   zvolssh, zvol, zssh_steric, zztmp, zarho, ztemp, zsal, zmass
+      !
+      REAL(wp), POINTER, DIMENSION(:,:)     :: zarea_ssh , zbotpres       ! 2D workspace 
+      REAL(wp), POINTER, DIMENSION(:,:,:)   :: zrhd , zrhop               ! 3D workspace
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztsn                       ! 4D workspace
       !!--------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 1,2) .OR.   &
-          wrk_in_use(3, 1,2) .OR.   &
-          wrk_in_use(4, 1)   ) THEN
-         CALL ctl_stop('dia_ar5: requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
+      IF( nn_timing == 1 )   CALL timing_start('dia_ar5')
+ 
+      CALL wrk_alloc( jpi , jpj              , zarea_ssh , zbotpres )
+      CALL wrk_alloc( jpi , jpj , jpk        , zrhd      , zrhop    )
+      CALL wrk_alloc( jpi , jpj , jpk , jpts , ztsn                 )
 
       CALL iom_put( 'cellthc', fse3t(:,:,:) )
@@ -94 +95 @@
       CALL iom_put( 'sshtot', zvolssh / area_tot )
 
-      !                                         ! thermosteric ssh
-      ztsn(:,:,:,jp_tem) = tn (:,:,:)
+      !                     
+      ztsn(:,:,:,jp_tem) = tsn(:,:,:,jp_tem)                    ! thermosteric ssh
       ztsn(:,:,:,jp_sal) = sn0(:,:,:)
       CALL eos( ztsn, zrhd )                       ! now in situ density using initial salinity
@@ -138 +139 @@
             DO ji = 1, jpi
                zztmp = area(ji,jj) * fse3t(ji,jj,jk)
-               ztemp = ztemp + zztmp * tn(ji,jj,jk)
-               zsal  = zsal  + zztmp * sn(ji,jj,jk)
+               ztemp = ztemp + zztmp * tsn(ji,jj,jk,jp_tem)
+               zsal  = zsal  + zztmp * tsn(ji,jj,jk,jp_sal)
             END DO
          END DO
       END DO
       IF( .NOT.lk_vvl ) THEN
-         ztemp = ztemp + SUM( zarea_ssh(:,:) * tn(:,:,1) )
-         zsal  = zsal  + SUM( zarea_ssh(:,:) * sn(:,:,1) )
+         ztemp = ztemp + SUM( zarea_ssh(:,:) * tsn(:,:,1,jp_tem) )
+         zsal  = zsal  + SUM( zarea_ssh(:,:) * tsn(:,:,1,jp_sal) )
       ENDIF
       IF( lk_mpp ) THEN  
@@ -160 +161 @@
       CALL iom_put( 'saltot' , zsal  )
       !
-      IF( wrk_not_released(2, 1,2) .OR.   &
-          wrk_not_released(3, 1,2) .OR.   &
-          wrk_not_released(4, 1)   )   CALL ctl_stop('dia_ar5: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi , jpj              , zarea_ssh , zbotpres )
+      CALL wrk_dealloc( jpi , jpj , jpk        , zrhd      , zrhop    )
+      CALL wrk_dealloc( jpi , jpj , jpk , jpts , ztsn                 )
+      !
+      IF( nn_timing == 1 )   CALL timing_stop('dia_ar5')
       !
    END SUBROUTINE dia_ar5
@@ -173 +176 @@
       !! ** Purpose :   initialization for AR5 diagnostic computation
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   wrk_4d_1      ! 4D workspace
-      !
       INTEGER  ::   inum
       INTEGER  ::   ik
@@ -183 +183 @@
       !!----------------------------------------------------------------------
       !
-      IF(wrk_in_use(4, 1) ) THEN
-         CALL ctl_stop('dia_ar5_init: requested workspace array unavailable.')   ;   RETURN
-      ENDIF
-      zsaldta => wrk_4d_1(:,:,:,1:2)
-
+      IF( nn_timing == 1 )   CALL timing_start('dia_ar5_init')
+      !
+      CALL wrk_alloc( jpi , jpj , jpk, jpts, zsaldta )
       !                                      ! allocate dia_ar5 arrays
       IF( dia_ar5_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'dia_ar5_init : unable to allocate arrays' )
@@ -221 +219 @@
       ENDIF
       !
-      IF( wrk_not_released(4, 1) )   CALL ctl_stop('dia_ar5_init: failed to release workspace array')
+      CALL wrk_dealloc( jpi , jpj , jpk, jpts, zsaldta )
+      !
+      IF( nn_timing == 1 )   CALL timing_stop('dia_ar5_init')
       !
    END SUBROUTINE dia_ar5_init