Changeset 4446 for branches/2011/DEV_r2739_STFC_dCSE
- Timestamp:
- 2014-02-04T13:15:54+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
r4427 r4446 172 172 DO jj = 1, jpjm1 !== i- & j-gradient of density ==! 173 173 DO ji = 1, jpim1 174 DO jk = 1, jpkf174 DO jk = 1, mbkmax(ji,jj) ! jpkf 175 175 #else 176 176 DO jk = 1, jpkf !== i- & j-gradient of density ==! … … 202 202 DO ji = 1, jpi 203 203 zdzr(ji,jj,1) = 0._wp !== Local vertical density gradient at T-point == ! (evaluated from N^2) 204 DO jk = 2, jpkfm1204 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 205 205 zdzr(ji,jj,jk) = zm1_g * ( prd(ji,jj,jk) + 1._wp ) & 206 206 & * ( pn2(ji,jj,jk) + pn2(ji,jj,jk+1) ) * ( 1._wp - 0.5_wp * tmask(ji,jj,jk+1) ) … … 231 231 DO jj = 2, jpjm1 !* Slopes at u and v points 232 232 DO ji = 2, jpim1 233 DO jk = 2, jpkfm1233 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 234 234 #else 235 235 DO jk = 2, jpkfm1 !* Slopes at u and v points … … 275 275 DO jj = 2, jpjm1, MAX(1, jpj-3) ! rows jj=2 and =jpjm1 only 276 276 DO ji = 2, jpim1 277 DO jk = 2, jpkfm1277 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 278 278 #else 279 279 DO jk = 2, jpkfm1 … … 297 297 DO jj = 3, jpj-2 ! other rows 298 298 DO ji = 2, jpim1 299 DO jk = 2, jpkfm1299 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 300 300 #else 301 301 DO jj = 3, jpj-2 ! other rows … … 319 319 DO jj = 2, jpjm1 320 320 DO ji = 2, jpim1 321 DO jk = 2, jpkfm1321 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 322 322 #else 323 323 ! !* decrease along coastal boundaries … … 340 340 DO jj = 2, jpjm1 341 341 DO ji = 2, jpim1 342 DO jk = 2, jpkfm1342 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 343 343 #else 344 344 DO jk = 2, jpkfm1 … … 384 384 DO jj = 2, jpjm1, MAX(1, jpj-3) ! rows jj=2 and =jpjm1 only 385 385 DO ji = 2, jpim1 386 DO jk = 2, jpkfm1386 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 387 387 #else 388 388 DO jk = 2, jpkfm1 … … 407 407 DO jj = 3, jpj-2 ! other rows 408 408 DO ji = 2, jpim1 409 DO jk = 2, jpkfm1409 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 410 410 #else 411 411 DO jj = 3, jpj-2 ! other rows … … 430 430 DO jj = 2, jpjm1 431 431 DO ji = 2, jpim1 432 DO jk = 2, jpkfm1432 DO jk = 2, mbkmax(ji,jj)-1 ! jpkfm1 433 433 #else 434 434 ! !* decrease along coastal boundaries … … 818 818 DO jj = 1, jpj 819 819 DO ji = 1, jpi 820 DO jk = 1, jpkf! =1 inside the mixed layer, =0 otherwise820 DO jk = 1, mbkmax(ji,jj) ! jpkf ! =1 inside the mixed layer, =0 otherwise 821 821 #else 822 822 DO jk = 1, jpkf ! =1 inside the mixed layer, =0 otherwise … … 858 858 ! 859 859 ! !- vertical density gradient for u- and v-slopes (from dzr at T-point) 860 #if defined key_z_first 861 iku = MIN( MAX( 1, nmln(ji,jj) , nmln(ji+1,jj) ) , mbkmax(ji,jj)-1 ) ! ML (MAX of T-pts, bound by mbkmax(ji,jj)) 862 ikv = MIN( MAX( 1, nmln(ji,jj) , nmln(ji,jj+1) ) , mbkmax(ji,jj)-1 ) ! 863 #else 860 864 iku = MIN( MAX( 1, nmln(ji,jj) , nmln(ji+1,jj) ) , jpkm1 ) ! ML (MAX of T-pts, bound by jpkm1) 861 865 ikv = MIN( MAX( 1, nmln(ji,jj) , nmln(ji,jj+1) ) , jpkm1 ) ! 866 #endif 862 867 zbu = 0.5_wp * ( p_dzr(ji,jj,iku) + p_dzr(ji+1,jj ,iku) ) 863 868 zbv = 0.5_wp * ( p_dzr(ji,jj,ikv) + p_dzr(ji ,jj+1,ikv) ) … … 875 880 ! !== i- & j-slopes at w-points just below the Mixed Layer ==! 876 881 ! 882 #if defined key_z_first 883 ik = MIN( nmln(ji,jj) + 1, mbkmax(ji,jj) ) 884 #else 877 885 ik = MIN( nmln(ji,jj) + 1, jpkf ) 886 #endif 878 887 ikm1 = MAX( 1, ik-1 ) 879 888 ! !- vertical density gradient for w-slope (from N^2)
Note: See TracChangeset
for help on using the changeset viewer.