Changeset 4978 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2014-12-08T17:03:48+01:00 (10 years ago)

Author:

jchanut

Message:

Recursive update for active tracers and dynamics

File:

• branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (3 diffs)

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -77 +77 @@
 #if defined key_agrif
       kstp = nit000 + Agrif_Nb_Step()
-      IF ( Agrif_Root() .and. lwp) Write(*,*) '---'
-      IF (lwp) Write(*,*) 'Grid Number',Agrif_Fixed(),' time step ',kstp
+      IF ( lk_agrif_debug ) THEN
+         IF ( Agrif_Root() .and. lwp) Write(*,*) '---'
+         IF (lwp) Write(*,*) 'Grid Number',Agrif_Fixed(),' time step ',kstp, 'int tstep',Agrif_NbStepint()
+      ENDIF
+
       IF ( kstp == (nit000 + 1) ) lk_agrif_fstep = .FALSE.
+
+      IF ( Agrif_NbStepint() .EQ. (Agrif_irhot()-1)) THEN 
+         lk_agrif_doupd = .TRUE.
+      ELSE
+         lk_agrif_doupd = .FALSE.
+      ENDIF
+
 # if defined key_iomput
       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( "nemo" )
@@ -298 +308 @@
                                CALL ssh_swp( kstp )         ! swap of sea surface height
       IF( lk_vvl           )   CALL dom_vvl_sf_swp( kstp )  ! swap of vertical scale factors
-
-#if defined key_agrif
-      ! AGRIF update
-      IF (.NOT.Agrif_Root()) THEN
-                               CALL Agrif_Update_Tra( kstp )! Update active tracers
-                               CALL Agrif_Update_Dyn( kstp )! Update momentum
-      ENDIF
-#endif
       !
       IF( ln_diahsb        )   CALL dia_hsb( kstp )         ! - ML - global conservation diagnostics
       IF( lk_diaobs  )         CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics (call after dynamics update)
+
+#if defined key_agrif
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! AGRIF update (TWO WAY)
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+      IF ( Agrif_Level().EQ.Agrif_MaxLevel() ) THEN
+                               CALL Agrif_Update_Tra()      ! Update active tracers
+                               CALL Agrif_Update_Dyn()      ! Update momentum
+      ENDIF
+#endif
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -348 +360 @@
       !
       IF( nn_timing == 1 .AND.  kstp == nit000  )   CALL timing_reset
-      !
-#if defined key_agrif
-      CALL Agrif_Integrate_ChildGrids( stp )   
-#endif      
+      !     
+#if defined key_agrif
+                               CALL Agrif_Integrate_ChildGrids( stp )   
+#endif
       !
    END SUBROUTINE stp