Changeset 6862 for branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.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/BDY/bdyini.F90 (modified) (7 diffs)

branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -13 +13 @@
    !!            3.4  !  2012     (J. Chanut) straight open boundary case update
    !!            3.5  !  2012     (S. Mocavero, I. Epicoco) optimization of BDY communications
-   !!----------------------------------------------------------------------
-#if defined key_bdy
-   !!----------------------------------------------------------------------
-   !!   'key_bdy'                     Unstructured Open Boundary Conditions
+   !!            3.7  !  2016     (T. Lovato) Remove bdy macro, call here init for dta and tides
    !!----------------------------------------------------------------------
    !!   bdy_init      : Initialization of unstructured open boundaries
@@ -23 +20 @@
    USE dom_oce        ! ocean space and time domain
    USE bdy_oce        ! unstructured open boundary conditions
+   USE bdydta         ! open boundary cond. setting   (bdy_dta_init routine)
+   USE bdytides       ! open boundary cond. setting   (bdytide_init routine)
    USE sbctide  , ONLY: lk_tide ! Tidal forcing or not
    USE phycst   , ONLY: rday
@@ -94 +93 @@
       INTEGER                              ::   nbdyind, nbdybeg, nbdyend
       !!
-      NAMELIST/nambdy/ nb_bdy, ln_coords_file, cn_coords_file,                 &
+      NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,         &
          &             ln_mask_file, cn_mask_file, cn_dyn2d, nn_dyn2d_dta,     &
          &             cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta,             &  
          &             ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, &
-         &             cn_ice_lim, nn_ice_lim_dta,                           &
-         &             rn_ice_tem, rn_ice_sal, rn_ice_age,                 &
+         &             cn_ice_lim, nn_ice_lim_dta,                             &
+         &             rn_ice_tem, rn_ice_sal, rn_ice_age,                     &
          &             ln_vol, nn_volctl, nn_rimwidth
          !
@@ -108 +107 @@
       IF( nn_timing == 1 )   CALL timing_start('bdy_init')
       !
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'bdy_init : initialization of open boundaries'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~'
-      !
-      IF( jperio /= 0 )   CALL ctl_stop( 'Cyclic or symmetric,',   &
-         &                               ' and general open boundary condition are not compatible' )
-
       cgrid = (/'t','u','v'/)
       
@@ -133 +125 @@
       ! -----------------------------------------
       !                                   ! control prints
-      IF(lwp) WRITE(numout,*) '   nambdy'
+      IF ( ln_bdy ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'bdy_init : initialization of open boundaries'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~'
+      ELSE
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'bdy_init : open boundaries not used (ln_bdy = F)'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~'
+         IF( nn_timing == 1 )   CALL timing_stop('bdy_init')
+         return
+      ENDIF
+
+      IF( jperio /= 0 )   CALL ctl_stop( 'bdy_init: Cyclic or symmetric,',   &
+         &                               ' and general open boundary condition are not compatible' )
 
       IF( nb_bdy == 0 ) THEN 
@@ -1300 +1305 @@
       CALL wrk_dealloc(jpi,jpj,   zfmask ) 
       !
+      ! Open boundaries initialisation of external data arrays
+      CALL bdy_dta_init
+      !
+      ! Open boundaries initialisation of tidal harmonic forcing
+      IF( lk_tide ) CALL bdytide_init
+
+      !
       IF( nn_timing == 1 )   CALL timing_stop('bdy_init')
       !
@@ -1713 +1725 @@
    END SUBROUTINE bdy_ctl_corn
 
-#else
-   !!---------------------------------------------------------------------------------
-   !!   Dummy module                                   NO open boundaries
-   !!---------------------------------------------------------------------------------
-CONTAINS
-   SUBROUTINE bdy_init      ! Dummy routine
-   END SUBROUTINE bdy_init
-#endif
-
    !!=================================================================================
 END MODULE bdyini