Changeset 8863


Ignore:
Timestamp:
2017-11-30T17:19:42+01:00 (3 years ago)
Author:
flavoni
Message:

(ENHANCE-09): fix AGRIF reproducibility problem

Location:
branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/CONFIG/SHARED/namelist_ref

    r8706 r8863  
    856856   rn_maxfac     = 1.0         !  multiplier of theorectical upper limit 
    857857/ 
    858  
     858! 
    859859!!====================================================================== 
    860860!!                     vertical physics namelists                     !! 
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

    r8637 r8863  
    602602      !!----------------------------------------------------------------------   
    603603      ! 
    604       zalpha = REAL( Agrif_NbStepint() + Agrif_IRhot() - 1, wp ) / REAL( Agrif_IRhot(), wp ) 
    605       IF( zalpha > 1. )   zalpha = 1. 
     604      zalpha = 1._wp ! JC: proper time interpolation impossible  
     605                     ! => use last available value from parent  
    606606      ! 
    607607      Agrif_SpecialValue    = 0.e0 
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90

    r8568 r8863  
    2727   USE sbc_oce        ! surface module (only for nn_isf in the option compatibility test) 
    2828   USE sbcrnf         ! surface boundary condition: runoff variables 
     29#if defined key_agrif 
     30   USE agrif_opa_interp 
     31#endif 
    2932   ! 
    3033   USE in_out_manager ! I/O manager 
     
    275278      IF( ln_zdfiwm )   CALL zdf_iwm( kt, avm, avt, avs )   ! internal wave (de Lavergne et al 2017) 
    276279 
     280#if defined key_agrif  
     281      ! interpolation parent grid => child grid for avm_k ( ex : at west border: 
     282      ! update column 1 and 2) 
     283      CALL Agrif_tke 
     284#endif 
    277285 
    278286      !                                         !* Lateral boundary conditions (sign unchanged) 
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

    r8568 r8863  
    164164      !!---------------------------------------------------------------------- 
    165165      ! 
    166 #if defined key_agrif  
    167       ! interpolation parent grid => child grid for avm_k ( ex : at west border: update column 1 and 2) 
    168       IF( .NOT.Agrif_Root() )   CALL Agrif_Tke 
    169 #endif 
    170       ! 
    171166      CALL tke_tke( gdepw_n, e3t_n, e3w_n, p_sh2, p_avm, p_avt )   ! now tke (en) 
    172167      ! 
    173168      CALL tke_avn( gdepw_n, e3t_n, e3w_n,        p_avm, p_avt )   ! now avt, avm, dissl 
    174       ! 
    175 #if defined key_agrif 
    176       ! Update child grid f => parent grid  
    177       IF( .NOT.Agrif_Root() )   CALL Agrif_Update_Tke( kt )      ! children only 
    178 #endif       
    179169      ! 
    180170  END SUBROUTINE zdf_tke 
Note: See TracChangeset for help on using the changeset viewer.