- Timestamp:
- 2016-07-19T10:38:35+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5549_BDY_ZEROGRAD/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
r5407 r6808 28 28 !! 3.6 ! 2014-11 (P. Mathiot) add ice shelf capability 29 29 !!---------------------------------------------------------------------- 30 #if defined key_zdftke || defined key_esopa30 #if defined key_zdftke 31 31 !!---------------------------------------------------------------------- 32 32 !! 'key_zdftke' TKE vertical physics … … 53 53 USE timing ! Timing 54 54 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined) 55 #if defined key_agrif 56 USE agrif_opa_interp 57 USE agrif_opa_update 58 #endif 55 59 56 60 IMPLICIT NONE … … 85 89 REAL(wp) :: rhftau_scl = 1.0_wp ! scale factor applied to HF part of taum (nn_etau=3) 86 90 87 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: en !: now turbulent kinetic energy [m2/s2]88 91 REAL(wp) , ALLOCATABLE, SAVE, DIMENSION(:,:) :: htau ! depth of tke penetration (nn_htau) 89 92 REAL(wp) , ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: dissl ! now mixing lenght of dissipation 90 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avt_k , avm_k ! not enhanced Kz 91 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avmu_k, avmv_k ! not enhanced Kz 93 REAL(wp) , ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: apdlr ! now mixing lenght of dissipation 92 94 #if defined key_c1d 93 95 ! !!** 1D cfg only ** ('key_c1d') … … 97 99 98 100 !! * Substitutions 99 # include "domzgr_substitute.h90"100 101 # include "vectopt_loop_substitute.h90" 101 102 !!---------------------------------------------------------------------- 102 !! NEMO/OPA 4.0 , NEMO Consortium (2011)103 !! NEMO/OPA 3.7 , NEMO Consortium (2015) 103 104 !! $Id$ 104 105 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 115 116 & e_pdl(jpi,jpj,jpk) , e_ric(jpi,jpj,jpk) , & 116 117 #endif 117 & en (jpi,jpj,jpk) , htau (jpi,jpj) , dissl(jpi,jpj,jpk) , & 118 & avt_k (jpi,jpj,jpk) , avm_k (jpi,jpj,jpk), & 119 & avmu_k(jpi,jpj,jpk) , avmv_k(jpi,jpj,jpk), STAT= zdf_tke_alloc ) 118 & htau (jpi,jpj) , dissl(jpi,jpj,jpk) , & 119 & apdlr(jpi,jpj,jpk) , STAT= zdf_tke_alloc ) 120 120 ! 121 121 IF( lk_mpp ) CALL mpp_sum ( zdf_tke_alloc ) … … 173 173 !!---------------------------------------------------------------------- 174 174 ! 175 #if defined key_agrif 176 ! interpolation parent grid => child grid for avm_k ( ex : at west border: update column 1 and 2) 177 IF( .NOT.Agrif_Root() ) CALL Agrif_Tke 178 #endif 179 ! 175 180 IF( kt /= nit000 ) THEN ! restore before value to compute tke 176 181 avt (:,:,:) = avt_k (:,:,:) … … 189 194 avmv_k(:,:,:) = avmv(:,:,:) 190 195 ! 191 END SUBROUTINE zdf_tke 196 #if defined key_agrif 197 ! Update child grid f => parent grid 198 IF( .NOT.Agrif_Root() ) CALL Agrif_Update_Tke( kt ) ! children only 199 #endif 200 ! 201 END SUBROUTINE zdf_tke 192 202 193 203 … … 221 231 REAL(wp) :: zzd_up, zzd_lw ! - - 222 232 !!bfr REAL(wp) :: zebot ! - - 223 INTEGER , POINTER, DIMENSION(:,: ) :: imlc 224 REAL(wp), POINTER, DIMENSION(:,: ) :: zhlc 225 REAL(wp), POINTER, DIMENSION(:,:,:) :: zpelc, zdiag, zd_up, zd_lw 233 INTEGER , POINTER, DIMENSION(:,: ) :: imlc 234 REAL(wp), POINTER, DIMENSION(:,: ) :: zhlc 235 REAL(wp), POINTER, DIMENSION(:,:,:) :: zpelc, zdiag, zd_up, zd_lw, z3du, z3dv 236 REAL(wp) :: zri ! local Richardson number 226 237 !!-------------------------------------------------------------------- 227 238 ! 228 239 IF( nn_timing == 1 ) CALL timing_start('tke_tke') 229 240 ! 230 CALL wrk_alloc( jpi,jpj, imlc ) ! integer231 CALL wrk_alloc( jpi,jpj, zhlc )232 CALL wrk_alloc( jpi,jpj,jpk, zpelc, zdiag, zd_up, zd_lw)241 CALL wrk_alloc( jpi,jpj, imlc ) ! integer 242 CALL wrk_alloc( jpi,jpj, zhlc ) 243 CALL wrk_alloc( jpi,jpj,jpk, zpelc, zdiag, zd_up, zd_lw, z3du, z3dv ) 233 244 ! 234 245 zbbrau = rn_ebb / rau0 ! Local constant initialisation … … 244 255 DO jj = 2, jpjm1 ! en(mikt(ji,jj)) = rn_emin 245 256 DO ji = fs_2, fs_jpim1 ! vector opt. 246 en(ji,jj,mikt(ji,jj)) =rn_emin * tmask(ji,jj,1)257 en(ji,jj,mikt(ji,jj)) = rn_emin * tmask(ji,jj,1) 247 258 END DO 248 259 END DO … … 265 276 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 266 277 ! en(bot) = (rn_ebb0/rau0)*0.5*sqrt(u_botfr^2+v_botfr^2) (min value rn_emin) 267 !CDIR NOVERRCHK268 278 !! DO jj = 2, jpjm1 269 !CDIR NOVERRCHK270 279 !! DO ji = fs_2, fs_jpim1 ! vector opt. 271 280 !! ztx2 = bfrua(ji-1,jj) * ub(ji-1,jj,mbku(ji-1,jj)) + & … … 284 293 ! 285 294 ! !* total energy produce by LC : cumulative sum over jk 286 zpelc(:,:,1) = MAX( rn2b(:,:,1), 0._wp ) * fsdepw(:,:,1) * fse3w(:,:,1)295 zpelc(:,:,1) = MAX( rn2b(:,:,1), 0._wp ) * gdepw_n(:,:,1) * e3w_n(:,:,1) 287 296 DO jk = 2, jpk 288 zpelc(:,:,jk) = zpelc(:,:,jk-1) + MAX( rn2b(:,:,jk), 0._wp ) * fsdepw(:,:,jk) * fse3w(:,:,jk)297 zpelc(:,:,jk) = zpelc(:,:,jk-1) + MAX( rn2b(:,:,jk), 0._wp ) * gdepw_n(:,:,jk) * e3w_n(:,:,jk) 289 298 END DO 290 299 ! !* finite Langmuir Circulation depth … … 302 311 DO jj = 1, jpj 303 312 DO ji = 1, jpi 304 zhlc(ji,jj) = fsdepw(ji,jj,imlc(ji,jj))313 zhlc(ji,jj) = gdepw_n(ji,jj,imlc(ji,jj)) 305 314 END DO 306 315 END DO 307 316 zcof = 0.016 / SQRT( zrhoa * zcdrag ) 308 !CDIR NOVERRCHK309 317 DO jk = 2, jpkm1 !* TKE Langmuir circulation source term added to en 310 !CDIR NOVERRCHK 311 DO jj = 2, jpjm1 312 !CDIR NOVERRCHK 318 DO jj = 2, jpjm1 313 319 DO ji = fs_2, fs_jpim1 ! vector opt. 314 320 zus = zcof * SQRT( taum(ji,jj) ) ! Stokes drift 315 321 ! ! vertical velocity due to LC 316 zind = 0.5 - SIGN( 0.5, fsdepw(ji,jj,jk) - zhlc(ji,jj) )317 zwlc = zind * rn_lc * zus * SIN( rpi * fsdepw(ji,jj,jk) / zhlc(ji,jj) )322 zind = 0.5 - SIGN( 0.5, gdepw_n(ji,jj,jk) - zhlc(ji,jj) ) 323 zwlc = zind * rn_lc * zus * SIN( rpi * gdepw_n(ji,jj,jk) / zhlc(ji,jj) ) 318 324 ! ! TKE Langmuir circulation source term 319 en(ji,jj,jk) = en(ji,jj,jk) + rdt * ( zwlc * zwlc * zwlc ) / zhlc(ji,jj) * wmask(ji,jj,jk) * tmask(ji,jj,1)325 en(ji,jj,jk) = en(ji,jj,jk) + rdt * (1._wp - fr_i(ji,jj) ) * ( zwlc * zwlc * zwlc ) / zhlc(ji,jj) * wmask(ji,jj,jk) * tmask(ji,jj,1) 320 326 END DO 321 327 END DO … … 332 338 ! 333 339 DO jk = 2, jpkm1 !* Shear production at uw- and vw-points (energy conserving form) 334 DO jj = 1, jpj ! here avmu, avmv used as workspace 335 DO ji = 1, jpi 336 avmu(ji,jj,jk) = avmu(ji,jj,jk) * ( un(ji,jj,jk-1) - un(ji,jj,jk) ) & 337 & * ( ub(ji,jj,jk-1) - ub(ji,jj,jk) ) & 338 & / ( fse3uw_n(ji,jj,jk) & 339 & * fse3uw_b(ji,jj,jk) ) 340 avmv(ji,jj,jk) = avmv(ji,jj,jk) * ( vn(ji,jj,jk-1) - vn(ji,jj,jk) ) & 341 & * ( vb(ji,jj,jk-1) - vb(ji,jj,jk) ) & 342 & / ( fse3vw_n(ji,jj,jk) & 343 & * fse3vw_b(ji,jj,jk) ) 344 END DO 345 END DO 346 END DO 347 ! 340 DO jj = 1, jpjm1 341 DO ji = 1, fs_jpim1 ! vector opt. 342 z3du(ji,jj,jk) = 0.5 * ( avm(ji,jj,jk ) + avm(ji+1,jj,jk) ) & 343 & * ( un(ji,jj,jk-1) - un(ji ,jj,jk) ) & 344 & * ( ub(ji,jj,jk-1) - ub(ji ,jj,jk) ) * wumask(ji,jj,jk) & 345 & / ( e3uw_n(ji,jj,jk) * e3uw_b(ji,jj,jk) ) 346 z3dv(ji,jj,jk) = 0.5 * ( avm(ji,jj,jk ) + avm(ji,jj+1,jk) ) & 347 & * ( vn(ji,jj,jk-1) - vn(ji,jj ,jk) ) & 348 & * ( vb(ji,jj,jk-1) - vb(ji,jj ,jk) ) * wvmask(ji,jj,jk) & 349 & / ( e3vw_n(ji,jj,jk) * e3vw_b(ji,jj,jk) ) 350 END DO 351 END DO 352 END DO 353 ! 354 IF( nn_pdl == 1 ) THEN !* Prandtl number case: compute apdlr 355 ! Note that zesh2 is also computed in the next loop. 356 ! We decided to compute it twice to keep code readability and avoid an IF case in the DO loops 357 DO jk = 2, jpkm1 358 DO jj = 2, jpjm1 359 DO ji = fs_2, fs_jpim1 ! vector opt. 360 ! ! shear prod. at w-point weightened by mask 361 zesh2 = ( z3du(ji-1,jj,jk) + z3du(ji,jj,jk) ) / MAX( 1._wp , umask(ji-1,jj,jk) + umask(ji,jj,jk) ) & 362 & + ( z3dv(ji,jj-1,jk) + z3dv(ji,jj,jk) ) / MAX( 1._wp , vmask(ji,jj-1,jk) + vmask(ji,jj,jk) ) 363 ! ! local Richardson number 364 zri = MAX( rn2b(ji,jj,jk), 0._wp ) * avm(ji,jj,jk) / ( zesh2 + rn_bshear ) 365 apdlr(ji,jj,jk) = MAX( 0.1_wp, ri_cri / MAX( ri_cri , zri ) ) 366 367 END DO 368 END DO 369 END DO 370 ! 371 ENDIF 372 ! 348 373 DO jk = 2, jpkm1 !* Matrix and right hand side in en 349 374 DO jj = 2, jpjm1 … … 351 376 zcof = zfact1 * tmask(ji,jj,jk) 352 377 zzd_up = zcof * ( avm (ji,jj,jk+1) + avm (ji,jj,jk ) ) & ! upper diagonal 353 & / ( fse3t(ji,jj,jk ) * fse3w(ji,jj,jk ) )378 & / ( e3t_n(ji,jj,jk ) * e3w_n(ji,jj,jk ) ) 354 379 zzd_lw = zcof * ( avm (ji,jj,jk ) + avm (ji,jj,jk-1) ) & ! lower diagonal 355 & / ( fse3t(ji,jj,jk-1) * fse3w(ji,jj,jk ) )356 !! shear prod. at w-point weightened by mask357 zesh2 = ( avmu(ji-1,jj,jk) + avmu(ji,jj,jk) ) / MAX( 1._wp , umask(ji-1,jj,jk) + umask(ji,jj,jk) ) &358 & + ( avmv(ji,jj-1,jk) + avmv(ji,jj,jk) ) / MAX( 1._wp , vmask(ji,jj-1,jk) + vmask(ji,jj,jk) )359 380 & / ( e3t_n(ji,jj,jk-1) * e3w_n(ji,jj,jk ) ) 381 ! ! shear prod. at w-point weightened by mask 382 zesh2 = ( z3du(ji-1,jj,jk) + z3du(ji,jj,jk) ) / MAX( 1._wp , umask(ji-1,jj,jk) + umask(ji,jj,jk) ) & 383 & + ( z3dv(ji,jj-1,jk) + z3dv(ji,jj,jk) ) / MAX( 1._wp , vmask(ji,jj-1,jk) + vmask(ji,jj,jk) ) 384 ! 360 385 zd_up(ji,jj,jk) = zzd_up ! Matrix (zdiag, zd_up, zd_lw) 361 386 zd_lw(ji,jj,jk) = zzd_lw … … 377 402 END DO 378 403 END DO 379 ! 380 ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1 381 DO jj = 2, jpjm1 404 DO jj = 2, jpjm1 ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1 382 405 DO ji = fs_2, fs_jpim1 ! vector opt. 383 406 zd_lw(ji,jj,2) = en(ji,jj,2) - zd_lw(ji,jj,2) * en(ji,jj,1) ! Surface boudary conditions on tke … … 391 414 END DO 392 415 END DO 393 ! 394 ! thrid recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk 395 DO jj = 2, jpjm1 416 DO jj = 2, jpjm1 ! thrid recurrence : Ek = ( Lk - Uk * Ek+1 ) / Dk 396 417 DO ji = fs_2, fs_jpim1 ! vector opt. 397 418 en(ji,jj,jpkm1) = zd_lw(ji,jj,jpkm1) / zdiag(ji,jj,jpkm1) … … 416 437 ! ! TKE due to surface and internal wave breaking 417 438 ! !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 439 !!gm BUG : in the exp remove the depth of ssh !!! 440 441 418 442 IF( nn_etau == 1 ) THEN !* penetration below the mixed layer (rn_efr fraction) 419 443 DO jk = 2, jpkm1 420 444 DO jj = 2, jpjm1 421 445 DO ji = fs_2, fs_jpim1 ! vector opt. 422 en(ji,jj,jk) = en(ji,jj,jk) + rn_efr * en(ji,jj,1) * EXP( - fsdepw(ji,jj,jk) / htau(ji,jj) ) &446 en(ji,jj,jk) = en(ji,jj,jk) + rn_efr * en(ji,jj,1) * EXP( -gdepw_n(ji,jj,jk) / htau(ji,jj) ) & 423 447 & * ( 1._wp - fr_i(ji,jj) ) * wmask(ji,jj,jk) * tmask(ji,jj,1) 424 448 END DO … … 429 453 DO ji = fs_2, fs_jpim1 ! vector opt. 430 454 jk = nmln(ji,jj) 431 en(ji,jj,jk) = en(ji,jj,jk) + rn_efr * en(ji,jj,1) * EXP( - fsdepw(ji,jj,jk) / htau(ji,jj) ) &455 en(ji,jj,jk) = en(ji,jj,jk) + rn_efr * en(ji,jj,1) * EXP( -gdepw_n(ji,jj,jk) / htau(ji,jj) ) & 432 456 & * ( 1._wp - fr_i(ji,jj) ) * wmask(ji,jj,jk) * tmask(ji,jj,1) 433 457 END DO 434 458 END DO 435 459 ELSEIF( nn_etau == 3 ) THEN !* penetration belox the mixed layer (HF variability) 436 !CDIR NOVERRCHK437 460 DO jk = 2, jpkm1 438 !CDIR NOVERRCHK 439 DO jj = 2, jpjm1 440 !CDIR NOVERRCHK 461 DO jj = 2, jpjm1 441 462 DO ji = fs_2, fs_jpim1 ! vector opt. 442 463 ztx2 = utau(ji-1,jj ) + utau(ji,jj) … … 445 466 zdif = taum(ji,jj) - ztau ! mean of modulus - modulus of the mean 446 467 zdif = rhftau_scl * MAX( 0._wp, zdif + rhftau_add ) ! apply some modifications... 447 en(ji,jj,jk) = en(ji,jj,jk) + zbbrau * zdif * EXP( - fsdepw(ji,jj,jk) / htau(ji,jj) ) &468 en(ji,jj,jk) = en(ji,jj,jk) + zbbrau * zdif * EXP( -gdepw_n(ji,jj,jk) / htau(ji,jj) ) & 448 469 & * ( 1._wp - fr_i(ji,jj) ) * wmask(ji,jj,jk) * tmask(ji,jj,1) 449 470 END DO … … 453 474 CALL lbc_lnk( en, 'W', 1. ) ! Lateral boundary conditions (sign unchanged) 454 475 ! 455 CALL wrk_dealloc( jpi,jpj, imlc ) ! integer456 CALL wrk_dealloc( jpi,jpj, zhlc )457 CALL wrk_dealloc( jpi,jpj,jpk, zpelc, zdiag, zd_up, zd_lw)476 CALL wrk_dealloc( jpi,jpj, imlc ) ! integer 477 CALL wrk_dealloc( jpi,jpj, zhlc ) 478 CALL wrk_dealloc( jpi,jpj,jpk, zpelc, zdiag, zd_up, zd_lw, z3du, z3dv ) 458 479 ! 459 480 IF( nn_timing == 1 ) CALL timing_stop('tke_tke') … … 499 520 INTEGER :: ji, jj, jk ! dummy loop indices 500 521 REAL(wp) :: zrn2, zraug, zcoef, zav ! local scalars 501 REAL(wp) :: zdku, z pdlr, zri, zsqen! - -522 REAL(wp) :: zdku, zri, zsqen ! - - 502 523 REAL(wp) :: zdkv, zemxl, zemlm, zemlp ! - - 503 524 REAL(wp), POINTER, DIMENSION(:,:,:) :: zmpdl, zmxlm, zmxld … … 529 550 ENDIF 530 551 ! 531 !CDIR NOVERRCHK532 552 DO jk = 2, jpkm1 ! interior value : l=sqrt(2*e/n^2) 533 !CDIR NOVERRCHK 534 DO jj = 2, jpjm1 535 !CDIR NOVERRCHK 553 DO jj = 2, jpjm1 536 554 DO ji = fs_2, fs_jpim1 ! vector opt. 537 555 zrn2 = MAX( rn2(ji,jj,jk), rsmall ) 538 zmxlm(ji,jj,jk) = MAX( rmxl_min, SQRT( 2._wp * en(ji,jj,jk) / zrn2 ) )556 zmxlm(ji,jj,jk) = MAX( rmxl_min, SQRT( 2._wp * en(ji,jj,jk) / zrn2 ) ) 539 557 END DO 540 558 END DO … … 543 561 ! !* Physical limits for the mixing length 544 562 ! 545 zmxld(:,:, 1) = zmxlm(:,:,1) ! surface set to the minimum value563 zmxld(:,:, 1 ) = zmxlm(:,:,1) ! surface set to the minimum value 546 564 zmxld(:,:,jpk) = rmxl_min ! last level set to the minimum value 547 565 ! 548 566 SELECT CASE ( nn_mxl ) 549 567 ! 550 ! where wmask = 0 set zmxlm == fse3w 568 !!gm Not sure of that coding for ISF.... 569 ! where wmask = 0 set zmxlm == e3w_n 551 570 CASE ( 0 ) ! bounded by the distance to surface and bottom 552 571 DO jk = 2, jpkm1 553 572 DO jj = 2, jpjm1 554 573 DO ji = fs_2, fs_jpim1 ! vector opt. 555 zemxl = MIN( fsdepw(ji,jj,jk) - fsdepw(ji,jj,mikt(ji,jj)), zmxlm(ji,jj,jk), &556 & fsdepw(ji,jj,mbkt(ji,jj)+1) - fsdepw(ji,jj,jk) )574 zemxl = MIN( gdepw_n(ji,jj,jk) - gdepw_n(ji,jj,mikt(ji,jj)), zmxlm(ji,jj,jk), & 575 & gdepw_n(ji,jj,mbkt(ji,jj)+1) - gdepw_n(ji,jj,jk) ) 557 576 ! wmask prevent zmxlm = 0 if jk = mikt(ji,jj) 558 zmxlm(ji,jj,jk) = zemxl * wmask(ji,jj,jk) + MIN(zmxlm(ji,jj,jk), fse3w(ji,jj,jk)) * (1 - wmask(ji,jj,jk))559 zmxld(ji,jj,jk) = zemxl * wmask(ji,jj,jk) + MIN(zmxlm(ji,jj,jk), fse3w(ji,jj,jk)) * (1 - wmask(ji,jj,jk))577 zmxlm(ji,jj,jk) = zemxl * wmask(ji,jj,jk) + MIN(zmxlm(ji,jj,jk),e3w_n(ji,jj,jk)) * (1 - wmask(ji,jj,jk)) 578 zmxld(ji,jj,jk) = zemxl * wmask(ji,jj,jk) + MIN(zmxlm(ji,jj,jk),e3w_n(ji,jj,jk)) * (1 - wmask(ji,jj,jk)) 560 579 END DO 561 580 END DO … … 566 585 DO jj = 2, jpjm1 567 586 DO ji = fs_2, fs_jpim1 ! vector opt. 568 zemxl = MIN( fse3w(ji,jj,jk), zmxlm(ji,jj,jk) )587 zemxl = MIN( e3w_n(ji,jj,jk), zmxlm(ji,jj,jk) ) 569 588 zmxlm(ji,jj,jk) = zemxl 570 589 zmxld(ji,jj,jk) = zemxl … … 577 596 DO jj = 2, jpjm1 578 597 DO ji = fs_2, fs_jpim1 ! vector opt. 579 zmxlm(ji,jj,jk) = MIN( zmxlm(ji,jj,jk-1) + fse3t(ji,jj,jk-1), zmxlm(ji,jj,jk) )598 zmxlm(ji,jj,jk) = MIN( zmxlm(ji,jj,jk-1) + e3t_n(ji,jj,jk-1), zmxlm(ji,jj,jk) ) 580 599 END DO 581 600 END DO … … 584 603 DO jj = 2, jpjm1 585 604 DO ji = fs_2, fs_jpim1 ! vector opt. 586 zemxl = MIN( zmxlm(ji,jj,jk+1) + fse3t(ji,jj,jk+1), zmxlm(ji,jj,jk) )605 zemxl = MIN( zmxlm(ji,jj,jk+1) + e3t_n(ji,jj,jk+1), zmxlm(ji,jj,jk) ) 587 606 zmxlm(ji,jj,jk) = zemxl 588 607 zmxld(ji,jj,jk) = zemxl … … 595 614 DO jj = 2, jpjm1 596 615 DO ji = fs_2, fs_jpim1 ! vector opt. 597 zmxld(ji,jj,jk) = MIN( zmxld(ji,jj,jk-1) + fse3t(ji,jj,jk-1), zmxlm(ji,jj,jk) )616 zmxld(ji,jj,jk) = MIN( zmxld(ji,jj,jk-1) + e3t_n(ji,jj,jk-1), zmxlm(ji,jj,jk) ) 598 617 END DO 599 618 END DO … … 602 621 DO jj = 2, jpjm1 603 622 DO ji = fs_2, fs_jpim1 ! vector opt. 604 zmxlm(ji,jj,jk) = MIN( zmxlm(ji,jj,jk+1) + fse3t(ji,jj,jk+1), zmxlm(ji,jj,jk) ) 605 END DO 606 END DO 607 END DO 608 !CDIR NOVERRCHK 623 zmxlm(ji,jj,jk) = MIN( zmxlm(ji,jj,jk+1) + e3t_n(ji,jj,jk+1), zmxlm(ji,jj,jk) ) 624 END DO 625 END DO 626 END DO 609 627 DO jk = 2, jpkm1 610 !CDIR NOVERRCHK 611 DO jj = 2, jpjm1 612 !CDIR NOVERRCHK 628 DO jj = 2, jpjm1 613 629 DO ji = fs_2, fs_jpim1 ! vector opt. 614 630 zemlm = MIN ( zmxld(ji,jj,jk), zmxlm(ji,jj,jk) ) … … 630 646 ! ! Vertical eddy viscosity and diffusivity (avmu, avmv, avt) 631 647 ! !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 632 !CDIR NOVERRCHK633 648 DO jk = 1, jpkm1 !* vertical eddy viscosity & diffivity at w-points 634 !CDIR NOVERRCHK 635 DO jj = 2, jpjm1 636 !CDIR NOVERRCHK 649 DO jj = 2, jpjm1 637 650 DO ji = fs_2, fs_jpim1 ! vector opt. 638 651 zsqen = SQRT( en(ji,jj,jk) ) … … 660 673 DO jj = 2, jpjm1 661 674 DO ji = fs_2, fs_jpim1 ! vector opt. 662 zcoef = avm(ji,jj,jk) * 2._wp * fse3w(ji,jj,jk) * fse3w(ji,jj,jk) 663 ! ! shear 664 zdku = avmu(ji-1,jj,jk) * ( un(ji-1,jj,jk-1) - un(ji-1,jj,jk) ) * ( ub(ji-1,jj,jk-1) - ub(ji-1,jj,jk) ) & 665 & + avmu(ji ,jj,jk) * ( un(ji ,jj,jk-1) - un(ji ,jj,jk) ) * ( ub(ji ,jj,jk-1) - ub(ji ,jj,jk) ) 666 zdkv = avmv(ji,jj-1,jk) * ( vn(ji,jj-1,jk-1) - vn(ji,jj-1,jk) ) * ( vb(ji,jj-1,jk-1) - vb(ji,jj-1,jk) ) & 667 & + avmv(ji,jj ,jk) * ( vn(ji,jj ,jk-1) - vn(ji,jj ,jk) ) * ( vb(ji,jj ,jk-1) - vb(ji,jj ,jk) ) 668 ! ! local Richardson number 669 zri = MAX( rn2b(ji,jj,jk), 0._wp ) * zcoef / (zdku + zdkv + rn_bshear ) 670 zpdlr = MAX( 0.1_wp, 0.2 / MAX( 0.2 , zri ) ) 671 !!gm and even better with the use of the "true" ri_crit=0.22222... (this change the results!) 672 !!gm zpdlr = MAX( 0.1_wp, ri_crit / MAX( ri_crit , zri ) ) 673 avt(ji,jj,jk) = MAX( zpdlr * avt(ji,jj,jk), avtb_2d(ji,jj) * avtb(jk) ) * wmask(ji,jj,jk) 675 avt(ji,jj,jk) = MAX( apdlr(ji,jj,jk) * avt(ji,jj,jk), avtb_2d(ji,jj) * avtb(jk) ) * tmask(ji,jj,jk) 674 676 # if defined key_c1d 675 e_pdl(ji,jj,jk) = zpdlr * wmask(ji,jj,jk) ! c1d configuration : save masked Prandlt number 676 e_ric(ji,jj,jk) = zri * wmask(ji,jj,jk) ! c1d config. : save Ri 677 e_pdl(ji,jj,jk) = apdlr(ji,jj,jk) * wmask(ji,jj,jk) ! c1d configuration : save masked Prandlt number 678 !!gm bug NO zri here.... 679 !!gm remove the specific diag for c1d ! 680 e_ric(ji,jj,jk) = zri * wmask(ji,jj,jk) ! c1d config. : save Ri 677 681 # endif 678 682 END DO
Note: See TracChangeset
for help on using the changeset viewer.
