Changeset 4980
- Timestamp:
- 2014-12-08T19:23:02+01:00 (9 years ago)
- Location:
- branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
r4978 r4980 34 34 !!--------------------------------------------- 35 35 ! 36 IF (Agrif_Root() .OR.(.NOT.lk_agrif_doupd)) RETURN36 IF (Agrif_Root()) RETURN 37 37 ! 38 38 #if defined TWO_WAY … … 58 58 Agrif_UseSpecialValueInUpdate = .FALSE. 59 59 ! 60 ! Do recursive update: 61 CALL Agrif_ChildGrid_To_ParentGrid() 62 CALL Agrif_Update_Tra() 63 CALL Agrif_ParentGrid_To_ChildGrid() 60 IF ( lk_agrif_doupd ) THEN ! Initialisation: do recursive update: 61 CALL Agrif_ChildGrid_To_ParentGrid() 62 CALL Agrif_Update_Tra() 63 CALL Agrif_ParentGrid_To_ChildGrid() 64 ENDIF 64 65 ! 65 66 #endif … … 72 73 !!--------------------------------------------- 73 74 ! 74 IF (Agrif_Root() .OR.(.NOT.lk_agrif_doupd)) RETURN75 IF (Agrif_Root()) RETURN 75 76 ! 76 77 #if defined TWO_WAY … … 143 144 ! 144 145 ! Do recursive update: 145 CALL Agrif_ChildGrid_To_ParentGrid() 146 CALL Agrif_Update_Dyn() 147 CALL Agrif_ParentGrid_To_ChildGrid() 146 IF ( lk_agrif_doupd ) THEN ! Initialisation: do recursive update: 147 CALL Agrif_ChildGrid_To_ParentGrid() 148 CALL Agrif_Update_Dyn() 149 CALL Agrif_ParentGrid_To_ChildGrid() 150 ENDIF 148 151 ! 149 152 END SUBROUTINE Agrif_Update_Dyn -
branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_user.F90
r4978 r4980 301 301 Agrif_UseSpecialValueInUpdate = .FALSE. 302 302 nbcline = 0 303 lk_agrif_doupd = .FALSE. 303 304 ! 304 305 END SUBROUTINE Agrif_InitValues_cont -
branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/OPA_SRC/step.F90
r4978 r4980 84 84 IF ( kstp == (nit000 + 1) ) lk_agrif_fstep = .FALSE. 85 85 86 IF ( Agrif_NbStepint() .EQ. (Agrif_irhot()-1)) THEN87 lk_agrif_doupd = .TRUE.88 ELSE89 lk_agrif_doupd = .FALSE.90 ENDIF91 92 86 # if defined key_iomput 93 87 IF( Agrif_Nbstepint() == 0 ) CALL iom_swap( "nemo" ) … … 309 303 IF( lk_vvl ) CALL dom_vvl_sf_swp( kstp ) ! swap of vertical scale factors 310 304 ! 305 IF( lrst_oce ) CALL rst_write( kstp ) ! write output ocean restart file 306 307 #if defined key_agrif 308 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 309 ! AGRIF 310 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 311 CALL Agrif_Integrate_ChildGrids( stp ) 312 313 IF ( Agrif_NbStepint().EQ.0 ) THEN 314 CALL Agrif_Update_Tra() ! Update active tracers 315 CALL Agrif_Update_Dyn() ! Update momentum 316 ENDIF 317 #endif 311 318 IF( ln_diahsb ) CALL dia_hsb( kstp ) ! - ML - global conservation diagnostics 312 319 IF( lk_diaobs ) CALL dia_obs( kstp ) ! obs-minus-model (assimilation) diagnostics (call after dynamics update) 313 320 314 #if defined key_agrif 315 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 316 ! AGRIF update (TWO WAY) 317 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 318 IF ( Agrif_Level().EQ.Agrif_MaxLevel() ) THEN 319 CALL Agrif_Update_Tra() ! Update active tracers 320 CALL Agrif_Update_Dyn() ! Update momentum 321 ENDIF 322 #endif 323 324 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 325 ! Control and restarts 321 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 322 ! Control 326 323 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 327 324 CALL stp_ctl( kstp, indic ) … … 335 332 IF(lwm) CALL FLUSH ( numoni ) ! flush output namelist ice 336 333 ENDIF 337 IF( lrst_oce ) CALL rst_write ( kstp ) ! write output ocean restart file338 334 339 335 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> … … 361 357 IF( nn_timing == 1 .AND. kstp == nit000 ) CALL timing_reset 362 358 ! 363 #if defined key_agrif364 CALL Agrif_Integrate_ChildGrids( stp )365 #endif366 359 ! 367 360 END SUBROUTINE stp
Note: See TracChangeset
for help on using the changeset viewer.