Changeset 12377 for NEMO/trunk/src/OCE/DYN/dynadv.F90
- Timestamp:
- 2020-02-12T15:39:06+01:00 (4 years ago)
- Location:
- NEMO/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEAD ext/AGRIF5 ^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL
-
- Property svn:externals
-
NEMO/trunk/src/OCE/DYN/dynadv.F90
r11536 r12377 44 44 INTEGER, PUBLIC, PARAMETER :: np_FLX_ubs = 3 ! flux form : 3rd order Upstream Biased Scheme 45 45 46 !! * Substitutions47 # include "vectopt_loop_substitute.h90"48 46 !!---------------------------------------------------------------------- 49 47 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 53 51 CONTAINS 54 52 55 SUBROUTINE dyn_adv( kt )53 SUBROUTINE dyn_adv( kt, Kbb, Kmm, puu, pvv, Krhs ) 56 54 !!--------------------------------------------------------------------- 57 55 !! *** ROUTINE dyn_adv *** … … 59 57 !! ** Purpose : compute the ocean momentum advection trend. 60 58 !! 61 !! ** Method : - Update ( ua,va) with the advection term following n_dynadv59 !! ** Method : - Update (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) with the advection term following n_dynadv 62 60 !! 63 61 !! NB: in flux form advection (ln_dynadv_cen2 or ln_dynadv_ubs=T) … … 66 64 !! (see dynvor module). 67 65 !!---------------------------------------------------------------------- 68 INTEGER, INTENT( in ) :: kt ! ocean time-step index 66 INTEGER , INTENT( in ) :: kt ! ocean time-step index 67 INTEGER , INTENT( in ) :: Kbb, Kmm, Krhs ! ocean time level indices 68 REAL(wp), DIMENSION(jpi,jpj,jpk,jpt), INTENT(inout) :: puu, pvv ! ocean velocities and RHS of momentum equation 69 69 !!---------------------------------------------------------------------- 70 70 ! … … 73 73 SELECT CASE( n_dynadv ) !== compute advection trend and add it to general trend ==! 74 74 CASE( np_VEC_c2 ) 75 CALL dyn_keg ( kt, nn_dynkeg ) ! vector form : horizontal gradient of kinetic energy76 CALL dyn_zad ( kt )! vector form : vertical advection75 CALL dyn_keg ( kt, nn_dynkeg, Kmm, puu, pvv, Krhs ) ! vector form : horizontal gradient of kinetic energy 76 CALL dyn_zad ( kt, Kmm, puu, pvv, Krhs ) ! vector form : vertical advection 77 77 CASE( np_FLX_c2 ) 78 CALL dyn_adv_cen2( kt )! 2nd order centered scheme78 CALL dyn_adv_cen2( kt, Kmm, puu, pvv, Krhs ) ! 2nd order centered scheme 79 79 CASE( np_FLX_ubs ) 80 CALL dyn_adv_ubs ( kt )! 3rd order UBS scheme (UP3)80 CALL dyn_adv_ubs ( kt, Kbb, Kmm, puu, pvv, Krhs ) ! 3rd order UBS scheme (UP3) 81 81 END SELECT 82 82 ! … … 104 104 ENDIF 105 105 ! 106 REWIND( numnam_ref ) ! Namelist namdyn_adv in reference namelist : Momentum advection scheme107 106 READ ( numnam_ref, namdyn_adv, IOSTAT = ios, ERR = 901) 108 107 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_adv in reference namelist' ) 109 REWIND( numnam_cfg ) ! Namelist namdyn_adv in configuration namelist : Momentum advection scheme110 108 READ ( numnam_cfg, namdyn_adv, IOSTAT = ios, ERR = 902 ) 111 109 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namdyn_adv in configuration namelist' )
Note: See TracChangeset
for help on using the changeset viewer.