Changeset 13232 for NEMO/branches/2020

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:

• . (modified) (1 prop)
• src/NST/agrif_oce_sponge.F90 (modified) (7 diffs)
• src/OCE/DYN/sshwzv.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/NST/agrif_oce_sponge.F90

@@ -109 +109 @@
       REAL(wp) ::   z1_ispongearea, z1_jspongearea
       REAL(wp), DIMENSION(jpi,jpj) :: ztabramp
-#if defined key_vertical
-      REAL(wp), DIMENSION(jpi,jpj) :: ztabrampu
-      REAL(wp), DIMENSION(jpi,jpj) :: ztabrampv
-#endif
       REAL(wp), DIMENSION(jpjmax)  :: zmskwest,  zmskeast
       REAL(wp), DIMENSION(jpimax)  :: zmsknorth, zmsksouth
@@ -304 +300 @@
       
       IF( .NOT. spongedoneT .AND. .NOT. spongedoneU ) THEN
-         CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1., fspv, 'V', 1., fspt, 'T', 1., fspf, 'F', 1. )
+         CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1._wp, fspv, 'V', 1._wp, fspt, 'T', 1._wp, fspf, 'F', 1._wp )
          spongedoneT = .TRUE.
          spongedoneU = .TRUE.
       ENDIF
       IF( .NOT. spongedoneT ) THEN
-         CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1., fspv, 'V', 1. )
+         CALL lbc_lnk_multi( 'agrif_Sponge', fspu, 'U', 1._wp, fspv, 'V', 1._wp )
          spongedoneT = .TRUE.
       ENDIF
       IF( .NOT. spongedoneT .AND. .NOT. spongedoneU ) THEN
-         CALL lbc_lnk_multi( 'agrif_Sponge', fspt, 'T', 1., fspf, 'F', 1. )
+         CALL lbc_lnk_multi( 'agrif_Sponge', fspt, 'T', 1._wp, fspf, 'F', 1._wp )
          spongedoneU = .TRUE.
       ENDIF
@@ -347 +343 @@
    END SUBROUTINE Agrif_Sponge
 
+   
    SUBROUTINE interptsn_sponge( tabres, i1, i2, j1, j2, k1, k2, n1, n2, before )
       !!----------------------------------------------------------------------
@@ -514 +511 @@
    END SUBROUTINE interptsn_sponge
 
+   
    SUBROUTINE interpun_sponge(tabres,i1,i2,j1,j2,k1,k2,m1,m2, before)
       !!---------------------------------------------
@@ -522 +520 @@
       LOGICAL, INTENT(in) :: before
 
-      INTEGER :: ji,jj,jk,jmax
-      INTEGER :: ind1
+      INTEGER  :: ji,jj,jk,jmax
+      INTEGER  :: ind1
       ! sponge parameters 
       REAL(wp) :: ze2u, ze1v, zua, zva, zbtr, zhtot
@@ -691 +689 @@
    END SUBROUTINE interpun_sponge
 
-   SUBROUTINE interpvn_sponge(tabres,i1,i2,j1,j2,k1,k2,m1,m2, before,nb,ndir)
+   
+   SUBROUTINE interpvn_sponge(tabres,i1,i2,j1,j2,k1,k2,m1,m2, before)
       !!---------------------------------------------
       !!   *** ROUTINE interpvn_sponge ***
@@ -698 +697 @@
       REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2,m1:m2), INTENT(inout) :: tabres
       LOGICAL, INTENT(in) :: before
-      INTEGER, INTENT(in) :: nb , ndir
       !
       INTEGER  ::   ji, jj, jk, imax
+      INTEGER  :: ind1
       REAL(wp) ::   ze2u, ze1v, zua, zva, zbtr, zhtot
       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

@@ -28 +28 @@
    USE bdydyn2d       ! bdy_ssh routine
 #if defined key_agrif
+   USE agrif_oce
    USE agrif_oce_interp
 #endif
@@ -200 +201 @@
       ENDIF
       !
+#if defined key_agrif
       IF( .NOT. AGRIF_Root() ) THEN
          !
@@ -244 +246 @@
          !
       ENDIF 
+#endif
       !
       IF( ln_timing )   CALL timing_stop('wzv')

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL