Changeset 5462 for branches/UKMO/restart_datestamp/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90

Timestamp:

2015-06-22T16:40:58+02:00 (9 years ago)

Author:

davestorkey

Message:

Update UKMO/restart_datestamp branch to revision 5442 of trunk. Also clear the SVN keywords again - necessary after the update step.

File:

• branches/UKMO/restart_datestamp/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) (1 diff)

branches/UKMO/restart_datestamp/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90

@@ -177 +177 @@
          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( ztv(:,:,:) )
-            IF( jn == jp_sal )  str_adv(:) = ptr_vj( ztv(:,:,:) )
+         IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
+            IF( jn == jp_tem )  htr_adv(:) = ptr_sj( ztv(:,:,:) )
+            IF( jn == jp_sal )  str_adv(:) = ptr_sj( ztv(:,:,:) )
          ENDIF