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

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

@@ -12 +12 @@
    !!----------------------------------------------------------------------
    USE oce            ! 
-   USE sbc_oce        ! Surface boundary condition: ocean fields
-   USE bdy_oce        !
+   USE sbc_oce        ! Surface boundary condition: ocean fields
+   USE bdy_oce   , ONLY: ln_bdy, bdytmask
    USE domvvl         !
    !
@@ -19 +19 @@
    USE in_out_manager ! I/O manager
    USE lib_mpp        ! distribued memory computing library
-   USE fldread        ! read input fields
+   USE fldread        ! read input fields
    USE wrk_nemo       !
 
@@ -32 +32 @@
    INTEGER , PARAMETER ::   jp_wn  = 3   ! index of wave number                 (1/m)    at T-point
 
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:)  :: sf_cd    ! structure of input fields (file informations, fields read) Drag Coefficient
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:)  :: sf_sd    ! structure of input fields (file informations, fields read) Stokes Drift
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:)  :: sf_cd         ! structure of input fields (file informations, fields read) Drag Coefficient
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:)  :: sf_sd         ! structure of input fields (file informations, fields read) Stokes Drift
 
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION (:,:)   :: cdn_wave 
@@ -172 +172 @@
             wsd3d(:,:,jk) = wsd3d(:,:,jk+1) - ze3hdiv(:,:,jk)
          END DO
-#if defined key_bdy
-         IF( lk_bdy ) THEN
+         !
+         IF( ln_bdy ) THEN
             DO jk = 1, jpkm1
                wsd3d(:,:,jk) = wsd3d(:,:,jk) * bdytmask(:,:)
             END DO
          ENDIF
-#endif
+         !
          CALL wrk_dealloc( jpi,jpj,jpk,   zusd_t, zvsd_t, ze3hdiv )
          !