Changeset 5211
- Timestamp:
- 2015-04-15T12:10:56+02:00 (9 years ago)
- Location:
- branches/2015/dev_r4826_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r4826_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r5110 r5211 447 447 ! 448 448 ! Note that the "unclipped" bottom friction parameter is used even with explicit drag 449 zu_frc(:,:) = zu_frc(:,:) + hur(:,:) * bfrua(:,:) * zwx(:,:) 450 zv_frc(:,:) = zv_frc(:,:) + hvr(:,:) * bfrva(:,:) * zwy(:,:) 449 IF(ln_wd) THEN 450 zu_frc(:,:) = zu_frc(:,:) + MAX(hur(:,:) * bfrua(:,:),-1._wp / rdtbt) * zwx(:,:) 451 zv_frc(:,:) = zv_frc(:,:) + MAX(hvr(:,:) * bfrva(:,:),-1._wp / rdtbt) * zwy(:,:) 452 ELSE 453 zu_frc(:,:) = zu_frc(:,:) + hur(:,:) * bfrua(:,:) * zwx(:,:) 454 zv_frc(:,:) = zv_frc(:,:) + hvr(:,:) * bfrva(:,:) * zwy(:,:) 455 END IF 451 456 ! 452 457 IF (ln_bt_fw) THEN ! Add wind forcing … … 793 798 ! 794 799 ! Add bottom stresses: 795 zu_trd(:,:) = zu_trd(:,:) + bfrua(:,:) * zun_e(:,:) * hur_e(:,:) 796 zv_trd(:,:) = zv_trd(:,:) + bfrva(:,:) * zvn_e(:,:) * hvr_e(:,:) 800 IF(ln_wd) THEN 801 zu_trd(:,:) = zu_trd(:,:) + MAX(bfrua(:,:) * hur_e(:,:), -1._wp / rdtbt) * zun_e(:,:) 802 zv_trd(:,:) = zv_trd(:,:) + MAX(bfrva(:,:) * hvr_e(:,:), -1._wp / rdtbt) * zvn_e(:,:) 803 ELSE 804 zu_trd(:,:) = zu_trd(:,:) + bfrua(:,:) * zun_e(:,:) * hur_e(:,:) 805 zv_trd(:,:) = zv_trd(:,:) + bfrva(:,:) * zvn_e(:,:) * hvr_e(:,:) 806 END IF 797 807 ! 798 808 ! Surface pressure trend: -
branches/2015/dev_r4826_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/wadlmt.F90
r5073 r5211 171 171 172 172 DO jk = 1, jpkm1 173 !un(:,:,1:jpkm1) = un(:,:,1:jpkm1) * zwdlmtu(:, :) 174 !vn(:,:,1:jpkm1) = vn(:,:,1:jpkm1) * zwdlmtv(:, :) 175 176 un(:,:,jk) = un(:,:,jk) * zwdlmtu(:, :) 177 vn(:,:,jk) = vn(:,:,jk) * zwdlmtv(:, :) 173 un(:,:,jk) = un(:,:,jk) * zwdlmtu(:, :) 174 vn(:,:,jk) = vn(:,:,jk) * zwdlmtv(:, :) 178 175 END DO 179 176
Note: See TracChangeset
for help on using the changeset viewer.