Changeset 5147 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90

Timestamp:

2015-03-13T11:01:32+01:00 (9 years ago)

Author:

cetlod

Message:

Merge changes from dev_r5020_CNRS_DIAPTR into trunk, see ticket #1435

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -279 +279 @@
          END IF
          !                                 ! "Poleward" heat and salt transports (contribution of upstream fluxes)
-         IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( MOD( kt, nn_fptr ) == 0 ) ) THEN  
-           IF( jn == jp_tem )   htr_adv(:) = ptr_vj( zwy(:,:,:) )
-           IF( jn == jp_sal )   str_adv(:) = ptr_vj( zwy(:,:,:) )
+         IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
+           IF( jn == jp_tem )   htr_adv(:) = ptr_sj( zwy(:,:,:) )
+           IF( jn == jp_sal )   str_adv(:) = ptr_sj( zwy(:,:,:) )
          ENDIF
          !