Changeset 9033 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

Timestamp:

2017-12-14T11:29:10+01:00 (6 years ago)

Author:

timgraham

Message:

Commit final files from merge of NEMOGCM and some fixes for waves (taooc renamed tauwoc)

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

@@ -236 +236 @@
       IF ( ln_wave ) THEN
       !Activated wave module but neither drag nor stokes drift activated
-         IF ( .NOT.(ln_cdgw .OR. ln_sdw .OR. ln_tauoc .OR. ln_stcor ) )   THEN
-            CALL ctl_warn( 'Ask for wave coupling but ln_cdgw=F, ln_sdw=F, ln_tauoc=F, ln_stcor=F')
+         IF ( .NOT.(ln_cdgw .OR. ln_sdw .OR. ln_tauwoc .OR. ln_stcor ) )   THEN
+            CALL ctl_warn( 'Ask for wave coupling but ln_cdgw=F, ln_sdw=F, ln_tauwoc=F, ln_stcor=F')
       !drag coefficient read from wave model definable only with mfs bulk formulae and core 
          ELSEIF (ln_cdgw .AND. .NOT. ln_NCAR )       THEN       
@@ -245 +245 @@
          ENDIF
       ELSE
-      IF ( ln_cdgw .OR. ln_sdw .OR. ln_tauoc .OR. ln_stcor )                & 
+      IF ( ln_cdgw .OR. ln_sdw .OR. ln_tauwoc .OR. ln_stcor )                & 
          &   CALL ctl_stop( 'Not Activated Wave Module (ln_wave=F) but asked coupling ',    &
          &                  'with drag coefficient (ln_cdgw =T) '  ,                        &
          &                  'or Stokes Drift (ln_sdw=T) ' ,                                 &
-         &                  'or ocean stress modification due to waves (ln_tauoc=T) ',      &  
+         &                  'or ocean stress modification due to waves (ln_tauwoc=T) ',      &  
          &                  'or Stokes-Coriolis term (ln_stcori=T)'  )
       ENDIF