Changeset 824 for branches/dev_002_LIM/NEMO/OPA_SRC/SBC/bulk.F90

Timestamp:

2008-03-06T12:37:37+01:00 (16 years ago)

Author:

rblod

Message:

Delete LIM_SRC and add corresponding modifications in Ocean part

File:

• branches/dev_002_LIM/NEMO/OPA_SRC/SBC/bulk.F90 (modified) (4 diffs)

branches/dev_002_LIM/NEMO/OPA_SRC/SBC/bulk.F90

@@ -16 +16 @@
    USE ocfzpt          ! ocean freezing point
    USE flxblk          ! bulk formulae
+   USE flxblk_2        ! bulk formulae
    USE blk_oce         ! bulk variable 
    USE flx_oce
@@ -50 +51 @@
       !! * Local declarations    
       REAL(wp), DIMENSION(jpi,jpj) ::   zsst 
-# if ! defined key_ice_lim
+# if ( ! defined key_ice_lim && !defined key_lim2 )
       INTEGER  ::   ji, jj         ! dummy loop indices  
       REAL(wp) ::   ztgel, zicopa
@@ -69 +70 @@
      ENDIF
 
-# if ! defined key_ice_lim
+# if ( ! defined key_ice_lim && ! defined key_lim2 )
       ! opa model ice freeze()      
       DO jj = 1, jpj
@@ -87 +88 @@
 
          zsst(:,:) = gsst(:,:) / REAL( nfbulk ) * tmask(:,:,1)
-         CALL flx_blk( zsst )    
+         IF ( .NOT. lk_lim2 )  CALL flx_blk( zsst )    
+
+#if defined key_lim2
+         CALL flx_blk_2( zsst )    
+#endif
      
          gsst(:,:) = 0.    
 
-# if ! defined key_ice_lim
+# if ( ! defined key_ice_lim && ! defined key_lim2 )
          IF(ln_ctl) THEN         ! print mean trends (used for debugging)
             CALL prt_ctl_info(' Forcings ')