Changeset 4428
- Timestamp:
- 2014-02-04T13:14:06+01:00 (10 years ago)
- Location:
- branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r3432 r4428 209 209 DO jj = 1, jpj 210 210 DO ji = 1, jpi 211 DO jk = 1, jpkm1211 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 212 212 #else 213 213 DO jk = 1, jpkm1 … … 242 242 DO jj = 2, jpjm1 243 243 DO ji = 2, jpim1 244 DO jk = 1, jpkm1244 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 245 245 #else 246 246 DO jk = 1, jpkm1 ! -------------------------- … … 691 691 zu_asp = ( zu_sum(ji,jj) - ub_b(ji,jj) ) / z2dt_b 692 692 zv_asp = ( zv_sum(ji,jj) - vb_b(ji,jj) ) / z2dt_b 693 DO jk=1, jpkm1693 DO jk=1,mbkmax(ji,jj)-1 ! jpkm1 694 694 ua(ji,jj,jk) = ua(ji,jj,jk) + zu_asp 695 695 va(ji,jj,jk) = va(ji,jj,jk) + zv_asp -
branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90
r4409 r4428 144 144 DO ji = 1, jpi 145 145 zwt(ji,jj,1) = 0._wp 146 DO jk = 2, jpk146 DO jk = 2, mbkmax(ji,jj) ! jpk 147 147 zwt(ji,jj,jk) = avt (ji,jj,jk) 148 148 END DO … … 153 153 DO ji = 1, jpi 154 154 zwt(ji,jj,1) = 0._wp 155 DO jk = 2, jpk155 DO jk = 2, mbkmax(ji,jj) ! jpk 156 156 zwt(ji,jj,jk) = fsavs(ji,jj,jk) 157 157 END DO … … 172 172 DO jj = 2, jpjm1 173 173 DO ji = 2, jpim1 174 DO jk = 2, jpkm1174 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 175 175 #else 176 176 DO jk = 2, jpkm1 … … 186 186 DO jj = 2, jpjm1 187 187 DO ji = 2, jpim1 188 DO jk = 2, jpkm1188 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 189 189 #else 190 190 DO jk = 2, jpkm1 … … 204 204 DO jj = 2, jpjm1 205 205 DO ji = 2, jpim1 206 DO jk = 1, jpkm1206 DO jk = 1, mbkmax(ji,jj) ! jpkm1 207 207 ! after scale factor at T-point 208 208 ze3ta = ( 1. - r_vvl ) + r_vvl * fse3t_a(ji,jj,jk) … … 250 250 #if defined key_z_first 251 251 zwt(ji,jj,1) = zwd(ji,jj,1) 252 DO jk = 2, jpkm1252 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 253 253 zwt(ji,jj,jk) = zwd(ji,jj,jk) - zwi(ji,jj,jk) * zws(ji,jj,jk-1) / zwt(ji,jj,jk-1) 254 254 END DO … … 279 279 ze3tn = ( 1. - r_vvl ) + r_vvl * fse3t(ji,jj,1) 280 280 pta(ji,jj,1,jn) = ze3tb * ptb(ji,jj,1,jn) + p2dt(1) * ze3tn * pta(ji,jj,1,jn) 281 DO jk = 2, jpkm1281 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 282 282 ze3tb = ( 1. - r_vvl ) + r_vvl * fse3t_b(ji,jj,jk) 283 283 ze3tn = ( 1. - r_vvl ) + r_vvl * fse3t (ji,jj,jk) … … 308 308 #if defined key_z_first 309 309 pta(ji,jj,jpkm1,jn) = pta(ji,jj,jpkm1,jn) / zwt(ji,jj,jpkm1) * tmask(ji,jj,jpkm1) 310 DO jk = jpk-2, 1, -1310 DO jk = mbkmax(ji,jj)-2, 1, -1 ! jpk-2 311 311 pta(ji,jj,jk,jn) = ( pta(ji,jj,jk,jn) - zws(ji,jj,jk) * pta(ji,jj,jk+1,jn) ) & 312 312 & / zwt(ji,jj,jk) * tmask(ji,jj,jk)
Note: See TracChangeset
for help on using the changeset viewer.