Changeset 602 for trunk/NEMO/OPA_SRC

Timestamp:

2007-02-20T15:47:34+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_010 : CT : - use the && operator when using bulk formulae to avoid SST restoring in the case of no sea-ice model

File:

• trunk/NEMO/OPA_SRC/SBC/ocesbc.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/SBC/ocesbc.F90

@@ -491 +491 @@
                  &                                  + freeze(ji,jj)  * zqrj ) ) * tmask(ji,jj,1)
 
-#if ! defined key_flx_bulk_monthly || ! defined key_flx_bulk_daily
+#if ! defined key_flx_bulk_monthly && ! defined key_flx_bulk_daily
                zqrp = dqdt0 * ( tb(ji,jj,1) - ztdta )
                qrp(ji,jj) = qrp(ji,jj) + (1. - ziclim(ji,jj)) * zqrp