Changeset 7022
- Timestamp:
- 2016-10-11T18:18:38+02:00 (8 years ago)
- Location:
- branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r6986 r7022 473 473 ! 474 474 DO ji = 1, jpidta 475 zi = MAX(1.0-FLOAT((ji-25)**2)/484.0, 0.0 )475 zi = MAX(1.0-FLOAT((ji-25)**2)/484.0, -2.0 ) 476 476 DO jj = 1, jpjdta 477 zj = MAX(1.0-FLOAT((jj-17)**2)/196.0, 0.0 )478 zdta(ji,jj) = MAX(rn_bathy*zi*zj, 0.0)477 zj = MAX(1.0-FLOAT((jj-17)**2)/196.0, -2.0 ) 478 zdta(ji,jj) = MAX(rn_bathy*zi*zj, -2.0) 479 479 END DO 480 480 IF(lwp)write(numout,*) 'ZDTA ',ji,zi,zdta(ji,1) … … 521 521 IF(lwp)write(numout,*) 'ZDTA ',ji,zi,zdta(ji,1) 522 522 END DO 523 ! ! =========================== 524 zdta(1:2,:) = -4._wp 525 zdta(jpidta-1:jpidta,:) = -4._wp 526 zdta(:,1) = -4._wp 527 zdta(:,jpjdta) = -4._wp 528 zdta(:,1:3) = -4._wp 529 zdta(:,jpjdta-2:jpjdta) = -4._wp 523 530 ! ! =========================== 524 531 CASE DEFAULT -
branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90
r7016 r7022 399 399 ! 400 400 INTEGER :: ji, jj ! dummy loop indices 401 REAL(wp) :: zi, zj 401 402 !!---------------------------------------------------------------------- 402 403 ! … … 450 451 IF(lwp) WRITE(numout,*) '~~~~~~~~~~' 451 452 ! 453 DO ji = 1, jpi 454 zi = MAX(1.0-FLOAT((mig(ji)-25)**2)/400.0, 0.0 ) 455 DO jj = 1, jpj 456 zj = MAX(1.0-FLOAT((mjg(jj)-17)**2)/144.0, 0.0 ) 457 sshn(ji,jj) = -8.5_wp + 8.5_wp*zi*zj 458 END DO 459 END DO 460 461 ! 462 ! ! =========================== 463 CASE ( 5 ) ! WAD 5 configuration 464 ! ! ==================== 465 ! 466 IF(lwp) WRITE(numout,*) 467 IF(lwp) WRITE(numout,*) 'istate_wad : Double slope with shelf' 468 IF(lwp) WRITE(numout,*) '~~~~~~~~~~' 469 ! 470 ! Needed rn_wdmin2 increased to 0.01 for this case? 452 471 do ji = 1,jpi 453 sshn(ji,:) = ( -5.5_wp + 3.9_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1) 454 ! very small displacement test: 455 !sshn(ji,:) = ( -0.05_wp + 0.05_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1) 472 sshn(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1) 456 473 end do 457 474
Note: See TracChangeset
for help on using the changeset viewer.