Changeset 6748 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF
- Timestamp:
- 2016-06-28T11:53:56+02:00 (8 years ago)
- Location:
- branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF
- Files:
-
- 4 edited
-
zdfbfr.F90 (modified) (10 diffs)
-
zdfevd.F90 (modified) (2 diffs)
-
zdfmxl.F90 (modified) (3 diffs)
-
zdftke.F90 (modified) (35 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90
r6140 r6748 112 112 IF ( ln_loglayer.AND. .NOT.ln_linssh ) THEN ! "log layer" bottom friction coefficient 113 113 114 !$OMP PARALLEL DO private(jj,ji,ikbt,ztmp) 114 115 DO jj = 1, jpj 115 116 DO ji = 1, jpi … … 123 124 ! (ISF) 124 125 IF ( ln_isfcav ) THEN 126 !$OMP PARALLEL DO private(jj,ji,ikbt,ztmp) 125 127 DO jj = 1, jpj 126 128 DO ji = 1, jpi … … 135 137 ! 136 138 ELSE 139 !$OMP PARALLEL WORKSHARE 137 140 zbfrt(:,:) = bfrcoef2d(:,:) 138 141 ztfrt(:,:) = tfrcoef2d(:,:) 139 ENDIF 140 142 !$OMP END PARALLEL WORKSHARE 143 ENDIF 144 145 !$OMP PARALLEL DO private(jj,ji,ikbu,ikbv,zvu,zuv,zecu,zecv) 141 146 DO jj = 2, jpjm1 142 147 DO ji = 2, jpim1 … … 173 178 174 179 IF( ln_isfcav ) THEN 180 !$OMP PARALLEL DO private(jj,ji,ikbu,ikbv,zvu,zuv,zecu,zecv) 175 181 DO jj = 2, jpjm1 176 182 DO ji = 2, jpim1 … … 266 272 CASE( 0 ) 267 273 IF(lwp) WRITE(numout,*) ' free-slip ' 274 !$OMP PARALLEL WORKSHARE 268 275 bfrua(:,:) = 0.e0 269 276 bfrva(:,:) = 0.e0 270 277 tfrua(:,:) = 0.e0 271 278 tfrva(:,:) = 0.e0 279 !$OMP END PARALLEL WORKSHARE 272 280 ! 273 281 CASE( 1 ) … … 296 304 ENDIF 297 305 ! 306 !$OMP PARALLEL WORKSHARE 298 307 bfrua(:,:) = - bfrcoef2d(:,:) 299 308 bfrva(:,:) = - bfrcoef2d(:,:) 309 !$OMP END PARALLEL WORKSHARE 300 310 ! 301 311 IF ( ln_isfcav ) THEN … … 310 320 ENDIF 311 321 ! 322 !$OMP PARALLEL WORKSHARE 312 323 tfrua(:,:) = - tfrcoef2d(:,:) 313 324 tfrva(:,:) = - tfrcoef2d(:,:) 325 !$OMP END PARALLEL WORKSHARE 314 326 END IF 315 327 ! … … 371 383 ! 372 384 IF( ln_loglayer.AND. ln_linssh ) THEN ! set "log layer" bottom friction once for all 385 !$OMP PARALLEL DO private(jj,ji,ikbt,ztmp) 373 386 DO jj = 1, jpj 374 387 DO ji = 1, jpi … … 380 393 END DO 381 394 IF ( ln_isfcav ) THEN 395 !$OMP PARALLEL DO private(jj,ji,ikbt,ztmp) 382 396 DO jj = 1, jpj 383 397 DO ji = 1, jpi … … 419 433 zmaxtfr = -1.e10_wp ! initialise tracker for maximum of bottom friction coefficient 420 434 ! 435 !$OMP PARALLEL DO private(jj,ji,ikbu,ikbv,zfru,zfrv,ictu,ictv,zminbfr,zmaxbfr,zmintfr,zmaxtfr) 421 436 DO jj = 2, jpjm1 422 437 DO ji = 2, jpim1 -
branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90
r6140 r6748 76 76 zavm_evd(:,:,:) = avm(:,:,:) ! set avm prior to evd application 77 77 ! 78 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji) 78 79 DO jk = 1, jpkm1 79 80 DO jj = 2, jpj ! no vector opt. … … 97 98 ! 98 99 CASE DEFAULT ! enhance vertical eddy diffusivity only (if rn2<-1.e-12) 100 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji) 99 101 DO jk = 1, jpkm1 100 102 !!! WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd ! agissant sur T SEUL! -
branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
r6352 r6748 96 96 97 97 ! w-level of the mixing and mixed layers 98 !$OMP PARALLEL WORKSHARE 98 99 nmln(:,:) = nlb10 ! Initialization to the number of w ocean point 99 100 hmlp(:,:) = 0._wp ! here hmlp used as a dummy variable, integrating vertically N^2 101 !$OMP END PARALLEL WORKSHARE 100 102 zN2_c = grav * rho_c * r1_rau0 ! convert density criteria into N^2 criteria 101 103 DO jk = nlb10, jpkm1 … … 110 112 ! 111 113 ! w-level of the turbocline and mixing layer (iom_use) 114 !$OMP PARALLEL WORKSHARE 112 115 imld(:,:) = mbkt(:,:) + 1 ! Initialization to the number of w ocean point 116 !$OMP END PARALLEL WORKSHARE 117 113 118 DO jk = jpkm1, nlb10, -1 ! from the bottom to nlb10 114 119 DO jj = 1, jpj … … 119 124 END DO 120 125 ! depth of the mixing and mixed layers 126 !$OMP PARALLEL DO schedule(static) private(jj, ji, iiki, iikn) 121 127 DO jj = 1, jpj 122 128 DO ji = 1, jpi -
branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
r6497 r6748 179 179 ! 180 180 IF( kt /= nit000 ) THEN ! restore before value to compute tke 181 !$OMP PARALLEL WORKSHARE 181 182 avt (:,:,:) = avt_k (:,:,:) 182 183 avm (:,:,:) = avm_k (:,:,:) 183 184 avmu(:,:,:) = avmu_k(:,:,:) 184 185 avmv(:,:,:) = avmv_k(:,:,:) 186 !$OMP END PARALLEL WORKSHARE 185 187 ENDIF 186 188 ! … … 189 191 CALL tke_avn ! now avt, avm, avmu, avmv 190 192 ! 193 !$OMP PARALLEL WORKSHARE 191 194 avt_k (:,:,:) = avt (:,:,:) 192 195 avm_k (:,:,:) = avm (:,:,:) 193 196 avmu_k(:,:,:) = avmu(:,:,:) 194 197 avmv_k(:,:,:) = avmv(:,:,:) 198 !$OMP END PARALLEL WORKSHARE 195 199 ! 196 200 #if defined key_agrif … … 253 257 ! !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 254 258 IF ( ln_isfcav ) THEN 259 !$OMP PARALLEL DO schedule(static) private(jj, ji) 255 260 DO jj = 2, jpjm1 ! en(mikt(ji,jj)) = rn_emin 256 261 DO ji = fs_2, fs_jpim1 ! vector opt. … … 259 264 END DO 260 265 END IF 266 !$OMP PARALLEL DO schedule(static) private(jj, ji) 261 267 DO jj = 2, jpjm1 ! en(1) = rn_ebb taum / rau0 (min value rn_emin0) 262 268 DO ji = fs_2, fs_jpim1 ! vector opt. … … 295 301 zpelc(:,:,1) = MAX( rn2b(:,:,1), 0._wp ) * gdepw_n(:,:,1) * e3w_n(:,:,1) 296 302 DO jk = 2, jpk 297 zpelc(:,:,jk) = zpelc(:,:,jk-1) + MAX( rn2b(:,:,jk), 0._wp ) * gdepw_n(:,:,jk) * e3w_n(:,:,jk) 303 !$OMP PARALLEL DO schedule(static) private(jj, ji) 304 DO jj =1, jpj 305 DO ji=1, jpi 306 zpelc(ji,jj,jk) = zpelc(ji,jj,jk-1) + MAX( rn2b(ji,jj,jk), 0._wp ) * gdepw_n(ji,jj,jk) * e3w_n(ji,jj,jk) 307 END DO 308 END DO 298 309 END DO 299 310 ! !* finite Langmuir Circulation depth … … 309 320 END DO 310 321 ! ! finite LC depth 322 !$OMP PARALLEL DO schedule(static) private(jj, ji) 311 323 DO jj = 1, jpj 312 324 DO ji = 1, jpi … … 315 327 END DO 316 328 zcof = 0.016 / SQRT( zrhoa * zcdrag ) 329 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zus, zind, zwlc) 317 330 DO jk = 2, jpkm1 !* TKE Langmuir circulation source term added to en 318 331 DO jj = 2, jpjm1 … … 338 351 ! ! zdiag : diagonal zd_up : upper diagonal zd_lw : lower diagonal 339 352 ! 353 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji) 340 354 DO jk = 2, jpkm1 !* Shear production at uw- and vw-points (energy conserving form) 341 355 DO jj = 1, jpjm1 … … 356 370 ! Note that zesh2 is also computed in the next loop. 357 371 ! We decided to compute it twice to keep code readability and avoid an IF case in the DO loops 372 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zesh2, zri) 358 373 DO jk = 2, jpkm1 359 374 DO jj = 2, jpjm1 … … 372 387 ENDIF 373 388 ! 389 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zcof, zzd_up, zzd_lw, zesh2) 374 390 DO jk = 2, jpkm1 !* Matrix and right hand side in en 375 391 DO jj = 2, jpjm1 … … 405 421 ! !* Matrix inversion from level 2 (tke prescribed at level 1) 406 422 DO jk = 3, jpkm1 ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1 423 !$OMP PARALLEL DO schedule(static) private(jj, ji) 407 424 DO jj = 2, jpjm1 408 425 DO ji = fs_2, fs_jpim1 ! vector opt. … … 411 428 END DO 412 429 END DO 430 !$OMP PARALLEL DO schedule(static) private(jj, ji) 413 431 DO jj = 2, jpjm1 ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1 414 432 DO ji = fs_2, fs_jpim1 ! vector opt. … … 417 435 END DO 418 436 DO jk = 3, jpkm1 437 !$OMP PARALLEL DO schedule(static) private(jj, ji) 419 438 DO jj = 2, jpjm1 420 439 DO ji = fs_2, fs_jpim1 ! vector opt. … … 423 442 END DO 424 443 END DO 444 !$OMP PARALLEL DO schedule(static) private(jj, ji) 425 445 DO jj = 2, jpjm1 ! thrid recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk 426 446 DO ji = fs_2, fs_jpim1 ! vector opt. … … 429 449 END DO 430 450 DO jk = jpk-2, 2, -1 451 !$OMP PARALLEL DO schedule(static) private(jj, ji) 431 452 DO jj = 2, jpjm1 432 453 DO ji = fs_2, fs_jpim1 ! vector opt. … … 435 456 END DO 436 457 END DO 458 !$OMP PARALLEL DO schedule(static) private(jk,jj, ji) 437 459 DO jk = 2, jpkm1 ! set the minimum value of tke 438 460 DO jj = 2, jpjm1 … … 450 472 451 473 IF( nn_etau == 1 ) THEN !* penetration below the mixed layer (rn_efr fraction) 474 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji) 452 475 DO jk = 2, jpkm1 453 476 DO jj = 2, jpjm1 … … 459 482 END DO 460 483 ELSEIF( nn_etau == 2 ) THEN !* act only at the base of the mixed layer (jk=nmln) (rn_efr fraction) 484 !$OMP PARALLEL DO schedule(static) private(jj, ji, jk) 461 485 DO jj = 2, jpjm1 462 486 DO ji = fs_2, fs_jpim1 ! vector opt. … … 467 491 END DO 468 492 ELSEIF( nn_etau == 3 ) THEN !* penetration belox the mixed layer (HF variability) 493 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, ztx2, zty2, ztau, zdif) 469 494 DO jk = 2, jpkm1 470 495 DO jj = 2, jpjm1 … … 545 570 ! 546 571 ! initialisation of interior minimum value (avoid a 2d loop with mikt) 572 !$OMP PARALLEL WORKSHARE 547 573 zmxlm(:,:,:) = rmxl_min 548 574 zmxld(:,:,:) = rmxl_min 575 !$OMP END PARALLEL WORKSHARE 549 576 ! 550 577 IF( ln_mxl0 ) THEN ! surface mixing length = F(stress) : l=vkarmn*2.e5*taum/(rau0*g) 578 !$OMP PARALLEL DO schedule(static) private(jj, ji, zraug) 551 579 DO jj = 2, jpjm1 552 580 DO ji = fs_2, fs_jpim1 … … 556 584 END DO 557 585 ELSE 586 !$OMP PARALLEL WORKSHARE 558 587 zmxlm(:,:,1) = rn_mxl0 588 !$OMP END PARALLEL WORKSHARE 559 589 ENDIF 560 590 ! 591 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zrn2) 561 592 DO jk = 2, jpkm1 ! interior value : l=sqrt(2*e/n^2) 562 593 DO jj = 2, jpjm1 … … 570 601 ! !* Physical limits for the mixing length 571 602 ! 603 !$OMP PARALLEL WORKSHARE 572 604 zmxld(:,:, 1 ) = zmxlm(:,:,1) ! surface set to the minimum value 573 605 zmxld(:,:,jpk) = rmxl_min ! last level set to the minimum value 606 !$OMP END PARALLEL WORKSHARE 574 607 ! 575 608 SELECT CASE ( nn_mxl ) … … 578 611 ! where wmask = 0 set zmxlm == e3w_n 579 612 CASE ( 0 ) ! bounded by the distance to surface and bottom 613 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zemxl) 580 614 DO jk = 2, jpkm1 581 615 DO jj = 2, jpjm1 … … 591 625 ! 592 626 CASE ( 1 ) ! bounded by the vertical scale factor 627 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zemxl) 593 628 DO jk = 2, jpkm1 594 629 DO jj = 2, jpjm1 … … 603 638 CASE ( 2 ) ! |dk[xml]| bounded by e3t : 604 639 DO jk = 2, jpkm1 ! from the surface to the bottom : 640 !$OMP PARALLEL DO schedule(static) private(jj, ji) 605 641 DO jj = 2, jpjm1 606 642 DO ji = fs_2, fs_jpim1 ! vector opt. … … 610 646 END DO 611 647 DO jk = jpkm1, 2, -1 ! from the bottom to the surface : 648 !$OMP PARALLEL DO schedule(static) private(jj, ji, zemxl) 612 649 DO jj = 2, jpjm1 613 650 DO ji = fs_2, fs_jpim1 ! vector opt. … … 621 658 CASE ( 3 ) ! lup and ldown, |dk[xml]| bounded by e3t : 622 659 DO jk = 2, jpkm1 ! from the surface to the bottom : lup 660 !$OMP PARALLEL DO schedule(static) private(jj, ji) 623 661 DO jj = 2, jpjm1 624 662 DO ji = fs_2, fs_jpim1 ! vector opt. … … 628 666 END DO 629 667 DO jk = jpkm1, 2, -1 ! from the bottom to the surface : ldown 668 !$OMP PARALLEL DO schedule(static) private(jj, ji) 630 669 DO jj = 2, jpjm1 631 670 DO ji = fs_2, fs_jpim1 ! vector opt. … … 634 673 END DO 635 674 END DO 675 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zemlm, zemlp) 636 676 DO jk = 2, jpkm1 637 677 DO jj = 2, jpjm1 … … 648 688 ! 649 689 # if defined key_c1d 690 !$OMP PARALLEL WORKSHARE 650 691 e_dis(:,:,:) = zmxld(:,:,:) ! c1d configuration : save mixing and dissipation turbulent length scales 651 692 e_mix(:,:,:) = zmxlm(:,:,:) 693 !$OMP END PARALLEL WORKSHARE 652 694 # endif 653 695 … … 655 697 ! ! Vertical eddy viscosity and diffusivity (avmu, avmv, avt) 656 698 ! !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 699 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zsqen, zav) 657 700 DO jk = 1, jpkm1 !* vertical eddy viscosity & diffivity at w-points 658 701 DO jj = 2, jpjm1 … … 668 711 CALL lbc_lnk( avm, 'W', 1. ) ! Lateral boundary conditions (sign unchanged) 669 712 ! 713 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji) 670 714 DO jk = 2, jpkm1 !* vertical eddy viscosity at wu- and wv-points 671 715 DO jj = 2, jpjm1 … … 679 723 ! 680 724 IF( nn_pdl == 1 ) THEN !* Prandtl number case: update avt 725 !$OMP PARALLEL DO schedule(static) private(jk, jj, ji) 681 726 DO jk = 2, jpkm1 682 727 DO jj = 2, jpjm1 … … 804 849 ENDIF 805 850 ! !* set vertical eddy coef. to the background value 851 !$OMP PARALLEL DO schedule(static) private(jk) 806 852 DO jk = 1, jpk 807 853 avt (:,:,jk) = avtb(jk) * wmask (:,:,jk) … … 857 903 ELSE ! No TKE array found: initialisation 858 904 IF(lwp) WRITE(numout,*) ' ===>>>> : previous run without tke scheme, en computed by iterative loop' 905 !$OMP PARALLEL WORKSHARE 859 906 en (:,:,:) = rn_emin * tmask(:,:,:) 907 !$OMP END PARALLEL WORKSHARE 860 908 CALL tke_avn ! recompute avt, avm, avmu, avmv and dissl (approximation) 861 909 ! 910 !$OMP PARALLEL WORKSHARE 862 911 avt_k (:,:,:) = avt (:,:,:) 863 912 avm_k (:,:,:) = avm (:,:,:) 864 913 avmu_k(:,:,:) = avmu(:,:,:) 865 914 avmv_k(:,:,:) = avmv(:,:,:) 915 !$OMP END PARALLEL WORKSHARE 866 916 ! 867 917 DO jit = nit000 + 1, nit000 + 10 ; CALL zdf_tke( jit ) ; END DO 868 918 ENDIF 869 919 ELSE !* Start from rest 920 !$OMP PARALLEL WORKSHARE 870 921 en(:,:,:) = rn_emin * tmask(:,:,:) 922 !$OMP END PARALLEL WORKSHARE 923 !$OMP PARALLEL DO schedule(static) private(jk) 871 924 DO jk = 1, jpk ! set the Kz to the background value 872 925 avt (:,:,jk) = avtb(jk) * wmask (:,:,jk)
Note: See TracChangeset
for help on using the changeset viewer.
