- Timestamp:
- 2014-02-04T13:14:23+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
r4409 r4431 142 142 zrau0r = 1.e0 / rau0 143 143 !CDIR NOVERRCHK 144 #if defined key_z_first 145 DO jj = 1, jpj 146 DO ji = 1, jpi 147 DO jk = 1, mbkmax(ji,jj) 148 zws(ji,jj,jk) = SQRT( ABS( pts(ji,jj,jk,jp_sal) ) ) 149 END DO 150 END DO 151 END DO 152 #else 144 153 zws(:,:,:) = SQRT( ABS( pts(:,:,:,jp_sal) ) ) 154 #endif 145 155 ! 146 156 #if defined key_z_first 147 157 DO jj = 1, jpj 148 158 DO ji = 1, jpi 149 DO jk = 1, jpkm1159 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 150 160 #else 151 161 DO jk = 1, jpkm1 … … 196 206 DO jj = 1, jpj 197 207 DO ji = 1, jpi 198 DO jk = 1, jpkm1208 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 199 209 prd(ji,jj,jk) = ( 0.0285_wp - rn_alpha * pts(ji,jj,jk,jp_tem) ) * tmask(ji,jj,jk) 200 210 END DO … … 211 221 DO jj = 1, jpj 212 222 DO ji = 1, jpi 213 DO jk = 1, jpkm1223 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 214 224 prd(ji,jj,jk) = ( rn_beta * pts(ji,jj,jk,jp_sal) - rn_alpha * pts(ji,jj,jk,jp_tem) ) * tmask(ji,jj,jk) 215 225 END DO … … 316 326 zrau0r = 1.e0 / rau0 317 327 !CDIR NOVERRCHK 328 #if defined key_z_first 329 DO jj = 1, jpj 330 DO ji = 1, jpi 331 DO jk = 1, mbkmax(ji,jj) 332 zws(ji,jj,jk) = SQRT( ABS( pts(ji,jj,jk,jp_sal) ) ) 333 END DO 334 END DO 335 END DO 336 #else 318 337 zws(:,:,:) = SQRT( ABS( pts(:,:,:,jp_sal) ) ) 338 #endif 319 339 ! 320 340 #if defined key_z_first 321 341 DO jj = 1, jpj 322 342 DO ji = 1, jpi 323 DO jk = 1, jpkm1343 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 324 344 #else 325 345 DO jk = 1, jpkm1 … … 373 393 DO jj = 1, jpj 374 394 DO ji = 1, jpi 375 DO jk = 1, jpkm1395 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 376 396 prd (ji,jj,jk) = ( 0.0285_wp - rn_alpha * pts(ji,jj,jk,jp_tem) ) * tmask(ji,jj,jk) 377 397 prhop(ji,jj,jk) = ( 1.e0_wp + prd(ji,jj,jk) ) * rau0 * tmask(ji,jj,jk) … … 390 410 DO jj = 1, jpj 391 411 DO ji = 1, jpi 392 DO jk = 1, jpkm1412 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 393 413 prd (ji,jj,jk) = ( rn_beta * pts(ji,jj,jk,jp_sal) - rn_alpha * pts(ji,jj,jk,jp_tem) ) * tmask(ji,jj,jk) 394 414 prhop(ji,jj,jk) = ( 1.e0_wp + prd(ji,jj,jk) ) * rau0 * tmask(ji,jj,jk) … … 619 639 DO jj = 1, jpj 620 640 DO ji = 1, jpi 621 DO jk = 2, jpkm1641 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 622 642 #else 623 643 DO jk = 2, jpkm1 … … 672 692 DO jj = 1, jpj 673 693 DO ji = 1, jpi 674 DO jk = 2, jpkm1694 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 675 695 pn2(ji,jj,jk) = grav * rn_alpha * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) ) & 676 696 & / fse3w(ji,jj,jk) * tmask(ji,jj,jk) … … 688 708 DO jj = 1, jpj 689 709 DO ji = 1, jpi 690 DO jk = 2, jpkm1710 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 691 711 pn2(ji,jj,jk) = grav * ( rn_alpha * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) ) & 692 712 & - rn_beta * ( pts(ji,jj,jk-1,jp_sal) - pts(ji,jj,jk,jp_sal) ) ) & … … 706 726 DO jj = 1, jpj ! Rrau = (alpha / beta) (dk[t] / dk[s]) 707 727 DO ji = 1, jpi 708 DO jk = 2, jpkm1728 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 709 729 #else 710 730 DO jk = 2, jpkm1 ! Rrau = (alpha / beta) (dk[t] / dk[s]) … … 778 798 DO jj = 1, jpj 779 799 DO ji = 1, jpi 780 DO jk = 1, jpk800 DO jk = 1, mbkmax(ji,jj) ! jpk 781 801 #else 782 802 DO jk = 1, jpk
Note: See TracChangeset
for help on using the changeset viewer.