Changeset 8201 for branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

Timestamp:

2017-06-21T16:27:21+02:00 (7 years ago)

Author:

frrh

Message:

Merge MEDUSA branch using command:

svn merge -r 5711:8182 \u200b\u200bsvn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/NERC/dev_r5518_NOC_MEDUSA_Stable

and run "fcm conflicts" to resolve conflicts - mainly tree conflicts in AGRIF files.

File:

• branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -29 +29 @@
    USE trdtra
    USE prtctl_trc      ! Print control
+   !! USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
 
    IMPLICIT NONE
@@ -73 +74 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
-      INTEGER ::   jk 
+      INTEGER ::   jk, jn 
       CHARACTER (len=22) ::   charout
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zun, zvn, zwn  ! effective velocity
@@ -108 +109 @@
       zvn(:,:,jpk) = 0._wp                                                     ! no transport trough the bottom
       zwn(:,:,jpk) = 0._wp                                                     ! no transport trough the bottom
+      ! 
+      !! Jpalm -- 14-01-2016 -- restart and proc pb - try this... 
+      !! DO jn = 1, jptra
+      !!   CALL lbc_lnk( trn(:,:,:,jn), 'T', 1. )
+      !!   CALL lbc_lnk( trb(:,:,:,jn), 'T', 1. )
+      !! END DO
+      !
 
       IF( lk_traldf_eiv .AND. .NOT. ln_traldf_grif )   &  ! add the eiv transport (if necessary)