Changeset 4458 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO
- Timestamp:
- 2014-02-04T13:16:58+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
r4446 r4458 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 864 iku = MIN( MAX( 1, nmln(ji,jj) , nmln(ji+1,jj) ) , jpkm1 ) ! ML (MAX of T-pts, bound by jpkm1) 865 ikv = MIN( MAX( 1, nmln(ji,jj) , nmln(ji,jj+1) ) , jpkm1 ) ! 866 #endif 860 !!$#if defined key_z_first 861 !!$ ! ML (MAX of T-pts, bound by mbkmax(ji,jj)-1) 862 !!$ iku = MIN( MAX( 1, nmln(ji,jj) , nmln(ji+1,jj) ) , MAX(1,mbkmax(ji,jj)-1) ) 863 !!$ ! Need to use MAX(1, mbkmax(ji,jj)-1) as latter can be zero. 864 !!$ ikv = MIN( MAX( 1, nmln(ji,jj) , nmln(ji,jj+1) ) , MAX(1,mbkmax(ji,jj)-1) ) 865 !!$#else 866 ! ML (MAX of T-pts, bound by jpkm1) 867 iku = MIN( MAX( 1, nmln(ji,jj) , nmln(ji+1,jj) ) , jpkm1 ) 868 ikv = MIN( MAX( 1, nmln(ji,jj) , nmln(ji,jj+1) ) , jpkm1 ) 869 !!$#endif 867 870 zbu = 0.5_wp * ( p_dzr(ji,jj,iku) + p_dzr(ji+1,jj ,iku) ) 868 871 zbv = 0.5_wp * ( p_dzr(ji,jj,ikv) + p_dzr(ji ,jj+1,ikv) ) … … 880 883 ! !== i- & j-slopes at w-points just below the Mixed Layer ==! 881 884 ! 882 #if defined key_z_first883 ik = MIN( nmln(ji,jj) + 1, mbkmax(ji,jj) )884 #else885 ik = MIN( nmln(ji,jj) + 1, jpk f)886 #endif885 !!$#if defined key_z_first 886 !!$ ik = MIN( nmln(ji,jj) + 1, mbkmax(ji,jj) ) 887 !!$#else 888 ik = MIN( nmln(ji,jj) + 1, jpk ) 889 !!$#endif 887 890 ikm1 = MAX( 1, ik-1 ) 888 891 ! !- vertical density gradient for w-slope (from N^2)
Note: See TracChangeset
for help on using the changeset viewer.