Changeset 2240 for branches/DEV_r2106_LOCEAN2010/NEMO/OFF_SRC/dtadyn.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/OFF_SRC/dtadyn.F90 (modified) (2 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OFF_SRC/dtadyn.F90

@@ -568 +568 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-#if defined key_zco
-               zu  = pu(ji  ,jj  ,jk) * umask(ji  ,jj  ,jk) * e2u(ji  ,jj  )
-               zu1 = pu(ji-1,jj  ,jk) * umask(ji-1,jj  ,jk) * e2u(ji-1,jj  )
-               zv  = pv(ji  ,jj  ,jk) * vmask(ji  ,jj  ,jk) * e1v(ji  ,jj  )
-               zv1 = pv(ji  ,jj-1,jk) * vmask(ji  ,jj-1,jk) * e1v(ji  ,jj-1)
-               zet = 1. / ( e1t(ji,jj) * e2t(ji,jj) )
-#else
                zu  = pu(ji  ,jj  ,jk) * umask(ji  ,jj  ,jk) * e2u(ji  ,jj  ) * fse3u(ji  ,jj  ,jk)
                zu1 = pu(ji-1,jj  ,jk) * umask(ji-1,jj  ,jk) * e2u(ji-1,jj  ) * fse3u(ji-1,jj  ,jk)
@@ -580 +573 @@
                zv1 = pv(ji  ,jj-1,jk) * vmask(ji  ,jj-1,jk) * e1v(ji  ,jj-1) * fse3v(ji  ,jj-1,jk)
                zet = 1. / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
-#endif
                phdiv(ji,jj,jk) = ( zu - zu1 + zv - zv1 ) * zet 
             END DO