Changeset 6678
- Timestamp:
- 2016-06-09T15:37:05+02:00 (8 years ago)
- Location:
- branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r6603 r6678 1008 1008 ! ! Sum sea level 1009 1009 ssha(:,:) = ssha(:,:) + za1 * ssha_e(:,:) 1010 IF(ln_wd) ssha(:,:) = ssha i(:,:)1010 IF(ln_wd) ssha(:,:) = ssha(:,:) * (1 - wdmask(:,:)) + sshai(:,:) * wdmask(:,:) 1011 1011 ! ! ==================== ! 1012 1012 END DO ! end loop ! -
branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90
r6152 r6678 132 132 133 133 zflag = 0 134 zdepwd = 50._wp !maximum depth on which that W/D could possibly happen134 zdepwd = 150._wp !maximum depth on which that W/D could possibly happen 135 135 136 136 … … 201 201 202 202 IF(zdep1 > zdep2) THEN 203 IF(jk1 .eq. 1) wdmask(ji,jj) = 1 203 204 zflag = 1 204 wdmask(ji, jj) = 1205 205 zcoef = ( ( zdep2 - rn_wdmin2 ) * ztmp - zzflxn * z2dt ) / ( zflxp(ji,jj) * z2dt ) 206 206 zcoef = max(zcoef, 0._wp) … … 209 209 IF(zflxu1(ji-1,jj) < 0._wp) zwdlmtu(ji-1,jj) = zcoef 210 210 IF(zflxv1(ji, jj) > 0._wp) zwdlmtv(ji ,jj) = zcoef 211 IF(zflxv1(ji,jj-1) < 0._wp) zwdlmtv(ji -1,jj) = zcoef211 IF(zflxv1(ji,jj-1) < 0._wp) zwdlmtv(ji,jj-1) = zcoef 212 212 END IF 213 213 END DO ! ji loop … … 332 332 DO ji = 2, jpim1 333 333 334 wdmask(ji,jj) = 0334 !wdmask(ji,jj) = 0 335 335 IF(tmask(ji, jj, 1) < 0.5_wp) CYCLE 336 336 IF(bathy(ji,jj) > zdepwd) CYCLE … … 356 356 IF(zflxu1(ji-1,jj) < 0._wp) zwdlmtu(ji-1,jj) = zcoef 357 357 IF(zflxv1(ji, jj) > 0._wp) zwdlmtv(ji ,jj) = zcoef 358 IF(zflxv1(ji,jj-1) < 0._wp) zwdlmtv(ji -1,jj) = zcoef358 IF(zflxv1(ji,jj-1) < 0._wp) zwdlmtv(ji,jj-1) = zcoef 359 359 END IF 360 360 END DO ! ji loop
Note: See TracChangeset
for help on using the changeset viewer.