- Timestamp:
- 2016-04-22T15:04:31+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r6152 r6492 137 137 IF( ln_sco ) ioptio = ioptio + 1 138 138 IF( ioptio /= 1 ) CALL ctl_stop( ' none or several vertical coordinate options used' ) 139 ! 140 ioptio = 0 141 IF ( ln_zco .AND. ln_isfcav ) ioptio = ioptio + 1 142 IF ( ln_sco .AND. ln_isfcav ) ioptio = ioptio + 1 143 IF( ioptio > 0 ) CALL ctl_stop( ' Cavity not tested/compatible with full step (zco) and sigma (ln_sco) ' ) 139 144 ! 140 145 ! Build the vertical coordinate system … … 503 508 CALL iom_close( inum ) 504 509 mbathy(:,:) = INT( bathy(:,:) ) 510 ! initialisation isf variables 511 risfdep(:,:)=0._wp ; misfdep(:,:)=1 505 512 ! ! ===================== 506 513 IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN ! ORCA R2 configuration … … 539 546 CALL iom_close( inum ) 540 547 ! 541 risfdep(:,:)=0._wp 542 misfdep(:,:)=1 548 ! initialisation isf variables 549 risfdep(:,:)=0._wp ; misfdep(:,:)=1 550 ! 543 551 IF ( ln_isfcav ) THEN 544 552 CALL iom_open ( 'isf_draft_meter.nc', inum )
Note: See TracChangeset
for help on using the changeset viewer.