Changeset 13644
- Timestamp:
- 2020-10-20T12:17:11+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DYN/dynvor.F90
r13627 r13644 386 386 END SELECT 387 387 ! 388 ! !== horizontal fluxes and potential vorticity ==! 388 #if defined key_qco 389 ! !== horizontal fluxes and potential vorticity ==! 389 390 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu(:,:,jk) 390 391 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv(:,:,jk) 391 392 zwz(:,:) = zwz(:,:) / e3f(:,:,jk) 393 #else 394 ! !== horizontal fluxes and potential vorticity ==! 395 IF( ln_sco ) THEN ! weighted by e3 396 zwz(:,:) = zwz(:,:) / e3f(:,:,jk) 397 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu(:,:,jk) 398 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv(:,:,jk) 399 ELSE ! ugly fix: unweighted by e3 400 zwx(:,:) = e2u(:,:) * pu(:,:,jk) 401 zwy(:,:) = e1v(:,:) * pv(:,:,jk) 402 ENDIF 403 #endif 392 404 ! 393 405 ! !== compute and add the vorticity term trend =! … … 484 496 ! 485 497 ! 486 ! !== horizontal fluxes and potential vorticity ==! 498 #if defined key_qco 499 ! !== horizontal fluxes and potential vorticity ==! 487 500 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu(:,:,jk) 488 501 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv(:,:,jk) 489 502 zwz(:,:) = zwz(:,:) / e3f(:,:,jk) 503 #else 504 ! !== horizontal fluxes and potential vorticity ==! 505 IF( ln_sco ) THEN ! weighted by e3 506 zwz(:,:) = zwz(:,:) / e3f(:,:,jk) 507 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu(:,:,jk) 508 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv(:,:,jk) 509 ELSE ! ugly fix: unweighted by e3 510 zwx(:,:) = e2u(:,:) * pu(:,:,jk) 511 zwy(:,:) = e1v(:,:) * pv(:,:,jk) 512 ENDIF 513 #endif 490 514 ! 491 515 ! !== compute and add the vorticity term trend =!
Note: See TracChangeset
for help on using the changeset viewer.