Changeset 6862 for branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2016-08-12T15:16:24+02:00 (8 years ago)

Author:

lovato

Message:

#1729 - trunk: removed key_bdy from the code and set usage of ln_bdy. Tested with SETTE.

File:

• branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (3 diffs)

branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -62 +62 @@
    USE timing          ! Timing
 
-#if defined key_bdy 
-   USE bdyice_lim       ! unstructured open boundary data  (bdy_ice_lim routine)
-#endif
+   USE bdy_oce   , ONLY: ln_bdy
+   USE bdyice_lim      ! unstructured open boundary data  (bdy_ice_lim routine)
 
    IMPLICIT NONE
@@ -166 +165 @@
             IF( nn_monocat /= 2 ) CALL lim_itd_me ! Mechanical redistribution ! (ridging/rafting)
             !
-#if defined key_bdy
-            CALL bdy_ice_lim( kt )                ! bdy ice thermo 
-            IF( ln_icectl )       CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' )
-#endif
+            IF( ln_bdy )  CALL bdy_ice_lim( kt )                ! bdy ice thermo 
+            IF( ln_bdy .AND. ln_icectl )  CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' )
             !
             CALL lim_update1( kt )                ! Corrections
@@ -380 +377 @@
       r1_nlay_s = 1._wp / REAL( nlay_s, wp )
       !
-#if defined key_bdy
-      IF( lwp .AND. ln_limdiahsb )  CALL ctl_warn('online conservation check activated but it does not work with BDY')
-#endif
+      IF( lwp .AND. ln_bdy .AND. ln_limdiahsb )  &
+      &   CALL ctl_warn('online conservation check activated but it does not work with BDY')
       !
    END SUBROUTINE ice_run