Changeset 14789 for NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU/src/OCE/LDF/ldfc1d_c2d.F90

Timestamp:

2021-05-05T13:18:04+02:00 (3 years ago)

Author:

mcastril

Message:

[2021/HPC-11_mcastril_HPDAonline_DiagGPU] Update externals

Location:

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU

Files:

• . (modified) (1 prop)
• src/OCE/LDF/ldfc1d_c2d.F90 (modified) (8 diffs)

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU/src/OCE/LDF/ldfc1d_c2d.F90

@@ -2 +2 @@
    !!======================================================================
    !!                    ***  MODULE  ldfc1d_c2d  ***
-   !! Ocean physics:  profile and horizontal shape of lateral eddy coefficients 
+   !! Ocean physics:  profile and horizontal shape of lateral eddy coefficients
    !!=====================================================================
    !! History :  3.7  ! 2013-12  (G. Madec)  restructuration/simplification of aht/aeiv specification,
@@ -9 +9 @@
 
    !!----------------------------------------------------------------------
-   !!   ldf_c1d       : ah reduced by 1/4 on the vertical (tanh profile, inflection at 300m) 
+   !!   ldf_c1d       : ah reduced by 1/4 on the vertical (tanh profile, inflection at 300m)
    !!   ldf_c2d       : ah = F(e1,e2) (laplacian or = F(e1^3,e2^3) (bilaplacian)
    !!----------------------------------------------------------------------
@@ -29 +29 @@
    REAL(wp) ::   r1_4  = 0.25_wp          ! =1/4
    REAL(wp) ::   r1_12 = 1._wp / 12._wp   ! =1/12
- 
+
    !! * Substitutions
 #  include "do_loop_substitute.h90"
@@ -42 +42 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE ldf_c1d  ***
-      !!              
+      !!
       !! ** Purpose :   1D eddy diffusivity/viscosity coefficients
       !!
       !! ** Method  :   1D eddy diffusivity coefficients F( depth )
-      !!                Reduction by zratio from surface to bottom 
-      !!                hyperbolic tangent profile with inflection point 
+      !!                Reduction by zratio from surface to bottom
+      !!                hyperbolic tangent profile with inflection point
       !!                at zh=500m and a width of zw=200m
       !!
@@ -95 +95 @@
          END_3D
          ! Lateral boundary conditions
-         CALL lbc_lnk_multi( 'ldfc1d_c2d', pah1, 'U', 1.0_wp , pah2, 'V', 1.0_wp )   
+         CALL lbc_lnk( 'ldfc1d_c2d', pah1, 'U', 1.0_wp , pah2, 'V', 1.0_wp )
          !
       CASE DEFAULT                        ! error
@@ -107 +107 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE ldf_c2d  ***
-      !!              
+      !!
       !! ** Purpose :   2D eddy diffusivity/viscosity coefficients
       !!
@@ -113 +113 @@
       !!       laplacian   operator :   ah proportional to the scale factor      [m2/s]
       !!       bilaplacian operator :   ah proportional to the (scale factor)^3  [m4/s]
-      !!       In both cases, pah0 is the maximum value reached by the coefficient 
+      !!       In both cases, pah0 is the maximum value reached by the coefficient
       !!       at the Equator in case of e1=ra*rad= ~111km, not over the whole domain.
       !!
@@ -140 +140 @@
          END_2D
       CASE( 'TRA' )                       ! U- and V-points
-         DO_2D( 1, 1, 1, 1 )
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
             pah1(ji,jj,1) = pUfac * MAX( e1u(ji,jj), e2u(ji,jj) )**knn
             pah2(ji,jj,1) = pUfac * MAX( e1v(ji,jj), e2v(ji,jj) )**knn

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette