Changeset 5147 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.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/traldf_bilap.F90 (modified) (1 diff)

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

@@ -173 +173 @@
          !                                                
          ! "zonal" mean lateral diffusive heat and salt transport
-         IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( MOD( kt, nn_fptr ) == 0 ) ) THEN  
-           IF( jn == jp_tem )  htr_ldf(:) = ptr_vj( ztv(:,:,:) )
-           IF( jn == jp_sal )  str_ldf(:) = ptr_vj( ztv(:,:,:) )
+         IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
+           IF( jn == jp_tem )  htr_ldf(:) = ptr_sj( ztv(:,:,:) )
+           IF( jn == jp_sal )  str_ldf(:) = ptr_sj( ztv(:,:,:) )
          ENDIF
          !                                                ! ===========