- Timestamp:
- 2015-10-31T08:40:45+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r5836 r5845 87 87 88 88 !! * Substitutions 89 # include "domzgr_substitute.h90"90 89 # include "vectopt_loop_substitute.h90" 91 90 !!---------------------------------------------------------------------- 92 !! NEMO/OPA 3. 3 , NEMO Consortium (2010)91 !! NEMO/OPA 3.7 , NEMO Consortium (2015) 93 92 !! $Id$ 94 93 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 430 429 DO jt = 1, nn_divdmp 431 430 ! 432 DO jk = 1, jpkm1 431 DO jk = 1, jpkm1 ! hdiv = e1e1 * div 433 432 hdiv(:,:) = 0._wp 434 433 DO jj = 2, jpjm1 435 434 DO ji = fs_2, fs_jpim1 ! vector opt. 436 hdiv(ji,jj) = & 437 ( e2u(ji ,jj ) * fse3u(ji ,jj ,jk) * u_bkginc(ji ,jj ,jk) & 438 - e2u(ji-1,jj ) * fse3u(ji-1,jj ,jk) * u_bkginc(ji-1,jj ,jk) & 439 + e1v(ji ,jj ) * fse3v(ji ,jj ,jk) * v_bkginc(ji ,jj ,jk) & 440 - e1v(ji ,jj-1) * fse3v(ji ,jj-1,jk) * v_bkginc(ji ,jj-1,jk) ) & 441 / ( e1e2t(ji,jj) * fse3t(ji,jj,jk) ) 435 hdiv(ji,jj) = ( e2u(ji ,jj) * e3u_n(ji ,jj,jk) * u_bkginc(ji ,jj,jk) & 436 & - e2u(ji-1,jj) * e3u_n(ji-1,jj,jk) * u_bkginc(ji-1,jj,jk) & 437 & + e1v(ji,jj ) * e3v_n(ji,jj ,jk) * v_bkginc(ji,jj ,jk) & 438 & - e1v(ji,jj-1) * e3v_n(ji,jj-1,jk) * v_bkginc(ji,jj-1,jk) ) / e3t_n(ji,jj,jk) 442 439 END DO 443 440 END DO … … 446 443 DO jj = 2, jpjm1 447 444 DO ji = fs_2, fs_jpim1 ! vector opt. 448 u_bkginc(ji,jj,jk) = u_bkginc(ji,jj,jk) + 0.2_wp * ( e1e2t(ji+1,jj) * hdiv(ji+1,jj) & 449 & - e1e2t(ji ,jj) * hdiv(ji ,jj) ) & 450 & * r1_e1u(ji,jj) * umask(ji,jj,jk) 451 v_bkginc(ji,jj,jk) = v_bkginc(ji,jj,jk) + 0.2_wp * ( e1e2t(ji,jj+1) * hdiv(ji,jj+1) & 452 & - e1e2t(ji,jj ) * hdiv(ji,jj ) ) & 453 & * r1_e2v(ji,jj) * vmask(ji,jj,jk) 445 u_bkginc(ji,jj,jk) = u_bkginc(ji,jj,jk) & 446 & + 0.2_wp * ( hdiv(ji+1,jj) - hdiv(ji ,jj) ) * r1_e1u(ji,jj) * umask(ji,jj,jk) 447 v_bkginc(ji,jj,jk) = v_bkginc(ji,jj,jk) & 448 & + 0.2_wp * ( hdiv(ji,jj+1) - hdiv(ji,jj ) ) * r1_e2v(ji,jj) * vmask(ji,jj,jk) 454 449 END DO 455 450 END DO … … 645 640 ! used to prevent the applied increments taking the temperature below the local freezing point 646 641 DO jk = 1, jpkm1 647 CALL eos_fzp( tsn(:,:,jk,jp_sal), fzptnz(:,:,jk), fsdept(:,:,jk) )642 CALL eos_fzp( tsn(:,:,jk,jp_sal), fzptnz(:,:,jk), gdept_n(:,:,jk) ) 648 643 END DO 649 644 ! … … 877 872 IF( lk_vvl ) THEN 878 873 DO jk = 1, jpk 879 fse3t_b(:,:,jk) = fse3t_n(:,:,jk)874 e3t_b(:,:,jk) = e3t_n(:,:,jk) 880 875 END DO 881 876 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.