Changeset 132 for trunk/NEMO/OPA_SRC/TRA/traadv_cen2.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/traadv_cen2.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -20 +20 @@
    USE lbclnk          ! ocean lateral boundary condition (or mpp link)
    USE in_out_manager  ! I/O manager
-   USE ptr             ! poleward transport diagnostics
+   USE diaptr          ! poleward transport diagnostics
 
    IMPLICIT NONE
@@ -307 +307 @@
       ENDIF
 
-#if defined key_diaptr
       ! "zonal" mean advective heat and salt transport 
-      IF( MOD( kt, nf_ptr ) == 0 ) THEN
+      IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN
 # if defined key_s_coord || defined key_partial_steps
-         pht_adv(:) = prt_vj( zwy(:,:,:) )
-         pst_adv(:) = prt_vj( zwz(:,:,:) )
+         pht_adv(:) = ptr_vj( zwy(:,:,:) )
+         pst_adv(:) = ptr_vj( zwz(:,:,:) )
 # else
          DO jk = 1, jpkm1
@@ -322 +321 @@
             END DO
          END DO
-         pht_adv(:) = prt_vj( zwy(:,:,:) )
-         pst_adv(:) = prt_vj( zwz(:,:,:) )
+         pht_adv(:) = ptr_vj( zwy(:,:,:) )
+         pst_adv(:) = ptr_vj( zwz(:,:,:) )
 # endif
       ENDIF
-#endif