Changeset 15279 for utils/tools/DOMAINcfg/src/domzgr.F90
 Timestamp:
 20210923T12:00:23+02:00 (3 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

utils/tools/DOMAINcfg/src/domzgr.F90
r14952 r15279 45 45 USE dombat 46 46 USE domisf 47 USE agrif_connect 47 48 USE agrif_domzgr 48 49 … … 176 177 IF ( ln_sco .AND. ln_isfcav ) ioptio = ioptio + 1 177 178 IF( ioptio > 0 ) CALL ctl_stop( ' Cavity not tested/compatible with full step (zco) and sigma (ln_sco) ' ) 179 180 #if defined key_agrif 181 ! IF ( (.NOT.Agrif_Root()).AND.((.NOT.ln_zps).OR.(.NOT.Agrif_parent(ln_zps)))) THEN 182 ! CALL ctl_stop( 'STOP', 'AGRIF zooms require ln_zps=T for both Child and Parent') 183 ! ENDIF 184 #endif 178 185 179 186 IF(.NOT.ln_read_cfg) THEN … … 560 567 REAL(wp) :: r_bump , h_bump , h_oce ! bump characteristics 561 568 REAL(wp) :: zi, zj, zh, zhmin ! local scalars 562 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zrand 569 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zrand, zbatv 563 570 !! 564 571 ! … … 609 616 ENDIF 610 617 IF ( cp_cfg=='DOME' ) THEN 611 bathy(:,:) = MIN(3600._wp, MAX( 600._wp, 600._wp gphit(:,:)*1.e3*0.01 )) 618 ALLOCATE(zbatv(jpi,jpj)) 619 zbatv(:,:) = MIN(3600._wp, MAX( 600._wp, 600._wp gphiv(:,:)*1.e3*0.01 )) 620 bathy(:,1) = 0._wp 621 DO jj =2,jpj 622 bathy(:,jj) = 0.5_wp*(zbatv(:,jj) + zbatv(:,jj1)) 623 END DO 624 CALL lbc_lnk( 'zgr_bat', bathy, 'T', 1._wp ) 612 625 WHERE (gphit(:,:) >0._wp) bathy(:,:) = 0._wp 613 626 ! Dig inlet: 614 627 WHERE ((gphit(:,:)>0._wp).AND.(glamt(:,:)>50._wp).AND.(glamt(:,:)<50._wp)) bathy(:,:) = 600._wp 628 DEALLOCATE(zbatv) 615 629 ENDIF 616 630 ! CALL lbc_lnk( 'zgr_bat', bathy, 'T', 1._wp ) … … 731 745 ENDIF 732 746 ! 747 #if defined key_agrif 748 IF ( .NOT.Agrif_Root() ) CALL agrif_bathymetry_connect 749 #endif 750 ! 733 751 IF ( .not. ln_sco ) THEN !== set a minimum depth ==! 734 752 IF( rn_hmin < 0._wp ) THEN ; ik =  INT( rn_hmin ) ! from a nb of level … … 827 845 mbathy( mi0(jpiglonn_hls):mi1(jpiglonn_hls),:) = jpkm1 828 846 ENDIF 829 ELSEIF( l_Iperio) THEN847 ELSEIF( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 ) THEN 830 848 IF(lwp) WRITE(numout,*)' eastwest cyclic boundary conditions on mbathy: jperio = ', jperio 831 mbathy( 1 ,:) = mbathy(jpim1,:)832 mbathy(jpi,:) = mbathy( 2 ,:)849 ! mbathy( 1 ,:) = mbathy(jpim1,:) 850 ! mbathy(jpi,:) = mbathy( 2 ,:) 833 851 ELSEIF( jperio == 2 ) THEN 834 852 IF(lwp) WRITE(numout,*) ' equatorial boundary conditions on mbathy: jperio = ', jperio … … 1409 1427 ! Envelope bathymetry saved in hbatt 1410 1428 hbatt(:,:) = zenv(:,:) 1411 IF (MINVAL( gphit(:,:) ) * MAXVAL( gphit(:,:) ) <= 0._wp ) THEN1429 IF ((ntopo>0).AND.MINVAL( gphit(:,:) ) * MAXVAL( gphit(:,:) ) <= 0._wp ) THEN 1412 1430 CALL ctl_warn( ' scoordinates are tapered in vicinity of the Equator' ) 1413 1431 DO jj = 1, jpj … … 1532 1550 END DO 1533 1551 END DO 1552 1553 WHERE (bathy(:,:)<=0) mbathy(:,:) = 0 1554 1534 1555 IF(lwp ) WRITE(numout,*) ' MIN val mbathy h90 ', MINVAL( mbathy(:,:) ), & 1535 1556 & ' MAX ', MAXVAL( mbathy(:,:) )
Note: See TracChangeset
for help on using the changeset viewer.