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 13286 for NEMO/trunk/src/OCE/LDF – NEMO

Ignore:
Timestamp:
2020-07-09T17:48:29+02:00 (4 years ago)
Author:
smasson
Message:

trunk: merge extra halos branch in trunk, see #2366

Location:
NEMO/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • NEMO/trunk

    • Property svn:externals

      •  

        old new  
        22^/utils/build/makenemo@HEAD   makenemo 
        33^/utils/build/mk@HEAD         mk 
        4 ^/utils/tools/@HEAD           tools 
         4^/utils/tools@HEAD            tools 
        55^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        … …  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@12931        sette 
         10^/utils/CI/r12931_sette_ticket2366@HEAD  sette 

  • NEMO/trunk/src/OCE/LDF/ldfdyn.F90

    r13226 r13286  
    267267            IF(lwp) WRITE(numout,*) '   ==>>>   eddy viscosity = F(i,j) read in eddy_viscosity.nc file' 
    268268            CALL iom_open( 'eddy_viscosity_2D.nc', inum ) 
    269             CALL iom_get ( inum, jpdom_data, 'ahmt_2d', ahmt(:,:,1) ) 
    270             CALL iom_get ( inum, jpdom_data, 'ahmf_2d', ahmf(:,:,1) ) 
     269            CALL iom_get ( inum, jpdom_global, 'ahmt_2d', ahmt(:,:,1), cd_type = 'T', psgn = 1._wp ) 
     270            CALL iom_get ( inum, jpdom_global, 'ahmf_2d', ahmf(:,:,1), cd_type = 'F', psgn = 1._wp ) 
    271271            CALL iom_close( inum ) 
    272272            DO jk = 2, jpkm1 
    … …  
    284284            IF(lwp) WRITE(numout,*) '   ==>>>   eddy viscosity = F(i,j,k) read in eddy_viscosity_3D.nc file' 
    285285            CALL iom_open( 'eddy_viscosity_3D.nc', inum ) 
    286             CALL iom_get ( inum, jpdom_data, 'ahmt_3d', ahmt ) 
    287             CALL iom_get ( inum, jpdom_data, 'ahmf_3d', ahmf ) 
     286            CALL iom_get ( inum, jpdom_global, 'ahmt_3d', ahmt, cd_type = 'T', psgn = 1._wp ) 
     287            CALL iom_get ( inum, jpdom_global, 'ahmf_3d', ahmf, cd_type = 'F', psgn = 1._wp ) 
    288288            CALL iom_close( inum ) 
    289289            ! 

  • NEMO/trunk/src/OCE/LDF/ldftra.F90

    r13237 r13286  
    317317            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F(i,j) read in eddy_diffusivity.nc file' 
    318318            CALL iom_open( 'eddy_diffusivity_2D.nc', inum ) 
    319             CALL iom_get ( inum, jpdom_data, 'ahtu_2D', ahtu(:,:,1) ) 
    320             CALL iom_get ( inum, jpdom_data, 'ahtv_2D', ahtv(:,:,1) ) 
     319            CALL iom_get ( inum, jpdom_global, 'ahtu_2D', ahtu(:,:,1), cd_type = 'U', psgn = 1._wp ) 
     320            CALL iom_get ( inum, jpdom_global, 'ahtv_2D', ahtv(:,:,1), cd_type = 'V', psgn = 1._wp ) 
    321321            CALL iom_close( inum ) 
    322322            DO jk = 2, jpkm1 
    … …  
    345345            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F(i,j,k) read in eddy_diffusivity.nc file' 
    346346            CALL iom_open( 'eddy_diffusivity_3D.nc', inum ) 
    347             CALL iom_get ( inum, jpdom_data, 'ahtu_3D', ahtu ) 
    348             CALL iom_get ( inum, jpdom_data, 'ahtv_3D', ahtv ) 
     347            CALL iom_get ( inum, jpdom_global, 'ahtu_3D', ahtu, cd_type = 'U', psgn = 1._wp ) 
     348            CALL iom_get ( inum, jpdom_global, 'ahtv_3D', ahtv, cd_type = 'V', psgn = 1._wp ) 
    349349            CALL iom_close( inum ) 
    350350            ! 
    … …  
    572572            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F(i,j) read in eddy_diffusivity_2D.nc file' 
    573573            CALL iom_open ( 'eddy_induced_velocity_2D.nc', inum ) 
    574             CALL iom_get  ( inum, jpdom_data, 'aeiu', aeiu(:,:,1) ) 
    575             CALL iom_get  ( inum, jpdom_data, 'aeiv', aeiv(:,:,1) ) 
     574            CALL iom_get  ( inum, jpdom_global, 'aeiu', aeiu(:,:,1), cd_type = 'U', psgn = 1._wp ) 
     575            CALL iom_get  ( inum, jpdom_global, 'aeiv', aeiv(:,:,1), cd_type = 'V', psgn = 1._wp ) 
    576576            CALL iom_close( inum ) 
    577577            DO jk = 2, jpkm1 
    … …  
    596596            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F(i,j,k) read in eddy_diffusivity_3D.nc file' 
    597597            CALL iom_open ( 'eddy_induced_velocity_3D.nc', inum ) 
    598             CALL iom_get  ( inum, jpdom_data, 'aeiu', aeiu ) 
    599             CALL iom_get  ( inum, jpdom_data, 'aeiv', aeiv ) 
     598            CALL iom_get  ( inum, jpdom_global, 'aeiu', aeiu, cd_type = 'U', psgn = 1._wp ) 
     599            CALL iom_get  ( inum, jpdom_global, 'aeiv', aeiv, cd_type = 'V', psgn = 1._wp ) 
    600600            CALL iom_close( inum ) 
    601601            ! 
Note: See TracChangeset for help on using the changeset viewer.