Changeset 12147 for NEMO/branches/2019/dev_ASINTER-01-05_merged
- Timestamp:
- 2019-12-10T14:50:25+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/DYN/dynspg_ts.F90
r12063 r12147 687 687 hvr_e(2:jpim1,2:jpjm1) = ssvmask(2:jpim1,2:jpjm1) / ( hv_e(2:jpim1,2:jpjm1) + 1._wp - ssvmask(2:jpim1,2:jpjm1) ) 688 688 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp & 689 & , hu_e , 'U', -1._wp, hv_e , 'V', -1._wp &690 & , hur_e, 'U', -1._wp, hvr_e, 'V', -1._wp )689 & , hu_e , 'U', 1._wp, hv_e , 'V', 1._wp & 690 & , hur_e, 'U', 1._wp, hvr_e, 'V', 1._wp ) 691 691 ELSE 692 692 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp ) -
NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/SBC/sbcmod.F90
r12063 r12147 229 229 CASE( 1 ) !- Ice-cover climatology ("Ice-if" model) 230 230 CASE( 2 ) !- SI3 ice model 231 IF( .NOT.( ln_blk .OR. ln_cpl .OR. ln_abl ) ) &232 & CALL ctl_stop( 'sbc_init : SI3 sea-ice model requires ln_blk or ln_cpl or ln_abl = T' )231 IF( .NOT.( ln_blk .OR. ln_cpl .OR. ln_abl .OR. ln_usr ) ) & 232 & CALL ctl_stop( 'sbc_init : SI3 sea-ice model requires ln_blk or ln_cpl or ln_abl or ln_usr = T' ) 233 233 CASE( 3 ) !- CICE ice model 234 IF( .NOT.( ln_blk .OR. ln_cpl .OR. ln_abl ) ) &235 & CALL ctl_stop( 'sbc_init : CICE sea-ice model requires ln_blk or ln_cpl or ln_abl = T' )234 IF( .NOT.( ln_blk .OR. ln_cpl .OR. ln_abl .OR. ln_usr ) ) & 235 & CALL ctl_stop( 'sbc_init : CICE sea-ice model requires ln_blk or ln_cpl or ln_abl or ln_usr = T' ) 236 236 IF( lk_agrif ) & 237 237 & CALL ctl_stop( 'sbc_init : CICE sea-ice model not currently available with AGRIF' )
Note: See TracChangeset
for help on using the changeset viewer.