Changeset 6862 for branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/LIM_SRC_3/limrhg.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/LIM_SRC_3/limrhg.F90 (modified) (6 diffs)

branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90

@@ -41 +41 @@
    USE agrif_lim2_interp
 #endif
-#if defined key_bdy
+   USE bdy_oce   , ONLY: ln_bdy
    USE bdyice_lim
-#endif
 
    IMPLICIT NONE
@@ -460 +459 @@
             CALL agrif_rhg_lim2( jter, nn_nevp, 'U' )
 #endif
-#if defined key_bdy
-         CALL bdy_ice_lim_dyn( 'U' )
-#endif         
+         IF( ln_bdy ) CALL bdy_ice_lim_dyn( 'U' )
 
             DO jj = k_j1+1, k_jpj-1
@@ -486 +483 @@
             CALL agrif_rhg_lim2( jter, nn_nevp, 'V' )
 #endif
-#if defined key_bdy
-         CALL bdy_ice_lim_dyn( 'V' )
-#endif         
+         IF( ln_bdy ) CALL bdy_ice_lim_dyn( 'V' )
 
          ELSE 
@@ -513 +508 @@
             CALL agrif_rhg_lim2( jter, nn_nevp, 'V' )
 #endif
-#if defined key_bdy
-         CALL bdy_ice_lim_dyn( 'V' )
-#endif         
+         IF( ln_bdy ) CALL bdy_ice_lim_dyn( 'V' )
 
             DO jj = k_j1+1, k_jpj-1
@@ -538 +531 @@
             CALL agrif_rhg_lim2( jter, nn_nevp, 'U' )
 #endif
-#if defined key_bdy
-         CALL bdy_ice_lim_dyn( 'U' )
-#endif         
+         IF( ln_bdy ) CALL bdy_ice_lim_dyn( 'U' )
 
          ENDIF
@@ -577 +568 @@
       CALL agrif_rhg_lim2( nn_nevp , nn_nevp, 'V' )
 #endif
-#if defined key_bdy
-      CALL bdy_ice_lim_dyn( 'U' )
-      CALL bdy_ice_lim_dyn( 'V' )
-#endif         
+      IF( ln_bdy ) THEN
+         CALL bdy_ice_lim_dyn( 'U' ) ; CALL bdy_ice_lim_dyn( 'V' )
+      ENDIF
 
       DO jj = k_j1+1, k_jpj-1