Changeset 14063 for NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/NST

Timestamp:

2020-12-03T17:45:05+01:00 (4 years ago)

Author:

laurent

Message:

Catch up with trunk at r14060

Location:

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/NST

Files:

• agrif_oce_interp.F90 (modified) (4 diffs)
• agrif_oce_sponge.F90 (modified) (1 diff)
• agrif_oce_update.F90 (modified) (9 diffs)
• agrif_user.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/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()

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/NST/agrif_oce_sponge.F90

@@ -32 +32 @@
 
    !! * Substitutions
+#  include "domzgr_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/NST/agrif_oce_update.F90

@@ -27 +27 @@
    USE vremap         ! Vertical remapping
    USE lbclnk 
-
+#if defined key_qco
+   USE domqco
+#endif
    IMPLICIT NONE
    PRIVATE
@@ -34 +36 @@
    PUBLIC   Update_Scales
 
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
@@ -191 +195 @@
    END SUBROUTINE Agrif_Update_Tke
 
-
    SUBROUTINE Agrif_Update_vvl( )
       !!---------------------------------------------
@@ -201 +204 @@
       IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update e3 from grid Number',Agrif_Fixed(), 'Step', Agrif_Nb_Step()
       !
+#if ! defined key_qco
       Agrif_UseSpecialValueInUpdate = .TRUE.
       Agrif_SpecialValueFineGrid = 0.
@@ -213 +217 @@
       CALL dom_vvl_update_UVF
       CALL Agrif_ParentGrid_To_ChildGrid()
+#else
+      CALL Agrif_ChildGrid_To_ParentGrid()
+      CALL Agrif_Update_qco
+      CALL Agrif_ParentGrid_To_ChildGrid()
+#endif
       !
    END SUBROUTINE Agrif_Update_vvl
 
+
+#if defined key_qco
+   SUBROUTINE Agrif_Update_qco
+      !!---------------------------------------------
+      !!       *** ROUTINE dom_Update_qco ***
+      !!---------------------------------------------
+      !
+      ! Save arrays prior update (needed for asselin correction)
+      r3t(:,:,Krhs_a) = r3t(:,:,Kmm_a)
+      r3u(:,:,Krhs_a) = r3u(:,:,Kmm_a)
+      r3v(:,:,Krhs_a) = r3v(:,:,Kmm_a)
+
+      ! Update r3x arrays from updated ssh
+      CALL dom_qco_zgr( Kbb_a, Kmm_a )
+      !
+   END SUBROUTINE Agrif_Update_qco
+#endif
+
+
+#if ! defined key_qco
    SUBROUTINE dom_vvl_update_UVF
       !!---------------------------------------------
@@ -224 +253 @@
       REAL(wp):: zcoef
       !!---------------------------------------------
-
       IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Finalize e3 on grid Number', &
                   & Agrif_Fixed(), 'Step', Agrif_Nb_Step()
@@ -290 +318 @@
       !
    END SUBROUTINE dom_vvl_update_UVF
+#endif
 
 #if defined key_vertical
@@ -1332 +1361 @@
    END SUBROUTINE updateAVM
 
+#if ! defined key_qco
    SUBROUTINE updatee3t(ptab_dum, i1, i2, j1, j2, k1, k2, before )
       !!---------------------------------------------
@@ -1443 +1473 @@
       !
    END SUBROUTINE updatee3t
+#endif
 
 #else

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/NST/agrif_user.F90

@@ -288 +288 @@
          CALL Agrif_Init_Variable(sshini_id, procname=agrif_initssh)
          CALL lbc_lnk( 'Agrif_Init_Domain', ssh(:,:,Kbb), 'T', 1. )
+#if ! defined key_qco
          DO jk = 1, jpk
                e3t(:,:,jk,Kbb) =  e3t_0(:,:,jk) * ( ht_0(:,:) + ssh(:,:,Kbb)  ) &
@@ -293 +294 @@
                         &              + e3t_0(:,:,jk) * ( 1._wp - tmask(:,:,jk) )
          END DO
+#endif
       ENDIF