- Timestamp:
- 2019-07-31T18:05:50+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_STOPACK/NEMOGCM/NEMO/OPA_SRC/step.F90
r5510 r11384 105 105 CALL bdy_dta ( kstp, time_offset=+1 ) ! update dynamic & tracer data at open boundaries 106 106 ENDIF 107 IF( ln_stopack ) CALL stopack_pert( kstp ) 107 108 CALL sbc ( kstp ) ! Sea Boundary Condition (including sea-ice) 108 109 ! clem: moved here for bdy ice purpose … … 110 111 ! Update stochastic parameters and random T/S fluctuations 111 112 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 112 CALL sto_par( kstp ) ! Stochastic parameters 113 IF( ln_sto_eos ) CALL sto_par( kstp ) ! Stochastic parameters 114 IF( ln_sto_eos ) CALL sto_pts( tsn ) ! Random T/S fluctuations 115 IF( ln_skeb ) CALL skeb_comp( kstp ) 113 116 114 117 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> … … 134 137 ENDIF 135 138 IF( ln_rnf_mouth ) THEN ! increase diffusivity at rivers mouths 136 DO jk = 2, nkrnf ; avt(:,:,jk) = avt(:,:,jk) + 2.e0 * rn_avt_rnf * rnfmsk(:,:) * tmask(:,:,jk) ; END DO 139 IF ( nn_spp_arnf .GT. 0 ) THEN 140 rn_avt_rnf0 = rn_avt_rnf 141 CALL spp_gen( kstp, rn_avt_rnf0,nn_spp_arnf,rn_arnf_sd,jk_spp_arnf ) 142 ENDIF 143 DO jk = 2, nkrnf ; avt(:,:,jk) = avt(:,:,jk) + 2.e0 * rn_avt_rnf0(:,:) * rnfmsk(:,:) * tmask(:,:,jk) ; END DO 137 144 ENDIF 138 145 IF( ln_zdfevd ) CALL zdf_evd( kstp ) ! enhanced vertical eddy diffusivity … … 148 155 IF( lrst_oce .AND. lk_zdftke ) CALL tke_rst( kstp, 'WRITE' ) 149 156 IF( lrst_oce .AND. lk_zdfgls ) CALL gls_rst( kstp, 'WRITE' ) 157 IF( lrst_oce .AND. ln_stopack) CALL stopack_rst( kstp, 'WRITE' ) 150 158 ! 151 159 ! LATERAL PHYSICS 152 160 ! 153 161 IF( lk_ldfslp ) THEN ! slope of lateral mixing 154 IF(ln_sto_eos ) CALL sto_pts( tsn ) ! Random T/S fluctuations155 162 CALL eos( tsb, rhd, gdept_0(:,:,:) ) ! before in situ density 156 163 IF( ln_zps .AND. .NOT. ln_isfcav) & … … 188 195 ! Note that the computation of vertical velocity above, hence "after" sea level 189 196 ! is necessary to compute momentum advection for the rhs of barotropic loop: 190 IF(ln_sto_eos ) CALL sto_pts( tsn ) ! Random T/S fluctuations191 197 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 192 198 IF( ln_zps .AND. .NOT. ln_isfcav) & … … 201 207 va(:,:,:) = 0.e0 202 208 IF( ln_asmiau .AND. & 203 & ln_dyninc ) CALL dyn_asm_inc ( kstp ) ! apply dynamics assimilation increment 204 IF( ln_neptsimp ) CALL dyn_nept_cor ( kstp ) ! subtract Neptune velocities (simplified) 205 IF( lk_bdy ) CALL bdy_dyn3d_dmp( kstp ) ! bdy damping trends 206 CALL dyn_adv ( kstp ) ! advection (vector or flux form) 207 CALL dyn_vor ( kstp ) ! vorticity term including Coriolis 208 CALL dyn_ldf ( kstp ) ! lateral mixing 209 IF( ln_neptsimp ) CALL dyn_nept_cor ( kstp ) ! add Neptune velocities (simplified) 209 & ln_dyninc ) CALL dyn_asm_inc ( kstp ) ! apply dynamics assimilation increment 210 IF( ln_sppt_dyn ) CALL dyn_sppt_apply( kstp, 0 ) 211 IF( ln_neptsimp ) CALL dyn_nept_cor ( kstp ) ! subtract Neptune velocities (simplified) 212 IF( lk_bdy ) CALL bdy_dyn3d_dmp ( kstp ) ! bdy damping trends 213 CALL dyn_adv ( kstp ) ! advection (vector or flux form) 214 CALL dyn_vor ( kstp ) ! vorticity term including Coriolis 215 CALL dyn_ldf ( kstp ) ! lateral mixing 216 IF( ln_neptsimp ) CALL dyn_nept_cor ( kstp ) ! add Neptune velocities (simplified) 210 217 #if defined key_agrif 211 218 IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_dyn ! momentum sponge … … 231 238 IF( lk_diaar5 ) CALL dia_ar5( kstp ) ! ar5 diag 232 239 IF( lk_diaharm ) CALL dia_harm( kstp ) ! Tidal harmonic analysis 240 CALL dia_prod( kstp ) ! ocean model: product diagnostics 233 241 CALL dia_wri( kstp ) ! ocean model: outputs 234 242 ! … … 248 256 tsa(:,:,:,:) = 0.e0 ! set tracer trends to zero 249 257 250 IF( ln_asmiau .AND. & 251 & ln_trainc ) CALL tra_asm_inc( kstp ) ! apply tracer assimilation increment 258 IF( ln_sppt_tra ) CALL tra_sppt_apply ( kstp, 0 ) 259 IF( ln_asmiau .AND. & 260 & ln_trainc ) CALL tra_asm_inc( kstp ) ! apply tracer assimilation increment 252 261 CALL tra_sbc ( kstp ) ! surface boundary condition 253 262 IF( ln_traqsr ) CALL tra_qsr ( kstp ) ! penetrative solar radiation qsr … … 265 274 IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_tra ! tracers sponge 266 275 #endif 276 IF( ln_sppt_tra ) CALL tra_sppt_apply ( kstp, 1 ) 267 277 CALL tra_zdf ( kstp ) ! vertical mixing and after tracer fields 268 278 … … 270 280 IF( ln_zdfnpc ) CALL tra_npc( kstp ) ! update after fields by non-penetrative convection 271 281 CALL tra_nxt( kstp ) ! tracer fields at next time step 272 IF( ln_sto_eos ) CALL sto_pts( tsn ) ! Random T/S fluctuations282 IF( ln_sppt_tra ) CALL tra_sppt_apply ( kstp, 2 ) 273 283 CALL eos ( tsa, rhd, rhop, fsdept_n(:,:,:) ) ! Time-filtered in situ density for hpg computation 274 284 IF( ln_zps .AND. .NOT. ln_isfcav) & … … 281 291 ELSE ! centered hpg (eos then time stepping) 282 292 IF ( .NOT. lk_dynspg_ts ) THEN ! eos already called in time-split case 283 IF( ln_sto_eos ) CALL sto_pts( tsn ) ! Random T/S fluctuations284 293 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 285 294 IF( ln_zps .AND. .NOT. ln_isfcav) & … … 293 302 IF( ln_zdfnpc ) CALL tra_npc( kstp ) ! update after fields by non-penetrative convection 294 303 CALL tra_nxt( kstp ) ! tracer fields at next time step 304 IF( ln_sppt_tra ) THEN 305 CALL tra_sppt_apply ( kstp, 2 ) 306 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 307 IF( ln_zps .AND. .NOT. ln_isfcav) & 308 & CALL zps_hde ( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps: before horizontal gradient 309 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 310 IF( ln_zps .AND. ln_isfcav) & 311 & CALL zps_hde_isf( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps for top cell (ISF) 312 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & 313 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 295 314 ENDIF 296 315 … … 309 328 310 329 CALL dyn_bfr( kstp ) ! bottom friction 330 IF( ln_sppt_dyn ) CALL dyn_sppt_apply ( kstp, 1 ) 311 331 CALL dyn_zdf( kstp ) ! vertical diffusion 312 332 ELSE … … 316 336 IF( ln_asmiau .AND. & 317 337 & ln_dyninc ) CALL dyn_asm_inc( kstp ) ! apply dynamics assimilation increment 338 IF( ln_sppt_dyn ) CALL dyn_sppt_apply ( kstp, 0 ) 318 339 IF( ln_bkgwri ) CALL asm_bkg_wri( kstp ) ! output background fields 319 340 IF( ln_neptsimp ) CALL dyn_nept_cor( kstp ) ! subtract Neptune velocities (simplified) … … 328 349 CALL dyn_hpg( kstp ) ! horizontal gradient of Hydrostatic pressure 329 350 CALL dyn_bfr( kstp ) ! bottom friction 351 IF( ln_sppt_dyn ) CALL dyn_sppt_apply ( kstp, 1 ) 330 352 CALL dyn_zdf( kstp ) ! vertical diffusion 331 353 CALL dyn_spg( kstp, indic ) ! surface pressure gradient 332 354 ENDIF 333 355 CALL dyn_nxt( kstp ) ! lateral velocity at next time step 356 IF( ln_sppt_dyn ) CALL dyn_sppt_apply ( kstp, 2 ) 357 IF( ln_skeb ) CALL skeb_apply ( kstp ) 334 358 335 359 CALL ssh_swp( kstp ) ! swap of sea surface height … … 353 377 ENDIF 354 378 IF( lrst_oce ) CALL rst_write ( kstp ) ! write output ocean restart file 379 IF( ln_sto_eos ) CALL sto_rst_write( kstp ) ! write restart file for stochastic parameters 355 380 356 381 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Note: See TracChangeset
for help on using the changeset viewer.
