Changeset 2240 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

Timestamp:

2010-10-13T10:48:48+02:00 (14 years ago)

Author:

cetlod

Message:

Suppression of key_zco everywhere in the code

File:

• branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 (modified) (4 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

@@ -162 +162 @@
                zuf(ji,jj,jk) = fmask(ji,jj,jk) * (  zcv(ji+1,jj  ) - zcv(ji,jj)      &
                   &                            - zcu(ji  ,jj+1) + zcu(ji,jj)  )   &
-#if defined key_zco
-                  &                         / ( e1f(ji,jj)*e2f(ji,jj) )
-#else
                   &       * fse3f(ji,jj,jk) / ( e1f(ji,jj)*e2f(ji,jj) )
-#endif
             END DO  
          END DO  
@@ -173 +169 @@
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
-#if defined key_zco
-               zlu(ji,jj,jk) = e2u(ji,jj) * zlu(ji,jj,jk)
-               zlv(ji,jj,jk) = e1v(ji,jj) * zlv(ji,jj,jk)
-#else
                zlu(ji,jj,jk) = e2u(ji,jj) * fse3u(ji,jj,jk) * zlu(ji,jj,jk)
                zlv(ji,jj,jk) = e1v(ji,jj) * fse3v(ji,jj,jk) * zlv(ji,jj,jk)
-#endif
             END DO
          END DO
@@ -186 +177 @@
          DO jj = 2, jpj
             DO ji = fs_2, jpi   ! vector opt.
-#if defined key_zco
-               zbt = e1t(ji,jj) * e2t(ji,jj)
-#else
                zbt = e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk)
-#endif
                zut(ji,jj,jk) = (  zlu(ji,jj,jk) - zlu(ji-1,jj  ,jk)   &
                   &             + zlv(ji,jj,jk) - zlv(ji  ,jj-1,jk) ) / zbt
@@ -210 +197 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-#if defined key_zco
-               ze2u = e2u(ji,jj)
-               ze2v = e1v(ji,jj)
-#else
                ze2u = e2u(ji,jj) * fse3u(ji,jj,jk)
                ze2v = e1v(ji,jj) * fse3v(ji,jj,jk)
-#endif
                ! horizontal biharmonic diffusive trends
                zua = - ( zuf(ji  ,jj,jk) - zuf(ji,jj-1,jk) ) / ze2u   &