Changeset 14789 for NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU/src/OCE/DOM/domzgr_substitute.h90

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/DOM/domzgr_substitute.h90 (modified) (2 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/DOM/domzgr_substitute.h90

@@ -15 +15 @@
 #   define  e3u(i,j,k,t)   (e3u_0(i,j,k)*(1._wp+r3u(i,j,t)*umask(i,j,k)))
 #   define  e3v(i,j,k,t)   (e3v_0(i,j,k)*(1._wp+r3v(i,j,t)*vmask(i,j,k)))
-#   define  e3f(i,j,k)     (e3f_0(i,j,k)*(1._wp+r3f(i,j)*fmask(i,j,k)))
+#   define  e3f(i,j,k)     (e3f_0(i,j,k)*(1._wp+r3f(i,j)*fe3mask(i,j,k)))
+#   define  e3f_vor(i,j,k) (e3f_0vor(i,j,k)*(1._wp+r3f(i,j)*fe3mask(i,j,k)))
 #   define  e3w(i,j,k,t)   (e3w_0(i,j,k)*(1._wp+r3t(i,j,t)))
 #   define  e3uw(i,j,k,t)  (e3uw_0(i,j,k)*(1._wp+r3u(i,j,t)))
 #   define  e3vw(i,j,k,t)  (e3vw_0(i,j,k)*(1._wp+r3v(i,j,t)))
-#   define  ht(i,j)        (ht_0(i,j)+ssh(i,j,Kmm))
+#   define  ht(i,j)        (ht_0(i,j)*(1._wp+r3t(i,j,Kmm)))
 #   define  hu(i,j,t)      (hu_0(i,j)*(1._wp+r3u(i,j,t)))
 #   define  hv(i,j,t)      (hv_0(i,j)*(1._wp+r3v(i,j,t)))
@@ -27 +28 @@
 #   define  gdepw(i,j,k,t) (gdepw_0(i,j,k)*(1._wp+r3t(i,j,t)))
 #   define  gde3w(i,j,k)   (gdept_0(i,j,k)*(1._wp+r3t(i,j,Kmm))-ssh(i,j,Kmm))
+#elif defined key_linssh
+#   define  e3t(i,j,k,t)   e3t_0(i,j,k)
+#   define  e3u(i,j,k,t)   e3u_0(i,j,k)
+#   define  e3v(i,j,k,t)   e3v_0(i,j,k)
+#   define  e3f(i,j,k)     e3f_0(i,j,k)
+#   define  e3f_vor(i,j,k) e3f_0vor(i,j,k)
+#   define  e3w(i,j,k,t)   e3w_0(i,j,k)
+#   define  e3uw(i,j,k,t)  e3uw_0(i,j,k)
+#   define  e3vw(i,j,k,t)  e3vw_0(i,j,k)
+#   define  ht(i,j)        ht_0(i,j)
+#   define  hu(i,j,t)      hu_0(i,j)
+#   define  hv(i,j,t)      hv_0(i,j)
+#   define  r1_hu(i,j,t)   r1_hu_0(i,j)
+#   define  r1_hv(i,j,t)   r1_hv_0(i,j)
+#   define  gdept(i,j,k,t) gdept_0(i,j,k)
+#   define  gdepw(i,j,k,t) gdepw_0(i,j,k)
+#   define  gde3w(i,j,k)   (gdept_0(i,j,k)-ssh(i,j,Kmm))
 #endif
 !!----------------------------------------------------------------------
+

@@ -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