Changeset 8863

Timestamp:

2017-11-30T17:19:42+01:00 (6 years ago)

Author:

flavoni

Message:

(ENHANCE-09): fix AGRIF reproducibility problem

Location:

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• NEMO/NST_SRC/agrif_opa_interp.F90 (modified) (1 diff)
• NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (1 diff)

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -856 +856 @@
    rn_maxfac     = 1.0         !  multiplier of theorectical upper limit
 /
-
+!
 !!======================================================================
 !!                     vertical physics namelists                     !!

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -602 +602 @@
       !!----------------------------------------------------------------------  
       !
-      zalpha = REAL( Agrif_NbStepint() + Agrif_IRhot() - 1, wp ) / REAL( Agrif_IRhot(), wp )
-      IF( zalpha > 1. )   zalpha = 1.
+      zalpha = 1._wp ! JC: proper time interpolation impossible 
+                     ! => use last available value from parent 
       !
       Agrif_SpecialValue    = 0.e0

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90

@@ -27 +27 @@
    USE sbc_oce        ! surface module (only for nn_isf in the option compatibility test)
    USE sbcrnf         ! surface boundary condition: runoff variables
+#if defined key_agrif
+   USE agrif_opa_interp
+#endif
    !
    USE in_out_manager ! I/O manager
@@ -275 +278 @@
       IF( ln_zdfiwm )   CALL zdf_iwm( kt, avm, avt, avs )   ! internal wave (de Lavergne et al 2017)
 
+#if defined key_agrif 
+      ! interpolation parent grid => child grid for avm_k ( ex : at west border:
+      ! update column 1 and 2)
+      CALL Agrif_tke
+#endif
 
       !                                         !* Lateral boundary conditions (sign unchanged)

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -164 +164 @@
       !!----------------------------------------------------------------------
       !
-#if defined key_agrif 
-      ! interpolation parent grid => child grid for avm_k ( ex : at west border: update column 1 and 2)
-      IF( .NOT.Agrif_Root() )   CALL Agrif_Tke
-#endif
-      !
       CALL tke_tke( gdepw_n, e3t_n, e3w_n, p_sh2, p_avm, p_avt )   ! now tke (en)
       !
       CALL tke_avn( gdepw_n, e3t_n, e3w_n,        p_avm, p_avt )   ! now avt, avm, dissl
-      !
-#if defined key_agrif
-      ! Update child grid f => parent grid 
-      IF( .NOT.Agrif_Root() )   CALL Agrif_Update_Tke( kt )      ! children only
-#endif      
       !
   END SUBROUTINE zdf_tke