New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 11244 for NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST – NEMO

Ignore:
Timestamp:
2019-07-10T14:58:47+02:00 (5 years ago)
Author:
jchanut
Message:

#2199, clean old namelist variables

Location:
NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST/agrif_oce.F90

    r11219 r11244  
    2222   !                                              !!* Namelist namagrif: AGRIF parameters 
    2323   LOGICAL , PUBLIC ::   ln_spc_dyn    = .FALSE.   !: 
    24    INTEGER , PUBLIC, PARAMETER ::   nn_sponge_len = 2  !: Sponge width (in number of parent grid points) 
    2524   REAL(wp), PUBLIC ::   rn_sponge_tra = 2800.     !: sponge coeff. for tracers 
    2625   REAL(wp), PUBLIC ::   rn_sponge_dyn = 2800.     !: sponge coeff. for dynamics 
    2726   LOGICAL , PUBLIC ::   ln_chk_bathy  = .FALSE.   !: check of parent bathymetry  
    28    !                                              !!! OLD namelist names 
    29    REAL(wp), PUBLIC ::   visc_tra                  !: sponge coeff. for tracers 
    30    REAL(wp), PUBLIC ::   visc_dyn                  !: sponge coeff. for dynamics 
    31  
     27   ! 
     28   INTEGER , PUBLIC, PARAMETER ::   nn_sponge_len = 2  !: Sponge width (in number of parent grid points) 
    3229   LOGICAL , PUBLIC :: spongedoneT = .FALSE.       !: tracer   sponge layer indicator 
    3330   LOGICAL , PUBLIC :: spongedoneU = .FALSE.       !: dynamics sponge layer indicator 
  • NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST/agrif_oce_interp.F90

    r11226 r11244  
    964964      LOGICAL                         , INTENT(in   ) ::   before 
    965965      ! 
    966       INTEGER  ::   ji,jj 
     966      INTEGER  ::   ji, jj 
    967967      REAL(wp) ::   zrhox, zrhot, zt0, zt1, ztcoeff    
    968968      !!----------------------------------------------------------------------   
  • NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST/agrif_oce_sponge.F90

    r11205 r11244  
    154154         DO jj = 2, jpjm1 
    155155            DO ji = 2, jpim1   ! vector opt. 
    156                fsaht_spu(ji,jj) = 0.5_wp * visc_tra * ( ztabramp(ji,jj) + ztabramp(ji+1,jj  ) ) 
    157                fsaht_spv(ji,jj) = 0.5_wp * visc_tra * ( ztabramp(ji,jj) + ztabramp(ji  ,jj+1) ) 
     156               fsaht_spu(ji,jj) = 0.5_wp * rn_sponge_tra * ( ztabramp(ji,jj) + ztabramp(ji+1,jj  ) ) 
     157               fsaht_spv(ji,jj) = 0.5_wp * rn_sponge_tra * ( ztabramp(ji,jj) + ztabramp(ji  ,jj+1) ) 
    158158            END DO 
    159159         END DO 
     
    170170         DO jj = 2, jpjm1 
    171171            DO ji = 2, jpim1   ! vector opt. 
    172                fsahm_spt(ji,jj) = visc_dyn * ztabramp(ji,jj) 
    173                fsahm_spf(ji,jj) = 0.25_wp * visc_dyn * ( ztabramp(ji  ,jj  ) + ztabramp(ji  ,jj+1) & 
    174                                                      &  +ztabramp(ji+1,jj+1) + ztabramp(ji+1,jj  ) ) 
     172               fsahm_spt(ji,jj) = rn_sponge_dyn * ztabramp(ji,jj) 
     173               fsahm_spf(ji,jj) = 0.25_wp * rn_sponge_dyn * ( ztabramp(ji  ,jj  ) + ztabramp(ji  ,jj+1) & 
     174                                                          &  +ztabramp(ji+1,jj+1) + ztabramp(ji+1,jj  ) ) 
    175175            END DO 
    176176         END DO 
  • NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST/agrif_user.F90

    r11205 r11244  
    728728   ENDIF 
    729729   ! 
    730    ! convert DOCTOR namelist name into OLD names 
    731    visc_tra      = rn_sponge_tra 
    732    visc_dyn      = rn_sponge_dyn 
    733    ! 
    734    ! Check sponge length: 
    735 !   iminspon = MIN(FLOOR(REAL(jpiglo-4)/REAL(2*Agrif_irhox())), FLOOR(REAL(jpjglo-4)/REAL(2*Agrif_irhox())) ) 
    736 !   IF (lk_mpp) iminspon = MIN(iminspon,FLOOR(REAL(jpi-2)/REAL(Agrif_irhox())), FLOOR(REAL(jpj-2)/REAL(Agrif_irhox())) ) 
    737 !   IF (nn_sponge_len > iminspon)  CALL ctl_stop('agrif sponge length is too large') 
    738730   ! 
    739731   IF( agrif_oce_alloc()  > 0 )   CALL ctl_warn('agrif agrif_oce_alloc: allocation of arrays failed') 
Note: See TracChangeset for help on using the changeset viewer.