Changeset 7280 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

Timestamp:

2016-11-21T11:40:00+01:00 (7 years ago)

Author:

flavoni

Message:

merge CNRS2016 with aerobulk branch

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) (2 diffs)

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

@@ -25 +25 @@
    PRIVATE
 
-   PUBLIC   sbc_wave    ! routine called in sbc_blk_core or sbc_blk_mfs
+   PUBLIC   sbc_wave    ! routine called in sbc_blk
    
    INTEGER , PARAMETER ::   jpfld  = 3   ! maximum number of files to read for srokes drift
@@ -94 +94 @@
          IF( .NOT.( ln_cdgw .OR. ln_sdw ) )    &
             &  CALL ctl_warn( 'ln_sbcwave=T but nor drag coefficient (ln_cdgw=F) neither stokes drift activated (ln_sdw=F)' )
-         IF( ln_cdgw .AND. .NOT.(ln_blk_mfs .OR. ln_blk_core) )   &       
-            &  CALL ctl_stop( 'drag coefficient read from wave model definable only with mfs bulk formulae and core')
+         IF( ln_cdgw .AND. .NOT.ln_blk )   &       
+            &  CALL ctl_stop( 'drag coefficient read from wave model definable only with bulk formulae')
          !
          IF( ln_cdgw ) THEN