Changeset 7527 for branches/2016
- Timestamp:
- 2017-01-05T18:26:14+01:00 (7 years ago)
- Location:
- branches/2016/dev_merge_2016/NEMOGCM
- Files:
-
- 5 edited
-
CONFIG/WAD_TEST_CASES/EXP00/namelist_cfg (modified) (3 diffs)
-
CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_istate.F90 (modified) (6 diffs)
-
CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_zgr.F90 (modified) (9 diffs)
-
NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (6 diffs)
-
NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/EXP00/namelist_cfg
r7467 r7527 16 16 nn_it000 = 1 ! first time step 17 17 nn_itend = 3840 ! last time step 18 !nn_itend = 6 ! last time step 18 19 nn_leapy = 30 ! Leap year calendar (1) or not (0) 19 20 nn_stock = 48000 ! frequency of creation of a restart file (modulo referenced to 1) … … 28 29 ln_read_cfg = .false. ! (=T) read the domain configuration file 29 30 ! ! (=F) user defined configuration ==>>> see usrdef(_...) modules 31 ln_write_cfg= .true. ! (=T) create the domain configuration file 30 32 / 31 33 !----------------------------------------------------------------------- … … 447 449 !----------------------------------------------------------------------- 448 450 ln_wd = .true. ! T/F activation of wetting and drying 449 rn_wdmin1 = 0. 25 ! Minimum wet depth on dried cells451 rn_wdmin1 = 0.35 ! Minimum wet depth on dried cells 450 452 rn_wdmin2 = 0.000 ! Tolerance of min wet depth on dried cells 451 453 rn_wdld = 2.5 ! Land elevation below which wetting/drying is allowed -
branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_istate.F90
r7514 r7527 87 87 ! 88 88 do ji = 1,jpi 89 pssh(ji,:) = ( -5.5_wp + 5.5_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1)89 pssh(ji,:) = ( -5.5_wp + 7.4_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1) 90 90 end do 91 91 ! ! ==================== … … 98 98 ! 99 99 do ji = 1,jpi 100 pssh(ji,:) = ( - 5.5_wp + 6.5_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1)100 pssh(ji,:) = ( -1.5_wp + 5.0_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1) 101 101 end do 102 102 ! ! ==================== … … 109 109 ! 110 110 do ji = 1,jpi 111 pssh(ji,:) = ( - 5.5_wp + 5.5_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1)111 pssh(ji,:) = ( -4.5_wp + 6.8_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1) 112 112 end do 113 113 … … 125 125 DO jj = 1, jpj 126 126 zj = MAX(1.0-((gphit(1,jj)-17._wp)**2)/144.0, 0.0 ) 127 pssh(ji,jj) = - 8.5_wp + 8.5_wp*zi*zj127 pssh(ji,jj) = -2.5_wp + 5.4_wp*zi*zj 128 128 END DO 129 129 END DO … … 139 139 ! 140 140 do ji = 1,jpi 141 pssh(ji,:) = ( - 5.5_wp + 5.5_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1)141 pssh(ji,:) = ( -2.5_wp + 5.5_wp*glamt(ji,1)/50._wp)*ptmask(ji,:,1) 142 142 end do 143 143 … … 152 152 ! 153 153 do ji = 1,jpi 154 !6a 155 !pssh(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*ptmask(ji,:,1) 156 !Some variations in initial slope that have been tested 157 !6b 158 !pssh(ji,:) = ( -5.5_wp + 6.5_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*ptmask(ji,:,1) 159 !6c 160 !pssh(ji,:) = ( -5.5_wp + 7.5_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*ptmask(ji,:,1) 161 !6d 162 !pssh(ji,:) = ( -4.5_wp + 8.0_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*ptmask(ji,:,1) 163 !6e 164 pssh(ji,:) = ( -3.5_wp + 5.5_wp*(50._wp-glamt(ji,1))/50._wp)*ptmask(ji,:,1) 165 !6f 166 !pssh(ji,:) = ( 0.5_wp + 3.75_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*ptmask(ji,:,1) 154 pssh(ji,:) = ( -2.5_wp + 5.5_wp*(50._wp-glamt(ji,1))/50._wp)*ptmask(ji,:,1) 167 155 end do 168 156 ! 169 157 do ji = mi0(jpiglo/2), mi0(jpiglo) 170 158 pts(ji,:,:,jp_sal) = 30._wp 159 pssh(ji,:) = -0.1*ptmask(ji,:,1) 171 160 end do 172 161 ! -
branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_zgr.F90
r7514 r7527 67 67 REAL(wp) :: ze3min ! local scalar 68 68 REAL(wp) :: zi, zj, zbathy ! local scalar 69 REAL(wp) :: ztmpu, ztmpv, ztmpf, ztmpu1, ztmpv1, ztmpf1 69 REAL(wp) :: ztmpu, ztmpv, ztmpf, ztmpu1, ztmpv1, ztmpf1, zwet 70 70 REAL(wp), DIMENSION(jpi,jpj) :: zht, zhu, zhv, z2d ! 2D workspace 71 71 !!---------------------------------------------------------------------- … … 105 105 DO ji = 1, jpi 106 106 zi = MIN((glamt(ji,1) - 10.0)/40.0, 1.0 ) 107 zht(ji,:) = MAX(zbathy*zi, 1.5)107 zht(ji,:) = MAX(zbathy*zi, -2.0) 108 108 END DO 109 109 zht(mi0(1):mi1(1),:) = -4._wp … … 120 120 ! 121 121 DO ji = 1, jpi 122 zi = MAX(1.0-((glamt(ji,1)-25.0)**2)/484.0, 0.0)123 zht(ji,:) = MAX(zbathy*zi, 1.5)122 zi = MAX(1.0-((glamt(ji,1)-25.0)**2)/484.0, -0.3 ) 123 zht(ji,:) = MAX(zbathy*zi, -2.0) 124 124 END DO 125 125 zht(mi0(1):mi1(1),:) = -4._wp … … 139 139 DO jj = 1, jpj 140 140 zj = MAX(1.0-((gphit(1,jj)-17.0)**2)/196.0, -2.0 ) 141 zht(ji,jj) = MAX(zbathy*zi*zj, 1.5)141 zht(ji,jj) = MAX(zbathy*zi*zj, -2.0) 142 142 END DO 143 143 END DO … … 156 156 DO ji = 1, jpi 157 157 zi = MIN(glamt(ji,1)/45.0, 1.0 ) 158 zht(ji,:) = MAX(zbathy*zi, 1.5)158 zht(ji,:) = MAX(zbathy*zi, -2.0) 159 159 IF( glamt(ji,1) >= 46.0 ) THEN 160 160 zht(ji,:) = 10.0 … … 165 165 zht(ji,:) = 2.5 166 166 ELSE IF( glamt(ji,1) >= 4.0 .AND. glamt(ji,1) < 15.0 ) THEN 167 zi = 2.0/11.0168 zht(ji,:) = MAX(2.5 - zi*(16.0-glamt(ji,1)), 1.5)169 ELSE IF( glamt(ji,1) >= 1.0 .AND. glamt(ji,1) < 4.0 ) THEN170 zht(ji,:) = 1.5167 zi = 4.5/11.0 168 zht(ji,:) = MAX(2.5 - zi*(16.0-glamt(ji,1)), -2.0) 169 ELSE IF( glamt(ji,1) >= 0.0 .AND. glamt(ji,1) < 4.0 ) THEN 170 zht(ji,:) = -2.0 171 171 ENDIF 172 172 END DO … … 186 186 DO ji = 1, jpi 187 187 zi = MAX(1.0-((glamt(ji,1)-25.0)**2)/484.0, -2.0 ) 188 zj = 0.95*MAX(EXP(-1.0*((glamt(ji,1)-25.0)**2)/32.0) , 0.0 )189 zht(ji,:) = MAX(zbathy*(zi-zj), 1.0)188 zj = 1.075*MAX(EXP(-1.0*((glamt(ji,1)-25.0)**2)/32.0) , 0.0 ) 189 zht(ji,:) = MAX(zbathy*(zi-zj), -2.0) 190 190 END DO 191 191 zht(mi0(1):mi1(1),:) = -4._wp … … 222 222 END DO 223 223 CALL lbc_lnk( zhv, 'V', 1. ) ! boundary condition: this mask the surrounding grid-points 224 !avoid the zero depth on T- (U-,V-,F-) points 225 DO jj = 1, jpj 226 DO ji = 1, jpi 227 IF(ABS(zht(ji,jj)) < rn_wdmin1) & 228 & zht(ji,jj) = SIGN(1._wp, zht(ji,jj)) * rn_wdmin1 229 IF(ABS(zhu(ji,jj)) < rn_wdmin1) & 230 & zhu(ji,jj) = SIGN(1._wp, zhu(ji,jj)) * rn_wdmin1 231 IF(ABS(zhv(ji,jj)) < rn_wdmin1) & 232 & zhv(ji,jj) = SIGN(1._wp, zhv(ji,jj)) * rn_wdmin1 233 END DO 234 END DO 224 DO jj = mj0(1), mj1(1) ! first row of global domain only 225 zhv(:,jj) = zht(:,jj) 226 END DO 227 DO jj = mj0(jpjglo), mj1(jpjglo) ! last row of global domain only 228 zhv(:,jj) = zht(:,jj) 229 END DO 235 230 ! 236 231 CALL zgr_z1d( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d ) ! Reference z-coordinate system … … 264 259 IF( zht(ji,jj) <= -(rn_wdld - rn_wdmin2)) THEN 265 260 k_bot(ji,jj) = 0 266 zht(ji,jj) = rn_wdmin1 * REAL( jpkm1 , wp) * 0.5_wp 267 ELSEIF(zht(ji,jj) <= rn_wdmin1) THEN 268 k_bot(ji,jj) = 2 269 zht(ji,jj) = rn_wdmin1 * REAL( jpkm1 , wp) * 0.5_wp 261 k_top(ji,jj) = 0 270 262 ENDIF 271 263 END DO 272 264 END DO 273 DO ji = 1, jpim1274 zhu(ji,:) = 0.5_wp * ( zht(ji,:) + zht(ji+1,:) )275 END DO276 ! ! ==>>> set by hand non-zero value on277 ! first/last columns & rows278 CALL lbc_lnk( zhu, 'U', 1. ) ! boundary condition: this mask the surrounding grid-points279 DO ji = mi0(1), mi1(1) ! first row of global domain only280 zhu(ji,:) = zht(ji,:)281 END DO282 DO ji = mi0(jpiglo), mi1(jpiglo) ! last row of global domain only283 zhu(ji,:) = zht(ji,:)284 END DO285 ! at v-point: averaging zht286 zhv = 0._wp287 DO jj = 1, jpjm1288 zhv(:,jj) = 0.5_wp * ( zht(:,jj) + zht(:,jj+1) )289 END DO290 CALL lbc_lnk( zhv, 'V', 1. )291 DO jj = mj0(1), mj1(1) ! first row of global domain only292 zhv(:,jj) = zht(:,jj)293 END DO294 DO jj = mj0(jpjglo), mj1(jpjglo) ! last row of global domain only295 zhv(:,jj) = zht(:,jj)296 END DO297 265 ! 298 266 ! !* terrain-following coordinate with e3.(k)=cst) 299 267 ! ! OVERFLOW case : identical with j-index (T=V, U=F) 300 z1_jpkm1 = 1._wp / REAL( jpkm1 , wp)301 DO jk = 1, jpk302 pdept(:,:,jk) = zht(:,:) * z1_jpkm1 * ( REAL( jk , wp ) - 0.5_wp )303 pdepw(:,:,jk) = zht(:,:) * z1_jpkm1 * ( REAL( jk-1 , wp ) )304 pe3t (:,:,jk) = zht(:,:) * z1_jpkm1305 pe3u (:,:,jk) = zhu(:,:) * z1_jpkm1306 pe3v (:,:,jk) = zhv(:,:) * z1_jpkm1307 pe3f (:,:,jk) = zhu(:,:) * z1_jpkm1308 pe3w (:,:,jk) = zht(:,:) * z1_jpkm1309 pe3uw(:,:,jk) = zhu(:,:) * z1_jpkm1310 pe3vw(:,:,jk) = zhv(:,:) * z1_jpkm1311 END DO312 268 DO jj = 1, jpjm1 313 269 DO ji = 1, jpim1 314 ztmpu = zht(ji,jj)+zht(ji+1,jj) 315 ztmpv = zht(ji,jj)+zht(ji,jj+1) 316 ztmpf = zht(ji,jj)+zht(ji+1,jj)+zht(ji,jj+1)+zht(ji+1,jj+1) 317 ztmpu1 = zht(ji,jj)*zht(ji+1,jj) 318 ztmpv1 = zht(ji,jj)*zht(ji,jj+1) 319 ztmpf1 = MIN(zht(ji,jj), zht(ji+1,jj), zht(ji,jj+1), zht(ji+1,jj+1)) * & 320 & MAX(zht(ji,jj), zht(ji+1,jj), zht(ji,jj+1), zht(ji+1,jj+1)) 321 IF( (ztmpu1 < 0._wp.OR.ABS(ztmpu) < rn_wdmin1) ) THEN 322 pe3u (ji,jj,:) = 0.5_wp* ( pe3t(ji,jj,:) + pe3t(ji+1,jj,:) ) 323 pe3uw(ji,jj,:) = 0.5_wp* ( pe3w(ji,jj,:) + pe3w(ji+1,jj,:) ) 324 ENDIF 325 IF( (ztmpv1 < 0._wp.OR.ABS(ztmpv) < rn_wdmin1) ) THEN 326 pe3v (ji,jj,:) = 0.5_wp* ( pe3t(ji,jj,:) + pe3t(ji,jj+1,:) ) 327 pe3vw(ji,jj,:) = 0.5_wp* ( pe3w(ji,jj,:) + pe3w(ji,jj+1,:) ) 328 ENDIF 329 IF( (ztmpf1 < 0._wp.OR.ABS(ztmpf) < rn_wdmin1) ) THEN 330 pe3f (ji,jj,:) = 0.25_wp* ( pe3t(ji,jj,:) + pe3t(ji+1,jj,:) & 331 & + pe3t(ji,jj+1,:) + pe3t(ji+1,jj+1,:) ) 332 ENDIF 333 pe3f (ji,jj,:) = 0.25_wp* ( pe3t(ji,jj,:) + pe3t(ji+1,jj,:) & 334 & + pe3t(ji,jj+1,:) + pe3t(ji+1,jj+1,:) ) 335 END DO 336 END DO 270 z1_jpkm1 = 1._wp / REAL( k_bot(ji,jj) - k_top(ji,jj) + 1 , wp) 271 DO jk = 1, jpk 272 zwet = MAX( zht(ji,jj), rn_wdmin1 ) 273 pdept(ji,jj,jk) = zwet * z1_jpkm1 * ( REAL( jk , wp ) - 0.5_wp ) 274 pdepw(ji,jj,jk) = zwet * z1_jpkm1 * ( REAL( jk-1 , wp ) ) 275 pe3t (ji,jj,jk) = zwet * z1_jpkm1 276 pe3w (ji,jj,jk) = zwet * z1_jpkm1 277 zwet = MAX( zhu(ji,jj), rn_wdmin1 ) 278 pe3u (ji,jj,jk) = zwet * z1_jpkm1 279 pe3f (ji,jj,jk) = zwet * z1_jpkm1 280 pe3uw(ji,jj,jk) = zwet * z1_jpkm1 281 zwet = MAX( zhv(ji,jj), rn_wdmin1 ) 282 pe3vw(ji,jj,jk) = zwet * z1_jpkm1 283 pe3v (ji,jj,jk) = zwet * z1_jpkm1 284 END DO 285 END DO 286 END DO 337 287 CALL lbc_lnk( pe3u , 'U', 1. ) 338 288 CALL lbc_lnk( pe3uw, 'U', 1. ) -
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
r7514 r7527 458 458 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji+1,jj) + ht_wd(ji+1,jj) ) & 459 459 & > rn_wdmin1 + rn_wdmin2 460 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 461 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 460 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji+1,jj) ) > 1.E-12 ) .AND. ( & 461 & MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 462 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 ) 462 463 463 464 IF(ll_tmp1) THEN … … 475 476 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji,jj+1) + ht_wd(ji,jj+1) ) & 476 477 & > rn_wdmin1 + rn_wdmin2 477 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 478 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 478 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji,jj+1) ) > 1.E-12 ) .AND. ( & 479 & MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 480 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 ) 479 481 480 482 IF(ll_tmp1) THEN … … 708 710 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji+1,jj) + ht_wd(ji+1,jj) ) & 709 711 & > rn_wdmin1 + rn_wdmin2 710 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 711 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 712 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji+1,jj) ) > 1.E-12 ) .AND. ( & 713 & MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 714 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 ) 712 715 713 716 IF(ll_tmp1) THEN … … 725 728 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji,jj+1) + ht_wd(ji,jj+1) ) & 726 729 & > rn_wdmin1 + rn_wdmin2 727 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 728 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 730 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji,jj+1) ) > 1.E-12 ) .AND. ( & 731 & MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 732 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 ) 729 733 730 734 IF(ll_tmp1) THEN … … 1005 1009 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji+1,jj) + ht_wd(ji+1,jj) ) & 1006 1010 & > rn_wdmin1 + rn_wdmin2 1007 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 1008 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 1011 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji+1,jj) ) > 1.E-12 ) .AND. ( & 1012 & MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 1013 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 ) 1009 1014 1010 1015 IF(ll_tmp1) THEN … … 1022 1027 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji,jj+1) + ht_wd(ji,jj+1) ) & 1023 1028 & > rn_wdmin1 + rn_wdmin2 1024 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 1025 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 1029 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji,jj+1) ) > 1.E-12 ) .AND. ( & 1030 & MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 1031 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 ) 1026 1032 1027 1033 IF(ll_tmp1) THEN -
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r7514 r7527 399 399 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji+1,jj) + ht_wd(ji+1,jj) ) & 400 400 & > rn_wdmin1 + rn_wdmin2 401 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 402 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 401 ll_tmp2 = ( ABS( sshn(ji+1,jj) - sshn(ji ,jj)) > 1.E-12 ).AND.( & 402 & MAX( sshn(ji,jj) , sshn(ji+1,jj) ) > & 403 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 ) 403 404 404 405 IF(ll_tmp1) THEN … … 416 417 & MAX( sshn(ji,jj) + ht_wd(ji,jj), sshn(ji,jj+1) + ht_wd(ji,jj+1) ) & 417 418 & > rn_wdmin1 + rn_wdmin2 418 ll_tmp2 = MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 419 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 419 ll_tmp2 = ( ABS( sshn(ji,jj) - sshn(ji,jj+1)) > 1.E-12 ).AND.( & 420 & MAX( sshn(ji,jj) , sshn(ji,jj+1) ) > & 421 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 ) 420 422 421 423 IF(ll_tmp1) THEN … … 761 763 & MAX( zsshp2_e(ji,jj) + ht_wd(ji,jj), zsshp2_e(ji+1,jj) + ht_wd(ji+1,jj) ) & 762 764 & > rn_wdmin1 + rn_wdmin2 763 ll_tmp2 = MAX( zsshp2_e(ji,jj) , zsshp2_e(ji+1,jj) ) > & 764 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 765 ll_tmp2 = (ABS(zsshp2_e(ji,jj) - zsshp2_e(ji+1,jj)) > 1.E-12 ).AND.( & 766 & MAX( zsshp2_e(ji,jj) , zsshp2_e(ji+1,jj) ) > & 767 & MAX( -ht_wd(ji,jj) , -ht_wd(ji+1,jj) ) + rn_wdmin1 + rn_wdmin2 ) 765 768 766 769 IF(ll_tmp1) THEN … … 778 781 & MAX( zsshp2_e(ji,jj) + ht_wd(ji,jj), zsshp2_e(ji,jj+1) + ht_wd(ji,jj+1) ) & 779 782 & > rn_wdmin1 + rn_wdmin2 780 ll_tmp2 = MAX( zsshp2_e(ji,jj) , zsshp2_e(ji,jj+1) ) > & 781 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 783 ll_tmp2 = (ABS(zsshp2_e(ji,jj) - zsshp2_e(ji,jj+1)) > 1.E-12 ).AND.( & 784 & MAX( zsshp2_e(ji,jj) , zsshp2_e(ji,jj+1) ) > & 785 & MAX( -ht_wd(ji,jj) , -ht_wd(ji,jj+1) ) + rn_wdmin1 + rn_wdmin2 ) 782 786 783 787 IF(ll_tmp1) THEN
Note: See TracChangeset
for help on using the changeset viewer.
