Changeset 645
- Timestamp:
- 2007-03-29T13:40:37+02:00 (18 years ago)
- Location:
- trunk/NEMO/OPA_SRC/DYN
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/DYN/dynadv.F90
r643 r645 58 58 IF( kt == nit000 ) CALL dyn_adv_ctl ! initialisation & control of options 59 59 60 ! SELECT CASE ( nadv ) ! compute advection trend and add it to general trend 61 ! CASE ( 0 ) ; CALL dyn_keg ( kt ) ! vector form : horizontal gradient of kinetic energy 62 ! ; CALL dyn_zad ( kt ) ! vector form : vertical advection 63 ! CASE ( 1 ) ; CALL dyn_adv_cen2( kt ) ! 2nd order centered scheme 64 ! CASE ( 2 ) ; CALL dyn_adv_ubs ( kt ) ! 3rd order UBS scheme 65 ! ! 66 ! CASE (-1 ) ! esopa: test all possibility with control print 67 ! ; CALL dyn_keg ( kt ) 68 ! ; CALL dyn_zad ( kt ) 69 ! ; CALL dyn_adv_cen2( kt ) 70 ! ; CALL dyn_adv_ubs ( kt ) 71 ! END SELECT 60 SELECT CASE ( nadv ) ! compute advection trend and add it to general trend 61 CASE ( 0 ) 62 CALL dyn_keg ( kt ) ! vector form : horizontal gradient of kinetic energy 63 CALL dyn_zad ( kt ) ! vector form : vertical advection 64 CASE ( 1 ) 65 CALL dyn_adv_cen2( kt ) ! 2nd order centered scheme 66 CASE ( 2 ) 67 CALL dyn_adv_ubs ( kt ) ! 3rd order UBS scheme 68 ! 69 CASE (-1 ) ! esopa: test all possibility with control print 70 CALL dyn_keg ( kt ) 71 CALL dyn_zad ( kt ) 72 CALL dyn_adv_cen2( kt ) 73 CALL dyn_adv_ubs ( kt ) 74 END SELECT 72 75 ! 73 76 END SUBROUTINE dyn_adv -
trunk/NEMO/OPA_SRC/DYN/dynvor.F90
r643 r645 575 575 ! ----------------------------------------- 576 576 SELECT CASE( kvor ) ! vorticity considered 577 CASE ( 1 ) ; zwz(:,:) = ff(:,:)! planetary vorticity (Coriolis)578 CASE ( 2 ) ; zwz(:,:) = rotn(:,:,jk)! relative vorticity577 CASE ( 1 ) ; zwz(:,:) = ff(:,:) * ze3f(:,:,jk) ! planetary vorticity (Coriolis) 578 CASE ( 2 ) ; zwz(:,:) = rotn(:,:,jk) * ze3f(:,:,jk) ! relative vorticity 579 579 CASE ( 3 ) ! metric term 580 580 DO jj = 1, jpjm1 … … 585 585 END DO 586 586 END DO 587 CASE ( 4 ) ; zwz(:,:) = ( rotn(:,:,jk) + ff(:,:) ) 587 CASE ( 4 ) ; zwz(:,:) = ( rotn(:,:,jk) + ff(:,:) ) * ze3f(:,:,jk) ! total (relative + planetary vorticity) 588 588 CASE ( 5 ) ! total (coriolis + metric) 589 589 DO jj = 1, jpjm1
Note: See TracChangeset
for help on using the changeset viewer.