Changeset 132 for trunk/NEMO/OPA_SRC/TRA/traldf_bilapg.F90

Timestamp:

2004-07-07T14:51:53+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE082 : Finalization of the poleward transport diagnostics

File:

• trunk/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/TRA/traldf_bilapg.F90

@@ -20 +20 @@
    USE ldfslp          ! iso-neutral slopes available
    USE lbclnk          ! ocean lateral boundary condition (or mpp link)
-   USE ptr             ! poleward transport diagnostics 
+   USE diaptr          ! poleward transport diagnostics 
 
    IMPLICIT NONE
@@ -67 +67 @@
       !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
       !!----------------------------------------------------------------------
+      !! * Modules used
+      USE oce           , wk1 => ua,  &  ! use ua as workspace
+         &                wk2 => va      ! use va as workspace
+
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt           ! ocean time-step index
@@ -73 +77 @@
       INTEGER ::   ji, jj, jk                 ! dummy loop indices
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
-         wk1, wk2,            &  ! work array used for rotated biharmonic
-         wk3, wk4                ! operator on tracers and/or momentum
+         wk3, wk4                ! work array used for rotated biharmonic
+         !                       ! operator on tracers and/or momentum
       !!----------------------------------------------------------------------
 
@@ -189 +193 @@
          zcof0, zcof1, zcof2,          &
          zcof3, zcof4
-      REAL(wp), DIMENSION(jpi,jpj) ::   &
-         zftu, zftv, zfsu, zfsv,       &  ! workspace
+      REAL(wp), DIMENSION(jpi,jpj) ::  &
+         zftu, zfsu,                   &  ! workspace
          zdkt, zdk1t,                  &
          zdks, zdk1s
-      REAL(wp), DIMENSION(jpi,jpk) ::   &
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
+         zftv, zfsv                       ! workspace (only v components for ptr)
+      REAL(wp), DIMENSION(jpi,jpk) ::  &
          zftw, zfsw,                   &  ! workspace
          zdit, zdjt, zdj1t,            &
@@ -240 +246 @@
                              +zdk1t(ji+1,jj) + zdkt (ji,jj) )  )
 
-               zftv(ji,jj)= vmask(ji,jj,jk) *   &
+               zftv(ji,jj,jk)= vmask(ji,jj,jk) *   &
                   (  zabe2 *( pt(ji,jj+1,jk) - pt(ji,jj,jk) )   &
                    + zcof2 *( zdkt (ji,jj+1) + zdk1t(ji,jj)     &
@@ -250 +256 @@
                              +zdk1s(ji+1,jj) + zdks (ji,jj) )  )
 
-               zfsv(ji,jj)= vmask(ji,jj,jk) *   &
+               zfsv(ji,jj,jk)= vmask(ji,jj,jk) *   &
                   (  zabe2 *( ps(ji,jj+1,jk) - ps(ji,jj,jk) )   &
                    + zcof2 *( zdks (ji,jj+1) + zdk1s(ji,jj)     &
@@ -263 +269 @@
          DO jj = 2 , jpjm1
             DO ji = 2 , jpim1
-               ztah = zftu(ji,jj) - zftu(ji-1,jj) + zftv(ji,jj) - zftv(ji,jj-1)
-               zsah = zfsu(ji,jj) - zfsu(ji-1,jj) + zfsv(ji,jj) - zfsv(ji,jj-1)
+               ztah = zftu(ji,jj) - zftu(ji-1,jj) + zftv(ji,jj,jk) - zftv(ji,jj-1,jk)
+               zsah = zfsu(ji,jj) - zfsu(ji-1,jj) + zfsv(ji,jj,jk) - zfsv(ji,jj-1,jk)
                plt(ji,jj,jk) = ztah
                pls(ji,jj,jk) = zsah
@@ -273 +279 @@
       !                                                ! ===============
 
-      IF( kaht == 2 .AND. MOD( kt, nf_ptr ) == 0 ) THEN
-#if defined key_diaptr
-         ! "zonal" mean diffusive heat and salt transport
-!         pht_ldf(:) = prt_vj( zftv(:,:) )
-!         pst_ldf(:) = prt_vj( zfsv(:,:) )
-        write(numout,cform_err)
-        nstop = nstop + 1
-#endif
+      ! "zonal" mean diffusive heat and salt transport
+      IF( ln_diaptr .AND. ( kaht == 2 ) .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN
+         pht_ldf(:) = ptr_vj( zftv(:,:,:) )
+         pst_ldf(:) = ptr_vj( zfsv(:,:,:) )
       ENDIF
-
 
       !                             ! ************ !   ! ===============