Changeset 4980 for branches/2014

Timestamp:

2014-12-08T19:23:02+01:00 (9 years ago)

Author:

jchanut

Message:

Recursive update 2: change update location

Location:

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO

Files:

• NST_SRC/agrif_opa_update.F90 (modified) (4 diffs)
• NST_SRC/agrif_user.F90 (modified) (1 diff)
• OPA_SRC/step.F90 (modified) (4 diffs)

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -34 +34 @@
       !!---------------------------------------------
       ! 
-      IF (Agrif_Root().OR.(.NOT.lk_agrif_doupd)) RETURN
+      IF (Agrif_Root()) RETURN
       !
 #if defined TWO_WAY  
@@ -58 +58 @@
       Agrif_UseSpecialValueInUpdate = .FALSE.
       !
-      ! Do recursive update:
-      CALL Agrif_ChildGrid_To_ParentGrid()
-      CALL Agrif_Update_Tra()
-      CALL Agrif_ParentGrid_To_ChildGrid()
+      IF ( lk_agrif_doupd ) THEN ! Initialisation: do recursive update:
+         CALL Agrif_ChildGrid_To_ParentGrid()
+         CALL Agrif_Update_Tra()
+         CALL Agrif_ParentGrid_To_ChildGrid()
+      ENDIF
       !
 #endif
@@ -72 +73 @@
       !!---------------------------------------------
       ! 
-      IF (Agrif_Root().OR.(.NOT.lk_agrif_doupd)) RETURN
+      IF (Agrif_Root()) RETURN
       !
 #if defined TWO_WAY
@@ -143 +144 @@
       !
       ! Do recursive update:
-      CALL Agrif_ChildGrid_To_ParentGrid()
-      CALL Agrif_Update_Dyn()
-      CALL Agrif_ParentGrid_To_ChildGrid()
+      IF ( lk_agrif_doupd ) THEN ! Initialisation: do recursive update:
+         CALL Agrif_ChildGrid_To_ParentGrid()
+         CALL Agrif_Update_Dyn()
+         CALL Agrif_ParentGrid_To_ChildGrid()
+      ENDIF
       !
    END SUBROUTINE Agrif_Update_Dyn

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

@@ -301 +301 @@
    Agrif_UseSpecialValueInUpdate = .FALSE.
    nbcline = 0
+   lk_agrif_doupd = .FALSE.
    !
 END SUBROUTINE Agrif_InitValues_cont

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

@@ -84 +84 @@
       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" )
@@ -309 +303 @@
       IF( lk_vvl           )   CALL dom_vvl_sf_swp( kstp )  ! swap of vertical scale factors
       !
+      IF( lrst_oce         )   CALL rst_write( kstp )       ! write output ocean restart file
+
+#if defined key_agrif
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! AGRIF
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<      
+                               CALL Agrif_Integrate_ChildGrids( stp )  
+
+      IF ( Agrif_NbStepint().EQ.0 ) THEN
+                               CALL Agrif_Update_Tra()      ! Update active tracers
+                               CALL Agrif_Update_Dyn()      ! 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
-
-      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-      ! Control and restarts
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! Control
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                                CALL stp_ctl( kstp, indic )
@@ -335 +332 @@
          IF(lwm) CALL FLUSH    ( numoni )     ! flush output namelist ice    
       ENDIF
-      IF( lrst_oce         )   CALL rst_write    ( kstp )   ! write output ocean restart file
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -361 +357 @@
       IF( nn_timing == 1 .AND.  kstp == nit000  )   CALL timing_reset
       !     
-#if defined key_agrif
-                               CALL Agrif_Integrate_ChildGrids( stp )   
-#endif
       !
    END SUBROUTINE stp