Changeset 3839 for branches/2011/dev_r2739_LOCEAN8_ZTC/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr_substitute.h90

Timestamp:

2013-03-14T19:00:38+01:00 (11 years ago)

Author:

gm

Message:

dev_r2739_LOCEAN8_ZTC (z-tilde): #863 correct bugs and rename some variables

File:

• branches/2011/dev_r2739_LOCEAN8_ZTC/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr_substitute.h90 (modified) (2 diffs)

branches/2011/dev_r2739_LOCEAN8_ZTC/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr_substitute.h90

@@ -8 +8 @@
    !!            3.1  !  2009-02  (G. Madec, M. Leclair)  pure z* coordinate
    !!----------------------------------------------------------------------
-! reference for s- or zps-coordinate (3D no time dependency)
-#   define  fsdept_0(i,j,k)  gdept(i,j,k)
-#   define  fsdepw_0(i,j,k)  gdepw(i,j,k)
-#   define  fsde3w_0(i,j,k)  gdep3w(i,j,k)
-#   define  fse3t_0(i,j,k)   e3t(i,j,k)
-#   define  fse3u_0(i,j,k)   e3u(i,j,k)
-#   define  fse3v_0(i,j,k)   e3v(i,j,k)
-#   define  fse3f_0(i,j,k)   e3f(i,j,k)
-#   define  fse3w_0(i,j,k)   e3w(i,j,k)
-#   define  fse3uw_0(i,j,k)  e3uw(i,j,k)
-#   define  fse3vw_0(i,j,k)  e3vw(i,j,k)
 
 #if defined key_vvl
@@ -44 +33 @@
 #   define  fse3v_a(i,j,k)   e3v_a(i,j,k)
 
-#   define  fse3t_m(i,j)   e3t_m(i,j)
+#   define  fse3t_m(i,j)     e3t_m(i,j)
 
 ! This part should be removed one day ...
-#   define  fsdept(i,j,k)  fsdept_n(i,j,k)
-#   define  fsdepw(i,j,k)  fsdepw_n(i,j,k)
-#   define  fsde3w(i,j,k)  fsde3w_n(i,j,k)
-#   define  fse3t(i,j,k)   fse3t_n(i,j,k) 
-#   define  fse3u(i,j,k)   fse3u_n(i,j,k) 
-#   define  fse3v(i,j,k)   fse3v_n(i,j,k) 
-#   define  fse3f(i,j,k)   fse3f_n(i,j,k) 
-#   define  fse3w(i,j,k)   fse3w_n(i,j,k) 
-#   define  fse3uw(i,j,k)  fse3uw_n(i,j,k)
-#   define  fse3vw(i,j,k)  fse3vw_n(i,j,k)
+! ... In that case all occurence of the above statement functions
+!     have to be replaced in the code by xxx_n
+#   define  fsdept(i,j,k)    gdept_n(i,j,k)
+#   define  fsdepw(i,j,k)    gdepw_n(i,j,k)
+#   define  fsde3w(i,j,k)    gdep3w_n(i,j,k)
+#   define  fse3t(i,j,k)     e3t_n(i,j,k) 
+#   define  fse3u(i,j,k)     e3u_n(i,j,k) 
+#   define  fse3v(i,j,k)     e3v_n(i,j,k) 
+#   define  fse3f(i,j,k)     e3f_n(i,j,k) 
+#   define  fse3w(i,j,k)     e3w_n(i,j,k) 
+#   define  fse3uw(i,j,k)    e3uw_n(i,j,k)
+#   define  fse3vw(i,j,k)    e3vw_n(i,j,k)
 
 #else
 ! z- or s-coordinate (1D or 3D + no time dependency) use reference in all cases
-#   define  fsdept(i,j,k)  fsdept_0(i,j,k)
-#   define  fsdepw(i,j,k)  fsdepw_0(i,j,k)
-#   define  fsde3w(i,j,k)  fsde3w_0(i,j,k)
-#   define  fse3t(i,j,k)   fse3t_0(i,j,k)
-#   define  fse3u(i,j,k)   fse3u_0(i,j,k)
-#   define  fse3v(i,j,k)   fse3v_0(i,j,k)
-#   define  fse3f(i,j,k)   fse3f_0(i,j,k)
-#   define  fse3w(i,j,k)   fse3w_0(i,j,k)
-#   define  fse3uw(i,j,k)  fse3uw_0(i,j,k)
-#   define  fse3vw(i,j,k)  fse3vw_0(i,j,k)
 
-#   define  fse3t_b(i,j,k)   fse3t_0(i,j,k)
-#   define  fse3u_b(i,j,k)   fse3u_0(i,j,k)
-#   define  fse3v_b(i,j,k)   fse3v_0(i,j,k)
-#   define  fse3uw_b(i,j,k)  fse3uw_0(i,j,k)
-#   define  fse3vw_b(i,j,k)  fse3vw_0(i,j,k)
+#   define  fse3t_b(i,j,k)   e3t_0(i,j,k)
+#   define  fse3u_b(i,j,k)   e3u_0(i,j,k)
+#   define  fse3v_b(i,j,k)   e3v_0(i,j,k)
+#   define  fse3uw_b(i,j,k)  e3uw_0(i,j,k)
+#   define  fse3vw_b(i,j,k)  e3vw_0(i,j,k)
 
-#   define  fsdept_n(i,j,k)  fsdept_0(i,j,k)
-#   define  fsdepw_n(i,j,k)  fsdepw_0(i,j,k)
-#   define  fsde3w_n(i,j,k)  fsde3w_0(i,j,k)
-#   define  fse3t_n(i,j,k)   fse3t_0(i,j,k)
-#   define  fse3u_n(i,j,k)   fse3u_0(i,j,k)
-#   define  fse3v_n(i,j,k)   fse3v_0(i,j,k)
-#   define  fse3f_n(i,j,k)   fse3f_0(i,j,k)
-#   define  fse3w_n(i,j,k)   fse3w_0(i,j,k)
-#   define  fse3uw_n(i,j,k)  fse3uw_0(i,j,k)
-#   define  fse3vw_n(i,j,k)  fse3vw_0(i,j,k)
+#   define  fsdept_n(i,j,k)  gdept_0(i,j,k)
+#   define  fsdepw_n(i,j,k)  gdepw_0(i,j,k)
+#   define  fsde3w_n(i,j,k)  gdep3w_0(i,j,k)
+#   define  fse3t_n(i,j,k)   e3t_0(i,j,k)
+#   define  fse3u_n(i,j,k)   e3u_0(i,j,k)
+#   define  fse3v_n(i,j,k)   e3v_0(i,j,k)
+#   define  fse3f_n(i,j,k)   e3f_0(i,j,k)
+#   define  fse3w_n(i,j,k)   e3w_0(i,j,k)
+#   define  fse3uw_n(i,j,k)  e3uw_0(i,j,k)
+#   define  fse3vw_n(i,j,k)  e3vw_0(i,j,k)
 
-#   define  fse3t_m(i,j)     fse3t_0(i,j,1)
+#   define  fse3t_a(i,j,k)   e3t_0(i,j,k)
+#   define  fse3u_a(i,j,k)   e3u_0(i,j,k)
+#   define  fse3v_a(i,j,k)   e3v_0(i,j,k)
 
-#   define  fse3t_a(i,j,k)   fse3t_0(i,j,k)
-#   define  fse3u_a(i,j,k)   fse3u_0(i,j,k)
-#   define  fse3v_a(i,j,k)   fse3v_0(i,j,k)
+#   define  fse3t_m(i,j)     e3t_0(i,j,1)
+
+! This part should be removed one day ...
+! ... In that case all occurence of the above statement functions
+!     have to be replaced in the code by xxx_n
+#   define  fsdept(i,j,k)    gdept_0(i,j,k)
+#   define  fsdepw(i,j,k)    gdepw_0(i,j,k)
+#   define  fsde3w(i,j,k)    gdep3w_0(i,j,k)
+#   define  fse3t(i,j,k)     e3t_0(i,j,k)
+#   define  fse3u(i,j,k)     e3u_0(i,j,k)
+#   define  fse3v(i,j,k)     e3v_0(i,j,k)
+#   define  fse3f(i,j,k)     e3f_0(i,j,k)
+#   define  fse3w(i,j,k)     e3w_0(i,j,k)
+#   define  fse3uw(i,j,k)    e3uw_0(i,j,k)
+#   define  fse3vw(i,j,k)    e3vw_0(i,j,k)
+
 #endif
    !!----------------------------------------------------------------------