- Timestamp:
- 2017-09-19T17:41:15+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/dynspg_ts.F90
r8403 r8544 421 421 DO ji = 2, jpim1 422 422 ll_tmp1 = MIN( sshn(ji,jj) , sshn(ji+1,jj) ) > & 423 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji+1,jj) ) .AND. &424 & MAX( sshn(ji,jj) + ht_ wd(ji,jj), sshn(ji+1,jj) + ht_wd(ji+1,jj) ) &423 & MAX( -ht_0(ji,jj) , -ht_0(ji+1,jj) ) .AND. & 424 & MAX( sshn(ji,jj) + ht_0(ji,jj), sshn(ji+1,jj) + ht_0(ji+1,jj) ) & 425 425 & > rn_wdmin1 + rn_wdmin2 426 426 ll_tmp2 = ( ABS( sshn(ji+1,jj) - sshn(ji ,jj)) > 1.E-12 ).AND.( & 427 427 & MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 428 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 )428 & MAX( -ht_0(ji,jj) , -ht_0(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 ) 429 429 430 430 IF(ll_tmp1) THEN … … 432 432 ELSE IF(ll_tmp2) THEN 433 433 ! no worries about sshn(ji+1,jj) - sshn(ji ,jj) = 0, it won't happen ! here 434 zcpx(ji,jj) = ABS( (sshn(ji+1,jj) + ht_ wd(ji+1,jj) - sshn(ji,jj) - ht_wd(ji,jj)) &434 zcpx(ji,jj) = ABS( (sshn(ji+1,jj) + ht_0(ji+1,jj) - sshn(ji,jj) - ht_0(ji,jj)) & 435 435 & / (sshn(ji+1,jj) - sshn(ji ,jj)) ) 436 436 zcpx(ji,jj) = max(min( zcpx(ji,jj) , 1.0_wp),0.0_wp) … … 441 441 442 442 ll_tmp1 = MIN( sshn(ji,jj) , sshn(ji,jj+1) ) > & 443 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji,jj+1) ) .AND. &444 & MAX( sshn(ji,jj) + ht_ wd(ji,jj), sshn(ji,jj+1) + ht_wd(ji,jj+1) ) &443 & MAX( -ht_0(ji,jj) , -ht_0(ji,jj+1) ) .AND. & 444 & MAX( sshn(ji,jj) + ht_0(ji,jj), sshn(ji,jj+1) + ht_0(ji,jj+1) ) & 445 445 & > rn_wdmin1 + rn_wdmin2 446 446 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji,jj+1)) > 1.E-12 ).AND.( & 447 447 & MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 448 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 )448 & MAX( -ht_0(ji,jj) , -ht_0(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 ) 449 449 450 450 IF(ll_tmp1) THEN … … 452 452 ELSE IF(ll_tmp2) THEN 453 453 ! no worries about sshn(ji,jj+1) - sshn(ji,jj ) = 0, it won't happen ! here 454 zcpy(ji,jj) = ABS( (sshn(ji,jj+1) + ht_ wd(ji,jj+1) - sshn(ji,jj) - ht_wd(ji,jj)) &454 zcpy(ji,jj) = ABS( (sshn(ji,jj+1) + ht_0(ji,jj+1) - sshn(ji,jj) - ht_0(ji,jj)) & 455 455 & / (sshn(ji,jj+1) - sshn(ji,jj )) ) 456 456 zcpy(ji,jj) = max(min( zcpy(ji,jj) , 1.0_wp),0.0_wp) … … 697 697 ztwdmask(ji,jj) = 1._wp 698 698 ELSE IF ( zsshp2_e(ji,jj) + ht_0(ji,jj) > rn_wdmin1 ) THEN 699 !CEODztwdmask(ji,jj) = ( zsshp2_e(ji,jj) + ht_0(ji,jj) - rn_wdmin1 ) * zwdramp 700 ztwdmask(ji,jj) = (tanh(5._wp*( ( zsshp2_e(ji,jj) + ht_0(ji,jj) - rn_wdmin1 )/rn_wdmin1)) ) 699 ztwdmask(ji,jj) = (tanh(50._wp*( ( zsshp2_e(ji,jj) + ht_0(ji,jj) - rn_wdmin1 )/rn_wdmin1)) ) 701 700 ELSE 702 701 ztwdmask(ji,jj) = 0._wp … … 889 888 DO ji = 2, jpim1 890 889 ll_tmp1 = MIN( zsshp2_e(ji,jj) , zsshp2_e(ji+1,jj) ) > & 891 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji+1,jj) ) .AND. &892 & MAX( zsshp2_e(ji,jj) + ht_ wd(ji,jj), zsshp2_e(ji+1,jj) + ht_wd(ji+1,jj) ) &890 & MAX( -ht_0(ji,jj) , -ht_0(ji+1,jj) ) .AND. & 891 & MAX( zsshp2_e(ji,jj) + ht_0(ji,jj), zsshp2_e(ji+1,jj) + ht_0(ji+1,jj) ) & 893 892 & > rn_wdmin1 + rn_wdmin2 894 893 ll_tmp2 = (ABS(zsshp2_e(ji,jj) - zsshp2_e(ji+1,jj)) > 1.E-12 ).AND.( & 895 894 & MAX( zsshp2_e(ji,jj) , zsshp2_e(ji+1,jj) ) > & 896 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 )895 & MAX( -ht_0(ji,jj) , -ht_0(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 ) 897 896 898 897 IF(ll_tmp1) THEN … … 900 899 ELSE IF(ll_tmp2) THEN 901 900 ! no worries about zsshp2_e(ji+1,jj) - zsshp2_e(ji ,jj) = 0, it won't happen ! here 902 zcpx(ji,jj) = ABS( (zsshp2_e(ji+1,jj) + ht_ wd(ji+1,jj) - zsshp2_e(ji,jj) - ht_wd(ji,jj)) &901 zcpx(ji,jj) = ABS( (zsshp2_e(ji+1,jj) + ht_0(ji+1,jj) - zsshp2_e(ji,jj) - ht_0(ji,jj)) & 903 902 & / (zsshp2_e(ji+1,jj) - zsshp2_e(ji ,jj)) ) 904 903 ELSE … … 907 906 908 907 ll_tmp1 = MIN( zsshp2_e(ji,jj) , zsshp2_e(ji,jj+1) ) > & 909 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji,jj+1) ) .AND. &910 & MAX( zsshp2_e(ji,jj) + ht_ wd(ji,jj), zsshp2_e(ji,jj+1) + ht_wd(ji,jj+1) ) &908 & MAX( -ht_0(ji,jj) , -ht_0(ji,jj+1) ) .AND. & 909 & MAX( zsshp2_e(ji,jj) + ht_0(ji,jj), zsshp2_e(ji,jj+1) + ht_0(ji,jj+1) ) & 911 910 & > rn_wdmin1 + rn_wdmin2 912 911 ll_tmp2 = (ABS(zsshp2_e(ji,jj) - zsshp2_e(ji,jj+1)) > 1.E-12 ).AND.( & 913 912 & MAX( zsshp2_e(ji,jj) , zsshp2_e(ji,jj+1) ) > & 914 & MAX( -ht_ wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 )913 & MAX( -ht_0(ji,jj) , -ht_0(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 ) 915 914 916 915 IF(ll_tmp1) THEN … … 918 917 ELSE IF(ll_tmp2) THEN 919 918 ! no worries about zsshp2_e(ji,jj+1) - zsshp2_e(ji,jj ) = 0, it won't happen ! here 920 zcpy(ji,jj) = ABS( (zsshp2_e(ji,jj+1) + ht_ wd(ji,jj+1) - zsshp2_e(ji,jj) - ht_wd(ji,jj)) &919 zcpy(ji,jj) = ABS( (zsshp2_e(ji,jj+1) + ht_0(ji,jj+1) - zsshp2_e(ji,jj) - ht_0(ji,jj)) & 921 920 & / (zsshp2_e(ji,jj+1) - zsshp2_e(ji,jj )) ) 922 921 ELSE … … 1066 1065 1067 1066 IF( ln_wd ) THEN 1068 !CEOD zhura = MAX(hu_0(ji,jj) + zsshu_a(ji,jj), rn_wdmin1)1069 !CEOD zhvra = MAX(hv_0(ji,jj) + zsshv_a(ji,jj), rn_wdmin1)1070 1067 zhura = hu_0(ji,jj) + zsshu_a(ji,jj) 1071 1068 zhvra = hv_0(ji,jj) + zsshv_a(ji,jj) … … 1108 1105 IF( .NOT.ln_linssh ) THEN !* Update ocean depth (variable volume case only) 1109 1106 IF( ln_wd ) THEN 1110 !CEOD hu_e (:,:) = MAX(hu_0(:,:) + zsshu_a(:,:), rn_wdmin1)1111 !CEOD hv_e (:,:) = MAX(hv_0(:,:) + zsshv_a(:,:), rn_wdmin1)1112 1107 hu_e (:,:) = hu_0(:,:) + zsshu_a(:,:) 1113 1108 hv_e (:,:) = hv_0(:,:) + zsshv_a(:,:)
Note: See TracChangeset
for help on using the changeset viewer.