Changeset 14062 for NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/NST/agrif_oce_interp.F90

Timestamp:

2020-12-03T17:39:30+01:00 (3 years ago)

Author:

ayoung

Message:

Updating to trunk at 14060 and resolving conflicts with ticket #2480. Ticket #2506.

File:

• NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/NST/agrif_oce_interp.F90 (modified) (4 diffs)

NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/NST/agrif_oce_interp.F90

@@ -28 +28 @@
    USE agrif_oce
    USE phycst
-   USE dynspg_ts, ONLY: un_adv, vn_adv
+!!!   USE dynspg_ts, ONLY: un_adv, vn_adv
    !
    USE in_out_manager
@@ -50 +50 @@
    INTEGER ::   bdy_tinterp = 0
 
-   !!----------------------------------------------------------------------
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
@@ -1192 +1193 @@
       !!----------------------------------------------------------------------  
       IF( before ) THEN
-         IF ( ln_bt_fw ) THEN
+!         IF ( ln_bt_fw ) THEN
             ptab(i1:i2,j1:j2) = e2u(i1:i2,j1:j2) * ub2_b(i1:i2,j1:j2)
-         ELSE
-            ptab(i1:i2,j1:j2) = e2u(i1:i2,j1:j2) * un_adv(i1:i2,j1:j2)
-         ENDIF
+!         ELSE
+!            ptab(i1:i2,j1:j2) = e2u(i1:i2,j1:j2) * un_adv(i1:i2,j1:j2)
+!         ENDIF
       ELSE
          zrhot = Agrif_rhot()
@@ -1228 +1229 @@
       !
       IF( before ) THEN
-         IF ( ln_bt_fw ) THEN
+!         IF ( ln_bt_fw ) THEN
             ptab(i1:i2,j1:j2) = e1v(i1:i2,j1:j2) * vb2_b(i1:i2,j1:j2)
-         ELSE
-            ptab(i1:i2,j1:j2) = e1v(i1:i2,j1:j2) * vn_adv(i1:i2,j1:j2)
-         ENDIF
+!         ELSE
+!            ptab(i1:i2,j1:j2) = e1v(i1:i2,j1:j2) * vn_adv(i1:i2,j1:j2)
+!         ENDIF
       ELSE      
          zrhot = Agrif_rhot()