Changeset 6372 for branches/UKMO/dev_r5518_debug_isf_restart/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2016-03-08T11:12:40+01:00 (8 years ago)

Author:

frrh

Message:

Reverse previous merge.

File:

• branches/UKMO/dev_r5518_debug_isf_restart/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_debug_isf_restart/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -47 +47 @@
    USE timing          ! Timing
 #if defined key_agrif
+   USE agrif_opa_update
    USE agrif_opa_interp
 #endif
@@ -110 +111 @@
       ! Update after tracer on domain lateral boundaries
       ! 
+      CALL lbc_lnk( tsa(:,:,:,jp_tem), 'T', 1._wp )      ! local domain boundaries  (T-point, unchanged sign)
+      CALL lbc_lnk( tsa(:,:,:,jp_sal), 'T', 1._wp )
+      !
+#if defined key_bdy 
+      IF( lk_bdy )   CALL bdy_tra( kt )  ! BDY open boundaries
+#endif
 #if defined key_agrif
       CALL Agrif_tra                     ! AGRIF zoom boundaries
-#endif
-      !
-      CALL lbc_lnk( tsa(:,:,:,jp_tem), 'T', 1._wp )      ! local domain boundaries  (T-point, unchanged sign)
-      CALL lbc_lnk( tsa(:,:,:,jp_sal), 'T', 1._wp )
-      !
-#if defined key_bdy 
-      IF( lk_bdy )   CALL bdy_tra( kt )  ! BDY open boundaries
 #endif
  
@@ -149 +149 @@
          ELSE                 ;   CALL tra_nxt_fix( kt, nit000,         'TRA', tsb, tsn, tsa, jpts )  ! fixed    volume level 
          ENDIF
-      ENDIF     
-      !
-     ! trends computation
+      ENDIF 
+      !
+#if defined key_agrif
+      ! Update tracer at AGRIF zoom boundaries
+      IF( .NOT.Agrif_Root() )    CALL Agrif_Update_Tra( kt )      ! children only
+#endif      
+      !
+      ! trends computation
       IF( l_trdtra ) THEN      ! trend of the Asselin filter (tb filtered - tb)/dt     
          DO jk = 1, jpkm1