New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 7431 – NEMO

Changeset 7431


Ignore:
Timestamp:
2016-12-02T11:01:53+01:00 (6 years ago)
Author:
timgraham
Message:

#1811 Fix for tests involving waves in SBC

Location:
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

    r7421 r7431  
    222222      !                                      !- fill the bulk structure with namelist informations 
    223223      CALL fld_fill( sf, slf_i, cn_dir, 'sbc_blk_init', 'surface boundary condition -- bulk formulae', 'namsbc_blk' ) 
     224      ! 
     225      IF ( ln_wave ) THEN 
     226      !Activated wave module but neither drag nor stokes drift activated 
     227         IF ( .NOT.(ln_cdgw .OR. ln_sdw .OR. ln_tauoc .OR. ln_stcor ) )   THEN 
     228            CALL ctl_warn( 'Ask for wave coupling but ln_cdgw=F, ln_sdw=F, ln_tauoc=F, ln_stcor=F') 
     229      !drag coefficient read from wave model definable only with mfs bulk formulae and core  
     230         ELSEIF (ln_cdgw .AND. .NOT. ln_NCAR )       THEN        
     231             CALL ctl_stop( 'drag coefficient read from wave model definable only with mfs bulk formulae and core') 
     232         ELSEIF (ln_stcor .AND. .NOT. ln_sdw)                             THEN 
     233             CALL ctl_stop( 'Stokes-Coriolis term calculated only if activated Stokes Drift ln_sdw=T') 
     234         ENDIF 
     235      ELSE 
     236      IF ( ln_cdgw .OR. ln_sdw .OR. ln_tauoc .OR. ln_stcor )                &  
     237         &   CALL ctl_stop( 'Not Activated Wave Module (ln_wave=F) but asked coupling ',    & 
     238         &                  'with drag coefficient (ln_cdgw =T) '  ,                        & 
     239         &                  'or Stokes Drift (ln_sdw=T) ' ,                                 & 
     240         &                  'or ocean stress modification due to waves (ln_tauoc=T) ',      &   
     241         &                  'or Stokes-Coriolis term (ln_stcori=T)'  ) 
     242      ENDIF  
    224243      ! 
    225244      !            
  • branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r7421 r7431  
    252252      taum(:,:) = 0._wp             !* wind stress module (needed in GLS in case of reduced restart) 
    253253 
    254       IF ( ln_wave ) THEN 
    255       !Activated wave module but neither drag nor stokes drift activated 
    256          IF ( .NOT.(ln_cdgw .OR. ln_sdw .OR. ln_tauoc .OR. ln_stcor ) )   THEN 
    257             CALL ctl_warn( 'Ask for wave coupling but ln_cdgw=F, ln_sdw=F, ln_tauoc=F, ln_stcor=F') 
    258       !drag coefficient read from wave model definable only with mfs bulk formulae and core  
    259          ELSEIF (ln_cdgw .AND. .NOT.(ln_blk_mfs .OR. ln_blk_core) )       THEN        
    260              CALL ctl_stop( 'drag coefficient read from wave model definable only with mfs bulk formulae and core') 
    261          ELSEIF (ln_stcor .AND. .NOT. ln_sdw)                             THEN 
    262              CALL ctl_stop( 'Stokes-Coriolis term calculated only if activated Stokes Drift ln_sdw=T') 
    263          ENDIF 
    264       ELSE 
    265       IF ( ln_cdgw .OR. ln_sdw .OR. ln_tauoc .OR. ln_stcor )                &  
    266          &   CALL ctl_stop( 'Not Activated Wave Module (ln_wave=F) but asked coupling ',    & 
    267          &                  'with drag coefficient (ln_cdgw =T) '  ,                        & 
    268          &                  'or Stokes Drift (ln_sdw=T) ' ,                                 & 
    269          &                  'or ocean stress modification due to waves (ln_tauoc=T) ',      &   
    270          &                  'or Stokes-Coriolis term (ln_stcori=T)'  ) 
    271       ENDIF  
    272254      !                          ! Choice of the Surface Boudary Condition (set nsbc) 
    273255      IF( ln_dm2dc ) THEN           !* daily mean to diurnal cycle 
Note: See TracChangeset for help on using the changeset viewer.