Changeset 2350 for branches/nemo_v3_3_beta
- Timestamp:
- 2010-11-01T17:44:01+01:00 (14 years ago)
- Location:
- branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
r2287 r2350 191 191 INTEGER :: ji, jj, jk ! dummy loop indices 192 192 REAL(wp) :: z1_rau0 ! local scalar 193 !!---------------------------------------------------------------------- 193 REAL(wp) :: zfact ! local scalar 194 !!---------------------------------------------------------------------- 195 ! 196 zfact = 0.5e0 194 197 ! 195 198 z1_rau0 = 1.e0 / rau0 … … 204 207 ! ! apply the runoff input flow 205 208 DO jk = 1, nk_rnf(ji,jj) 206 phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - rnf(ji,jj)* z1_rau0 / h_rnf(ji,jj)209 phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * z1_rau0 / h_rnf(ji,jj) 207 210 END DO 208 211 END DO … … 212 215 DO ji = 1, jpi 213 216 DO jk = 1, nk_rnf(ji,jj) 214 phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - rnf(ji,jj)* z1_rau0 / h_rnf(ji,jj)217 phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * z1_rau0 / h_rnf(ji,jj) 215 218 END DO 216 219 END DO … … 218 221 ENDIF 219 222 ELSE !== runoff put only at the surface ==! 220 phdivn(:,:,1) = phdivn(:,:,1) - rnf(:,:) * z1_rau0 / fse3t(:,:,1) 223 IF( lk_vvl ) THEN ! variable volume case 224 h_rnf(:,:) = fse3t(:,:,1) ! recalculate h_rnf to be depth of top box 225 ENDIF 226 phdivn(:,:,1) = phdivn(:,:,1) - ( rnf(:,:) + rnf_b(:,:) ) * zfact * z1_rau0 / fse3t(:,:,1) 221 227 ENDIF 222 228 ! -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
r2287 r2350 131 131 ENDIF 132 132 133 !---------------------------------------- 134 ! EMP, EMPS and QNS effects 135 !---------------------------------------- 133 136 ! Set before sbc tracer content fields 134 137 ! ************************************ … … 194 197 CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_tsc(:,:,jp_sal) ) 195 198 ENDIF 196 ! !== Runoffs ==! 199 ! 200 !---------------------------------------- 201 ! River Runoff effects 202 !---------------------------------------- 203 ! 204 zfact = 0.5e0 205 197 206 ! Effect on (t,s) due to river runoff (dilution effect automatically applied via vertical tracer advection) 198 207 IF( ln_rnf ) THEN
Note: See TracChangeset
for help on using the changeset viewer.