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 13232 – NEMO

Changeset 13232


Ignore:
Timestamp:
2020-07-02T18:38:03+02:00 (4 years ago)
Author:
smasson
Message:

dev_r12558_HPC-08_epico_Extra_Halo: final-finish merge with trunk@13218, see #2366

Location:
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/NST/agrif_oce_sponge.F90

    r13231 r13232  
    109109      REAL(wp) ::   z1_ispongearea, z1_jspongearea 
    110110      REAL(wp), DIMENSION(jpi,jpj) :: ztabramp 
    111 #if defined key_vertical 
    112       REAL(wp), DIMENSION(jpi,jpj) :: ztabrampu 
    113       REAL(wp), DIMENSION(jpi,jpj) :: ztabrampv 
    114 #endif 
    115111      REAL(wp), DIMENSION(jpjmax)  :: zmskwest,  zmskeast 
    116112      REAL(wp), DIMENSION(jpimax)  :: zmsknorth, zmsksouth 
     
    304300       
    305301      IF( .NOT. spongedoneT .AND. .NOT. spongedoneU ) THEN 
    306          CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1., fspv, 'V', 1., fspt, 'T', 1., fspf, 'F', 1. ) 
     302         CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1._wp, fspv, 'V', 1._wp, fspt, 'T', 1._wp, fspf, 'F', 1._wp ) 
    307303         spongedoneT = .TRUE. 
    308304         spongedoneU = .TRUE. 
    309305      ENDIF 
    310306      IF( .NOT. spongedoneT ) THEN 
    311          CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1., fspv, 'V', 1. ) 
     307         CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1._wp, fspv, 'V', 1._wp ) 
    312308         spongedoneT = .TRUE. 
    313309      ENDIF 
    314310      IF( .NOT. spongedoneT .AND. .NOT. spongedoneU ) THEN 
    315          CALL lbc_lnk_multi( 'agrif_Sponge', fspt, 'T', 1., fspf, 'F', 1. ) 
     311         CALL lbc_lnk_multi( 'agrif_Sponge', fspt, 'T', 1._wp, fspf, 'F', 1._wp ) 
    316312         spongedoneU = .TRUE. 
    317313      ENDIF 
     
    347343   END SUBROUTINE Agrif_Sponge 
    348344 
     345    
    349346   SUBROUTINE interptsn_sponge( tabres, i1, i2, j1, j2, k1, k2, n1, n2, before ) 
    350347      !!---------------------------------------------------------------------- 
     
    514511   END SUBROUTINE interptsn_sponge 
    515512 
     513    
    516514   SUBROUTINE interpun_sponge(tabres,i1,i2,j1,j2,k1,k2,m1,m2, before) 
    517515      !!--------------------------------------------- 
     
    522520      LOGICAL, INTENT(in) :: before 
    523521 
    524       INTEGER :: ji,jj,jk,jmax 
    525       INTEGER :: ind1 
     522      INTEGER  :: ji,jj,jk,jmax 
     523      INTEGER  :: ind1 
    526524      ! sponge parameters  
    527525      REAL(wp) :: ze2u, ze1v, zua, zva, zbtr, zhtot 
     
    691689   END SUBROUTINE interpun_sponge 
    692690 
    693    SUBROUTINE interpvn_sponge(tabres,i1,i2,j1,j2,k1,k2,m1,m2, before,nb,ndir) 
     691    
     692   SUBROUTINE interpvn_sponge(tabres,i1,i2,j1,j2,k1,k2,m1,m2, before) 
    694693      !!--------------------------------------------- 
    695694      !!   *** ROUTINE interpvn_sponge *** 
     
    698697      REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2,m1:m2), INTENT(inout) :: tabres 
    699698      LOGICAL, INTENT(in) :: before 
    700       INTEGER, INTENT(in) :: nb , ndir 
    701699      ! 
    702700      INTEGER  ::   ji, jj, jk, imax 
     701      INTEGER  :: ind1 
    703702      REAL(wp) ::   ze2u, ze1v, zua, zva, zbtr, zhtot 
    704703      REAL(wp), DIMENSION(i1:i2,j1:j2,1:jpk) :: vbdiff 
  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/DYN/sshwzv.F90

    r13230 r13232  
    2828   USE bdydyn2d       ! bdy_ssh routine 
    2929#if defined key_agrif 
     30   USE agrif_oce 
    3031   USE agrif_oce_interp 
    3132#endif 
     
    200201      ENDIF 
    201202      ! 
     203#if defined key_agrif 
    202204      IF( .NOT. AGRIF_Root() ) THEN 
    203205         ! 
     
    244246         ! 
    245247      ENDIF  
     248#endif 
    246249      ! 
    247250      IF( ln_timing )   CALL timing_stop('wzv') 
Note: See TracChangeset for help on using the changeset viewer.