Changeset 888 for trunk/NEMO/TOP_SRC

Timestamp:

2008-04-11T19:05:03+02:00 (16 years ago)

Author:

ctlod

Message:

merge dev_001_SBC branche with the trunk to include the New Surface Module package, see ticket: #113

File:

• trunk/NEMO/TOP_SRC/TRP/trcadv_cen2.F90 (modified) (1 diff)

trunk/NEMO/TOP_SRC/TRP/trcadv_cen2.F90

@@ -164 +164 @@
                zind(ji,jj,jk) =  MAX ( upsrnfh(ji,jj) * upsrnfz(jk),     &  ! changing advection scheme near runoff
                   &                    upsadv(ji,jj)                     &  ! in the vicinity of some straits
-#if defined key_lim3
+#if defined key_lim3 || defined key_lim2
                   &                  , tmask(ji,jj,jk)                   &  ! half upstream tracer fluxes
                   &                  * MAX( 0., SIGN( 1., fzptn(ji,jj)   &  ! if tn < ("freezing"+0.1 )