- Timestamp:
- 2020-11-09T16:48:35+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/test_12905_xios_restart
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/OCE/step.F90 (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/test_12905_xios_restart
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEADext/AGRIF5 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 8 9 9 # SETTE 10 ^/utils/CI/ r12931_sette_ticket2462@HEADsette10 ^/utils/CI/sette@13559 sette
-
- Property svn:externals
-
NEMO/branches/2020/test_12905_xios_restart/src/OCE/step.F90
r12977 r13751 33 33 !! 4.1 ! 2019-08 (A. Coward, D. Storkey) rewrite in preparation for new timestepping scheme 34 34 !!---------------------------------------------------------------------- 35 35 #if defined key_qco 36 !!---------------------------------------------------------------------- 37 !! 'key_qco' EMPTY MODULE Quasi-Eulerian vertical coordonate 38 !!---------------------------------------------------------------------- 39 #else 36 40 !!---------------------------------------------------------------------- 37 41 !! stp : OPA system time-stepping … … 82 86 !!---------------------------------------------------------------------- 83 87 INTEGER :: ji, jj, jk ! dummy loop indice 84 INTEGER :: indic ! error indicator if < 085 88 !!gm kcall can be removed, I guess 86 89 INTEGER :: kcall ! optional integer argument (dom_vvl_sf_nxt) 87 90 !! --------------------------------------------------------------------- 88 91 #if defined key_agrif 89 IF( nstop > 0 ) return ! avoid to go further if an error was detected during previous time step92 IF( nstop > 0 ) RETURN ! avoid to go further if an error was detected during previous time step (child grid) 90 93 kstp = nit000 + Agrif_Nb_Step() 91 94 Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nrhs ! agrif_oce module copies of time level indices … … 115 118 ! update I/O and calendar 116 119 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 117 indic = 0 ! reset to no error condition118 119 120 IF( kstp == nit000 ) THEN ! initialize IOM context (must be done after nemo_init for AGRIF+XIOS+OASIS) 120 CALL iom_init( cxios_context, ld_closedef=.FALSE. ) ! for model grid (including p assible AGRIF zoom)121 CALL iom_init( cxios_context, ld_closedef=.FALSE. ) ! for model grid (including possible AGRIF zoom) 121 122 IF( lk_diamlr ) CALL dia_mlr_iom_init ! with additional setup for multiple-linear-regression analysis 122 123 CALL iom_init_closedef … … 199 200 CALL ssh_nxt ( kstp, Nbb, Nnn, ssh, Naa ) ! after ssh (includes call to div_hor) 200 201 IF( .NOT.ln_linssh ) CALL dom_vvl_sf_nxt( kstp, Nbb, Nnn, Naa ) ! after vertical scale factors 201 CALL wzv ( kstp, Nbb, Nnn, ww, Naa) ! now cross-level velocity202 CALL wzv ( kstp, Nbb, Nnn, Naa, ww ) ! now cross-level velocity 202 203 IF( ln_zad_Aimp ) CALL wAimp ( kstp, Nnn ) ! Adaptive-implicit vertical advection partitioning 203 204 CALL eos ( ts(:,:,:,:,Nnn), rhd, rhop, gdept(:,:,:,Nnn) ) ! now in situ density for hpg computation … … 228 229 CALL dyn_zdf ( kstp, Nbb, Nnn, Nrhs, uu, vv, Naa ) ! vertical diffusion 229 230 IF( ln_dynspg_ts ) THEN ! vertical scale factors and vertical velocity need to be updated 230 CALL wzv ( kstp, Nbb, Nnn, ww, Naa) ! now cross-level velocity231 CALL wzv ( kstp, Nbb, Nnn, Naa, ww ) ! now cross-level velocity 231 232 IF( ln_zad_Aimp ) CALL wAimp ( kstp, Nnn ) ! Adaptive-implicit vertical advection partitioning 232 233 ENDIF … … 331 332 Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nrhs ! agrif_oce module copies of time level indices 332 333 CALL Agrif_Integrate_ChildGrids( stp ) ! allows to finish all the Child Grids before updating 334 333 335 #endif 334 336 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 335 337 ! Control 336 338 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 337 CALL stp_ctl ( kstp, Nbb, Nnn, indic ) 339 CALL stp_ctl ( kstp, Nnn ) 340 338 341 #if defined key_agrif 339 342 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> … … 343 346 CALL Agrif_update_all( ) ! Update all components 344 347 ENDIF 345 #endif 346 IF( ln_diaobs ) CALL dia_obs ( kstp, Nnn ) ! obs-minus-model (assimilation) diagnostics (call after dynamics update) 348 349 #endif 350 IF( ln_diaobs .AND. nstop == 0 ) CALL dia_obs( kstp, Nnn ) ! obs-minus-model (assimilation) diags (after dynamics update) 347 351 348 352 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> … … 359 363 ! Coupled mode 360 364 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 361 !!gm why lk_oasis and not lk_cpl ???? 362 IF( lk_oasis ) CALL sbc_cpl_snd( kstp, Nbb, Nnn ) ! coupled mode : field exchanges 365 IF( lk_oasis .AND. nstop == 0 ) CALL sbc_cpl_snd( kstp, Nbb, Nnn ) ! coupled mode : field exchanges 363 366 ! 364 367 #if defined key_iomput … … 366 369 ! Finalize contextes if end of simulation or error detected 367 370 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 368 IF( kstp == nitend .OR. indic <0 ) THEN371 IF( kstp == nitend .OR. nstop > 0 ) THEN 369 372 CALL iom_context_finalize( cxios_context ) ! needed for XIOS+AGRIF 370 373 IF( ln_crs ) CALL iom_context_finalize( trim(cxios_context)//"_crs" ) ! … … 382 385 END SUBROUTINE stp 383 386 ! 387 #endif 384 388 !!====================================================================== 385 389 END MODULE step
Note: See TracChangeset
for help on using the changeset viewer.
