Changeset 2528 for trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) (6 diffs, 1 prop)

trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -2 +2 @@
 
 MODULE agrif_opa_update
-#if defined key_agrif  && ! defined key_off_tra
+#if defined key_agrif  && ! defined key_offline
    USE par_oce
    USE oce
@@ -16 +16 @@
 
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2006)
+   !! NEMO/NST 3.3 , NEMO Consortium (2010)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -184 +184 @@
                DO ji=i1,i2
                   tabres(ji,jj,jk) = e2u(ji,jj) * un(ji,jj,jk)
-#if ! defined key_zco
-                  tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3u(ji,jj,jk)
-#endif
                END DO
             END DO
@@ -197 +194 @@
                   un(ji,jj,jk) = tabres(ji,jj,jk) / (e2u(ji,jj))
                   un(ji,jj,jk) = un(ji,jj,jk) * umask(ji,jj,jk)
-#if ! defined key_zco
                   un(ji,jj,jk) = un(ji,jj,jk) / fse3u(ji,jj,jk)
-#endif
                END DO
             END DO
@@ -226 +221 @@
                DO ji=i1,i2
                   tabres(ji,jj,jk) = e1v(ji,jj) * vn(ji,jj,jk)
-#if ! defined key_zco
                   tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3v(ji,jj,jk)
-#endif
                END DO
             END DO
@@ -239 +232 @@
                   vn(ji,jj,jk) = tabres(ji,jj,jk) / (e1v(ji,jj))
                   vn(ji,jj,jk) = vn(ji,jj,jk) * vmask(ji,jj,jk)
-#if ! defined key_zco
                   vn(ji,jj,jk) = vn(ji,jj,jk) / fse3v(ji,jj,jk)
-#endif
                END DO
             END DO