Changeset 5709 for branches/UKMO/DEV_r5107_dynvor_updates/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90

Timestamp:

2015-08-26T16:14:53+02:00 (9 years ago)

Author:

davestorkey

Message:

Updating UKMO/DEV_r5107_dynvor_updates branch to be relative to revision 5518 of the trunk
(= branching point for NEMO 3.6_STABLE).

File:

• branches/UKMO/DEV_r5107_dynvor_updates/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (1 diff)

branches/UKMO/DEV_r5107_dynvor_updates/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
          !