Changeset 10946 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/step.F90
- Timestamp:
- 2019-05-08T10:56:14+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/step.F90
r10928 r10946 137 137 138 138 ! VERTICAL PHYSICS 139 CALL zdf_phy( kstp, Nbb, Nnn ) ! vertical physics update (top/bot drag, avt, avs, avm + MLD)139 CALL zdf_phy( kstp, Nbb, Nnn, Nrhs ) ! vertical physics update (top/bot drag, avt, avs, avm + MLD) 140 140 141 141 ! LATERAL PHYSICS … … 197 197 CALL dyn_ldf( kstp, Nbb, Nnn , uu, vv, Nrhs ) ! lateral mixing 198 198 IF( ln_zdfosm ) CALL dyn_osm( kstp, Nnn , uu, vv, Nrhs ) ! OSMOSIS non-local velocity fluxes ==> RHS 199 CALL dyn_hpg( kstp, Nnn ,uu, vv, Nrhs ) ! horizontal gradient of Hydrostatic pressure199 CALL dyn_hpg( kstp, Nnn , uu, vv, Nrhs ) ! horizontal gradient of Hydrostatic pressure 200 200 CALL dyn_spg( kstp, Nbb, Nnn, Nrhs, uu, vv, ssh, uu_b, vv_b, Naa ) ! surface pressure gradient 201 201 … … 242 242 IF( lk_asminc .AND. ln_asmiau .AND. & 243 243 & ln_trainc ) CALL tra_asm_inc ( kstp ) ! apply tracer assimilation increment 244 CALL tra_sbc ( kstp ) ! surface boundary condition245 IF( ln_traqsr ) CALL tra_qsr ( kstp ) ! penetrative solar radiation qsr246 IF( ln_trabbc ) CALL tra_bbc ( kstp ) ! bottom heat flux247 IF( ln_trabbl ) CALL tra_bbl ( kstp ) ! advective (and/or diffusive) bottom boundary layer scheme248 IF( ln_tradmp ) CALL tra_dmp ( kstp ) ! internal damping trends244 CALL tra_sbc ( kstp, Nnn, Nrhs ) ! surface boundary condition 245 IF( ln_traqsr ) CALL tra_qsr ( kstp, Nnn, Nrhs ) ! penetrative solar radiation qsr 246 IF( ln_trabbc ) CALL tra_bbc ( kstp, Nnn, Nrhs ) ! bottom heat flux 247 IF( ln_trabbl ) CALL tra_bbl ( kstp, Nnn, Nrhs ) ! advective (and/or diffusive) bottom boundary layer scheme 248 IF( ln_tradmp ) CALL tra_dmp ( kstp, Nnn, Nrhs ) ! internal damping trends 249 249 IF( ln_bdy ) CALL bdy_tra_dmp ( kstp ) ! bdy damping trends 250 250 #if defined key_agrif … … 256 256 IF( lrst_oce .AND. ln_zdfosm ) & 257 257 & CALL osm_rst( kstp, Nnn, 'WRITE' )! write OSMOSIS outputs + wn (so must do here) to restarts 258 CALL tra_ldf ( kstp, Nnn )! lateral mixing258 CALL tra_ldf( kstp, Nnn, Nrhs ) ! lateral mixing 259 259 260 260 !!gm : why CALL to dia_ptr has been moved here??? (use trends info?) … … 262 262 !!gm 263 263 CALL tra_zdf( kstp, Nbb, Nnn, Nrhs, ts, Naa ) ! vert. mixing & after tracer ==> after 264 IF( ln_zdfnpc ) CALL tra_npc ( kstp) ! update after fields by non-penetrative convection264 IF( ln_zdfnpc ) CALL tra_npc( kstp, Nnn, Nrhs ) ! update after fields by non-penetrative convection 265 265 266 266 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> … … 281 281 !! 282 282 !!jc2: dynnxt must be the latest call. e3t_b are indeed updated in that routine 283 CALL tra_nxt ( kstp ) ! finalize (bcs) tracer fields at next time step and swap284 CALL dyn_nxt ( kstp )! finalize (bcs) velocities at next time step and swap (always called after tra_nxt)283 CALL tra_nxt ( kstp, Nnn, Nrhs ) ! finalize (bcs) tracer fields at next time step and swap 284 CALL dyn_nxt ( kstp, Nnn ) ! finalize (bcs) velocities at next time step and swap (always called after tra_nxt) 285 285 CALL ssh_swp ( kstp ) ! swap of sea surface height 286 286 IF(.NOT.ln_linssh) CALL dom_vvl_sf_swp( kstp ) ! swap of vertical scale factors
Note: See TracChangeset
for help on using the changeset viewer.