Changeset 15529 for NEMO/trunk/src/OCE/DOM/domzgr_substitute.h90

Timestamp:

2021-11-23T16:00:19+01:00 (2 years ago)

Author:

techene

Message:

#2695 : isf+qco are now compatible

File:

• NEMO/trunk/src/OCE/DOM/domzgr_substitute.h90 (modified) (1 diff)

NEMO/trunk/src/OCE/DOM/domzgr_substitute.h90

@@ -25 +25 @@
 #   define  r1_hu(i,j,t)   (r1_hu_0(i,j)/(1._wp+r3u(i,j,t)))
 #   define  r1_hv(i,j,t)   (r1_hv_0(i,j)/(1._wp+r3v(i,j,t)))
+# if defined key_isf
+#   define  gdept(i,j,k,t) ((gdept_0(i,j,k)-risfdep(i,j))*(1._wp+r3t(i,j,t))+risfdep(i,j)) 
+#   define  gdepw(i,j,k,t) ((gdepw_0(i,j,k)-risfdep(i,j))*(1._wp+r3t(i,j,t))+risfdep(i,j))
+# else
 #   define  gdept(i,j,k,t) (gdept_0(i,j,k)*(1._wp+r3t(i,j,t)))
 #   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))
+# endif
+#   define  gde3w(i,j,k)   (gdept(i,j,k,Kmm)-ssh(i,j,Kmm))
 #elif defined key_linssh
 #   define  e3t(i,j,k,t)   e3t_0(i,j,k)