Changeset 6862 for branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/LIM_SRC_3

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.

Location:

branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/LIM_SRC_3

Files:

• limcons.F90 (modified) (2 diffs)
• limrhg.F90 (modified) (6 diffs)
• limsbc.F90 (modified) (2 diffs)

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

@@ -286 +286 @@
       REAL(wp), PARAMETER             :: zconv = 1.e-9 ! convert W to GW and kg to Mt
 
-#if ! defined key_bdy
       ! heat flux
       zhfx  = glob_sum( ( hfx_in - hfx_out - diag_heat - diag_trp_ei - diag_trp_es - SUM( qevap_ice * a_i_b, dim=3 ) )  &
@@ -304 +303 @@
       IF( ABS( zsfx ) > zs_sill ) WRITE(numout,*) 'violation sfx    [psu*Mt/day]   (',cd_routine,')  = ',(zsfx)
       IF( ABS( zhfx ) > zh_sill ) WRITE(numout,*) 'violation hfx    [GW]           (',cd_routine,')  = ',(zhfx)
-#endif
 
    END SUBROUTINE lim_cons_final

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 

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

@@ -36 +36 @@
    USE limctl         ! 
    USE limcons        ! 
+   USE bdy_oce  , ONLY: ln_bdy
    !
    USE in_out_manager ! I/O manager
@@ -221 +222 @@
 
       ! conservation test
-      IF( ln_limdiahsb )   CALL lim_cons_final( 'limsbc' )
+      IF( ln_limdiahsb .AND. .NOT. ln_bdy)   CALL lim_cons_final( 'limsbc' )
 
       ! control prints