Changeset 2528 for trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.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_top_sponge.F90 (modified) (3 diffs, 1 prop)

trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90

@@ -16 +16 @@
 
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2006)
-   !! $Id: agrif_opa_sponge.F90 1156 2008-06-26 16:06:45Z rblod $
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! NEMO/NST 3.3 , NEMO Consortium (2010)
+   !! $Id$
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -123 +123 @@
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
-#if defined key_zco
-               zabe1 = umask(ji,jj,jk) * spe1ur(ji,jj)
-               zabe2 = vmask(ji,jj,jk) * spe2vr(ji,jj)
-#else
                zabe1 = umask(ji,jj,jk) * spe1ur(ji,jj) * fse3u(ji,jj,jk)
                zabe2 = vmask(ji,jj,jk) * spe2vr(ji,jj) * fse3v(ji,jj,jk)
-#endif
                ztru(ji,jj,jk,jl) = zabe1 * ( trbdiff(ji+1,jj  ,jk,jl) - trbdiff(ji,jj,jk,jl) )
                ztrv(ji,jj,jk,jl) = zabe2 * ( trbdiff(ji  ,jj+1,jk,jl) - trbdiff(ji,jj,jk,jl) )
@@ -137 +132 @@
          DO jj = 2,jpjm1
             DO ji = 2,jpim1
-#if defined key_zco
-               zbtr = spbtr2(ji,jj)
-#else
                zbtr = spbtr2(ji,jj) / fse3t(ji,jj,jk)
-#endif
                ! horizontal diffusive trends
                ztra = zbtr * (  ztru(ji,jj,jk,jl) - ztru(ji-1,jj,jk,jl)   &