Changeset 4443 for branches/2011
- Timestamp:
- 2014-02-04T13:15:36+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
r3849 r4443 236 236 DO jj = 2, jpjm1 237 237 DO ji = 2, jpim1 238 DO jk = 2, jpkm1238 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 239 239 #else 240 240 DO jk = 2, jpkm1 … … 266 266 DO jj = 2, jpjm1 267 267 DO ji = 2, jpim1 268 DO jk = 2, jpkm1268 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 269 269 #else 270 270 DO jk = 2, jpkm1 … … 297 297 DO jj = 2, jpjm1 298 298 DO ji = 2, jpim1 299 DO jk = 2, jpkm1299 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 300 300 #else 301 301 DO jk = 2, jpkm1 … … 352 352 END DO 353 353 ! 354 #if defined key_z_first 355 DO jj = 1, jpj, 1 356 DO ji = 1, jpi, 1 357 z_elem_b(ji,jj,mbkmax(ji,jj)) = 1._wp 358 END DO 359 END DO 360 #else 354 361 z_elem_b(:,:,jpk) = 1._wp 362 #endif 355 363 ! 356 364 ! Set surface condition on zwall_psi (1 at the bottom) … … 489 497 DO jj = 2, jpjm1 490 498 DO ji = 2, jpim1 491 DO jk = 2, jpkm1! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1499 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1 492 500 #else 493 501 DO jk = 2, jpkm1 ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1 … … 502 510 DO jj = 2, jpjm1 503 511 DO ji = 2, jpim1 504 DO jk = 2, jpk! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1512 DO jk = 2, mbkmax(ji,jj) ! jpk ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1 505 513 #else 506 514 DO jk = 2, jpk ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1 … … 515 523 DO jj = 2, jpjm1 516 524 DO ji = 2, jpim1 517 DO jk = jpk-1, 2, -1! Third recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk525 DO jk = mbkmax(ji,jj)-1, 2, -1 ! jpk-1, 2, -1 ! Third recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk 518 526 #else 519 527 DO jk = jpk-1, 2, -1 ! Third recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk … … 540 548 DO jj = 2, jpjm1 541 549 DO ji = 2, jpim1 542 DO jk = 2, jpkm1550 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 543 551 #else 544 552 DO jk = 2, jpkm1 … … 555 563 DO jj = 2, jpjm1 556 564 DO ji = 2, jpim1 557 DO jk = 2, jpkm1565 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 558 566 #else 559 567 DO jk = 2, jpkm1 … … 570 578 DO jj = 2, jpjm1 571 579 DO ji = 2, jpim1 572 DO jk = 2, jpkm1580 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 573 581 #else 574 582 DO jk = 2, jpkm1 … … 585 593 DO jj = 2, jpjm1 586 594 DO ji = 2, jpim1 587 DO jk = 2, jpkm1595 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 588 596 #else 589 597 DO jk = 2, jpkm1 … … 608 616 DO jj = 2, jpjm1 609 617 DO ji = 2, jpim1 610 DO jk = 2, jpkm1618 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 611 619 #else 612 620 DO jk = 2, jpkm1 … … 655 663 END DO 656 664 ! 665 #if defined key_z_first 666 DO jj = 1, jpj, 1 667 DO ji = 1, jpi, 1 668 z_elem_b(ji,jj,mbkmax(ji,jj)) = 1.0_wp 669 END DO 670 END DO 671 #else 657 672 z_elem_b(:,:,jpk) = 1._wp 673 #endif 658 674 659 675 ! Surface boundary condition on psi … … 832 848 DO jj = 2, jpjm1 833 849 DO ji = 2, jpim1 834 DO jk = 2, jpkm1! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1850 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1 835 851 #else 836 852 DO jk = 2, jpkm1 ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1 … … 845 861 DO jj = 2, jpjm1 846 862 DO ji = 2, jpim1 847 DO jk = 2, jpk! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1863 DO jk = 2, mbkmax(ji,jj) ! jpk ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1 848 864 #else 849 865 DO jk = 2, jpk ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1 … … 858 874 DO jj = 2, jpjm1 859 875 DO ji = 2, jpim1 860 DO jk = jpk-1, 2, -1! Third recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk876 DO jk = mbkmax(ji,jj)-1, 2, -1 ! jpk-1, 2, -1 ! Third recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk 861 877 #else 862 878 DO jk = jpk-1, 2, -1 ! Third recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk … … 878 894 DO jj = 2, jpjm1 879 895 DO ji = 2, jpim1 880 DO jk = 1, jpkm1896 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 881 897 #else 882 898 DO jk = 1, jpkm1 … … 893 909 DO jj = 2, jpjm1 894 910 DO ji = 2, jpim1 895 DO jk = 1, jpkm1911 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 896 912 #else 897 913 DO jk = 1, jpkm1 … … 908 924 DO jj = 2, jpjm1 909 925 DO ji = 2, jpim1 910 DO jk = 1, jpkm1926 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 911 927 #else 912 928 DO jk = 1, jpkm1 … … 926 942 DO jj = 2, jpjm1 927 943 DO ji = 2, jpim1 928 DO jk = 1, jpkm1944 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 929 945 #else 930 946 DO jk = 1, jpkm1 … … 944 960 DO jj = 2, jpjm1 945 961 DO ji = 2, jpim1 946 DO jk = 1, jpkm1 ! Note that this set boundary conditions on mxln at the same time962 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 ! Note that this set boundary conditions on mxln at the same time 947 963 #else 948 964 DO jk = 1, jpkm1 ! Note that this set boundary conditions on mxln at the same time … … 970 986 DO jj = 2, jpjm1 971 987 DO ji = 2, jpim1 972 DO jk = 2, jpkm1988 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 973 989 #else 974 990 DO jk = 2, jpkm1 … … 997 1013 DO jj = 2, jpjm1 998 1014 DO ji = 2, jpim1 999 DO jk = 2, jpkm11015 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 1000 1016 #else 1001 1017 DO jk = 2, jpkm1 … … 1049 1065 DO jj = 2, jpjm1 1050 1066 DO ji = 2, jpim1 1051 DO jk = 1, jpk1067 DO jk = 1, mbkmax(ji,jj) ! jpk 1052 1068 #else 1053 1069 DO jk = 1, jpk … … 1071 1087 DO jj = 2, jpjm1 1072 1088 DO ji = 2, jpim1 1073 DO jk = 2, jpkm1 !* vertical eddy viscosity at u- and v-points1089 DO jk = 2, mbkmax(ji,jj)-1 ! jpkm1 !* vertical eddy viscosity at u- and v-points 1074 1090 #else 1075 1091 DO jk = 2, jpkm1 !* vertical eddy viscosity at u- and v-points
Note: See TracChangeset
for help on using the changeset viewer.