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 14644 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/LDF/ldftra.F90 – NEMO

Ignore:
Timestamp:
2021-03-26T15:33:49+01:00 (3 years ago)
Author:
sparonuz
Message:

Merge trunk -r14642:HEAD

Location:
NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

    • Property svn:externals
      •  

        old new  
        99 
        1010# SETTE 
        11 ^/utils/CI/sette_wave@13990         sette 
         11^/utils/CI/sette@14244        sette 
  • NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/LDF/ldftra.F90

    r14219 r14644  
    118118      !!                  = 10 => = F(z) : constant with a reduction of 1/4 with depth 
    119119      !!                  ! 
    120       !!                  =-20 => = F(i,j)   = shape read in 'eddy_diffusivity.nc' file 
     120      !!                  =-20 => = F(i,j)   = shape read in 'eddy_diffusivity_2D.nc' file 
    121121      !!                  = 20    = F(i,j)   = F(e1,e2) or F(e1^3,e2^3) (lap or bilap case) 
    122122      !!                  = 21    = F(i,j,t) = F(growth rate of baroclinic instability) 
    123123      !!                  ! 
    124       !!                  =-30 => = F(i,j,k)   = shape read in 'eddy_diffusivity.nc' file 
     124      !!                  =-30 => = F(i,j,k)   = shape read in 'eddy_diffusivity_3D.nc' file 
    125125      !!                  = 30    = F(i,j,k)   = 2D (case 20) + decrease with depth (case 10) 
    126126      !!                  = 31    = F(i,j,k,t) = F(local velocity) (  1/2  |u|e     laplacian operator 
     
    481481      !!                  = 10 => = F(z) : constant with a reduction of 1/4 with depth 
    482482      !!                  ! 
    483       !!                  =-20 => = F(i,j)   = shape read in 'eddy_diffusivity.nc' file 
     483      !!                  =-20 => = F(i,j)   = shape read in 'eddy_induced_velocity_2D.nc' file 
    484484      !!                  = 20    = F(i,j)   = F(e1,e2) or F(e1^3,e2^3) (lap or bilap case) 
    485485      !!                  = 21    = F(i,j,t) = F(growth rate of baroclinic instability) 
    486486      !!                  ! 
    487       !!                  =-30 => = F(i,j,k)   = shape read in 'eddy_diffusivity.nc' file 
     487      !!                  =-30 => = F(i,j,k)   = shape read in 'eddy_induced_velocity_3D.nc' file 
    488488      !!                  = 30    = F(i,j,k)   = 2D (case 20) + decrease with depth (case 10) 
    489489      !! 
     
    697697         paeiv(ji,jj,1) = 0.5_wp * ( zaeiw(ji,jj) + zaeiw(ji  ,jj+1) ) * vmask(ji,jj,1) 
    698698      END_2D 
    699       CALL lbc_lnk_multi( 'ldftra', paeiu(:,:,1), 'U', 1.0_wp , paeiv(:,:,1), 'V', 1.0_wp )      ! lateral boundary condition 
     699      CALL lbc_lnk( 'ldftra', paeiu(:,:,1), 'U', 1.0_wp , paeiv(:,:,1), 'V', 1.0_wp )      ! lateral boundary condition 
    700700 
    701701      DO jk = 2, jpkm1                          !==  deeper values equal the surface one  ==! 
Note: See TracChangeset for help on using the changeset viewer.