Changeset 1529 for trunk/NEMO/LIM_SRC_2
- Timestamp:
- 2009-07-23T17:33:22+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/LIM_SRC_2/limadv_2.F90
r1510 r1529 25 25 PUBLIC lim_adv_x_2 ! called by lim_trp 26 26 PUBLIC lim_adv_y_2 ! called by lim_trp 27 28 !! * Substitutions 29 # include "vectopt_loop_substitute.h90" 27 30 28 31 !! * Module variables … … 110 113 111 114 ! Calculate fluxes and moments between boxes i<-->i+1 112 DO jj = 2, jpjm1 ! Flux from i to i+1 WHEN u GT 0 113 !i bug DO ji = 1, jpim1 114 !i DO jj = 1, jpj ! Flux from i to i+1 WHEN u GT 0 115 DO jj = 1, jpj ! Flux from i to i+1 WHEN u GT 0 115 116 DO ji = 1, jpi 116 117 zbet(ji,jj) = MAX( rzero, SIGN( rone, put(ji,jj) ) ) … … 138 139 END DO 139 140 140 DO jj = 2, jpjm1 ! Flux from i+1 to i when u LT 0. 141 !i DO jj = 1, jpjm1 ! Flux from i+1 to i when u LT 0. 142 DO ji = 1, jpim1 141 DO jj = 1, jpjm1 ! Flux from i+1 to i when u LT 0. 142 DO ji = 1, fs_jpim1 143 143 zalf = MAX( rzero, -put(ji,jj) ) * zrdt * e2u(ji,jj) / psm(ji+1,jj) 144 144 zalg (ji,jj) = zalf … … 159 159 160 160 DO jj = 2, jpjm1 ! Readjust moments remaining in the box. 161 DO ji = 2,jpim1161 DO ji = fs_2, fs_jpim1 162 162 zbt = zbet(ji-1,jj) 163 163 zbt1 = 1.0 - zbet(ji-1,jj) … … 174 174 ! Put the temporary moments into appropriate neighboring boxes. 175 175 DO jj = 2, jpjm1 ! Flux from i to i+1 IF u GT 0. 176 DO ji = 2,jpim1176 DO ji = fs_2, fs_jpim1 177 177 zbt = zbet(ji-1,jj) 178 178 zbt1 = 1.0 - zbet(ji-1,jj) … … 195 195 196 196 DO jj = 2, jpjm1 ! Flux from i+1 to i IF u LT 0. 197 DO ji = 2,jpim1197 DO ji = fs_2, fs_jpim1 198 198 zbt = zbet(ji,jj) 199 199 zbt1 = 1.0 - zbet(ji,jj) … … 225 225 CALL lbc_lnk( psxy, 'T', 1. ) 226 226 227 IF(ln_ctl) 227 IF(ln_ctl) THEN 228 228 CALL prt_ctl(tab2d_1=psm , clinfo1=' lim_adv_x: psm :', tab2d_2=ps0 , clinfo2=' ps0 : ') 229 229 CALL prt_ctl(tab2d_1=psx , clinfo1=' lim_adv_x: psx :', tab2d_2=psxx, clinfo2=' psxx : ') … … 303 303 304 304 ! Calculate fluxes and moments between boxes j<-->j+1 305 !!bug DO jj = 2, jpjm1306 305 DO jj = 1, jpj 307 DO ji = 2, jpim1 308 !!bug DO ji = 1, jpim1 306 DO ji = 1, jpi 309 307 ! Flux from j to j+1 WHEN v GT 0 310 308 zbet(ji,jj) = MAX( rzero, SIGN( rone, pvt(ji,jj) ) ) … … 333 331 334 332 DO jj = 1, jpjm1 ! Flux from j+1 to j when v LT 0. 335 DO ji = 2, jpim1 336 !i DO jj = 1, jpjm1 ! Flux from j+1 to j when v LT 0. 337 !i DO ji = 2, jpim1 333 DO ji = 1, jpi 338 334 zalf = ( MAX(rzero, -pvt(ji,jj) ) * zrdt * e1v(ji,jj) ) / psm(ji,jj+1) 339 335 zalg (ji,jj) = zalf … … 354 350 355 351 ! Readjust moments remaining in the box. 356 DO jj = 2, jpj m1357 DO ji = 2, jpim1352 DO jj = 2, jpj 353 DO ji = 1, jpi 358 354 zbt = zbet(ji,jj-1) 359 355 zbt1 = ( 1.0 - zbet(ji,jj-1) ) … … 370 366 ! Put the temporary moments into appropriate neighboring boxes. 371 367 DO jj = 2, jpjm1 ! Flux from j to j+1 IF v GT 0. 372 DO ji = 2, jpim1368 DO ji = 1, jpi 373 369 zbt = zbet(ji,jj-1) 374 370 zbt1 = ( 1.0 - zbet(ji,jj-1) ) … … 395 391 396 392 DO jj = 2, jpjm1 ! Flux from j+1 to j IF v LT 0. 397 DO ji = 2, jpim1393 DO ji = 1, jpi 398 394 zbt = zbet(ji,jj) 399 395 zbt1 = ( 1.0 - zbet(ji,jj) )
Note: See TracChangeset
for help on using the changeset viewer.