Changeset 1970 for branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA

Timestamp:

2010-06-25T16:58:03+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 5: Add in changes from the trunk between revisions 1821 and 1879.

Location:

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA

Files:

• traadv_tvd.F90 (modified) (2 diffs)
• tranxt.F90 (modified) (2 diffs)

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -179 +179 @@
       END DO
 
+      ! "zonal" mean advective heat and salt transport
+      IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN
+         pht_adv(:) = ptr_vj( ztv(:,:,:) )
+         pst_adv(:) = ptr_vj( zsv(:,:,:) )
+      ENDIF
 
       ! Save the intermediate i / j / k advective trends for diagnostics
@@ -366 +371 @@
       ! "zonal" mean advective heat and salt transport
       IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN
-         pht_adv(:) = ptr_vj( ztv(:,:,:) )
-         pst_adv(:) = ptr_vj( zsv(:,:,:) )
+         pht_adv(:) = ptr_vj( ztv(:,:,:) ) + pht_adv(:)
+         pst_adv(:) = ptr_vj( zsv(:,:,:) ) + pst_adv(:)
       ENDIF
       !

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -38 +38 @@
    USE agrif_opa_update
    USE agrif_opa_interp
+   USE obc_oce 
 
    IMPLICIT NONE
@@ -101 +102 @@
       !
 #if defined key_obc
-      CALL obc_tra( kt )               ! OBC open boundaries
+      IF( lk_obc )   CALL obc_tra( kt )  ! OBC open boundaries
 #endif
 #if defined key_bdy