Changeset 4978

Timestamp:

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

Author:

jchanut

Message:

Recursive update for active tracers and dynamics

Location:

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO

Files:

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

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

@@ -33 +33 @@
    REAL(wp), PUBLIC ::   visc_dyn                  !: sponge coeff. for dynamics
 
-   LOGICAL , PUBLIC :: spongedoneT = .FALSE.   !: tracer   sponge layer indicator
-   LOGICAL , PUBLIC :: spongedoneU = .FALSE.   !: dynamics sponge layer indicator
-   LOGICAL , PUBLIC :: lk_agrif_fstep = .TRUE. !: if true: first step
+   LOGICAL , PUBLIC :: spongedoneT = .FALSE.       !: tracer   sponge layer indicator
+   LOGICAL , PUBLIC :: spongedoneU = .FALSE.       !: dynamics sponge layer indicator
+   LOGICAL , PUBLIC :: lk_agrif_fstep = .TRUE.     !: if true: first step
+   LOGICAL , PUBLIC :: lk_agrif_doupd = .TRUE.     !: if true: send update from current grid
+   LOGICAL , PUBLIC :: lk_agrif_debug = .FALSE.    !: if true: print debugging info
 
    LOGICAL , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tabspongedone_tsn

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

@@ -29 +29 @@
 CONTAINS
 
-   SUBROUTINE Agrif_Update_Tra( kt )
+   RECURSIVE SUBROUTINE Agrif_Update_Tra( )
       !!---------------------------------------------
       !!   *** ROUTINE Agrif_Update_Tra ***
       !!---------------------------------------------
-      INTEGER, INTENT(in) :: kt
-      !!---------------------------------------------
-      ! 
-      IF((Agrif_NbStepint() .NE. (Agrif_irhot()-1)).AND.(kt /= 0)) RETURN
-#if defined TWO_WAY   
+      ! 
+      IF (Agrif_Root().OR.(.NOT.lk_agrif_doupd)) RETURN
+      !
+#if defined TWO_WAY  
+      IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update tracers  from grid Number',Agrif_Fixed(), 'nbcline', nbcline
+
       Agrif_UseSpecialValueInUpdate = .TRUE.
       Agrif_SpecialValueFineGrid = 0.
@@ -56 +57 @@
       !
       Agrif_UseSpecialValueInUpdate = .FALSE.
+      !
+      ! Do recursive update:
+      CALL Agrif_ChildGrid_To_ParentGrid()
+      CALL Agrif_Update_Tra()
+      CALL Agrif_ParentGrid_To_ChildGrid()
+      !
 #endif
       !
    END SUBROUTINE Agrif_Update_Tra
 
-   SUBROUTINE Agrif_Update_Dyn( kt )
+   RECURSIVE SUBROUTINE Agrif_Update_Dyn( )
       !!---------------------------------------------
       !!   *** ROUTINE Agrif_Update_Dyn ***
       !!---------------------------------------------
-      INTEGER, INTENT(in) :: kt
-      !!---------------------------------------------
-      ! 
-      IF ((Agrif_NbStepint() .NE. (Agrif_irhot()-1)).AND.(kt /= 0)) Return
+      ! 
+      IF (Agrif_Root().OR.(.NOT.lk_agrif_doupd)) RETURN
+      !
 #if defined TWO_WAY
+      IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update momentum from grid Number',Agrif_Fixed(), 'nbcline', nbcline
+
       Agrif_UseSpecialValueInUpdate = .FALSE.
       Agrif_SpecialValueFineGrid = 0.
@@ -133 +141 @@
       ! 
 #endif
+      !
+      ! Do recursive update:
+      CALL Agrif_ChildGrid_To_ParentGrid()
+      CALL Agrif_Update_Dyn()
+      CALL Agrif_ParentGrid_To_ChildGrid()
+      !
    END SUBROUTINE Agrif_Update_Dyn
 

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

@@ -280 +280 @@
    ENDIF
    ! 
-   CALL Agrif_Update_tra(0)
-   CALL Agrif_Update_dyn(0)
+   ! Do update at initialisation because not done before writing restarts
+   ! This would indeed change boundary conditions values at initial time
+   ! hence produce restartability issues.
+   ! Note that update below is recursive (with lk_agrif_doupd=T):
+   ! 
+! JC: I am not sure if Agrif_MaxLevel() is the "relative"
+!     or the absolute maximum nesting level...TBC                        
+   IF ( Agrif_Level().EQ.Agrif_MaxLevel() ) THEN 
+      ! NB: Do tracers first, dynamics after because nbcline incremented in dynamics
+      CALL Agrif_Update_tra()
+      CALL Agrif_Update_dyn()
+   ENDIF
+   !
 # if defined key_zdftke
    IF( ln_agrif_tke ) THEN
@@ -377 +388 @@
 !   CALL Agrif_Set_bc(un_sponge_id,(/-2*Agrif_irhox()-1,0/))
 !   CALL Agrif_Set_bc(vn_sponge_id,(/-2*Agrif_irhox()-1,0/))
-   CALL Agrif_Set_bc(tsn_sponge_id,(/-nn_sponge_len*Agrif_irhox(),0/))
-   CALL Agrif_Set_bc(un_sponge_id ,(/-nn_sponge_len*Agrif_irhox(),0/))
-   CALL Agrif_Set_bc(vn_sponge_id ,(/-nn_sponge_len*Agrif_irhox(),0/))
+   CALL Agrif_Set_bc(tsn_sponge_id,(/-nn_sponge_len*Agrif_irhox()-1,0/))
+   CALL Agrif_Set_bc(un_sponge_id ,(/-nn_sponge_len*Agrif_irhox()-1,0/))
+   CALL Agrif_Set_bc(vn_sponge_id ,(/-nn_sponge_len*Agrif_irhox()-1,0/))
 
    CALL Agrif_Set_bc(sshn_id,(/0,0/))
@@ -660 +671 @@
    CALL Agrif_Set_bc(trn_id,(/0,1/))
 !   CALL Agrif_Set_bc(trn_sponge_id,(/-3*Agrif_irhox(),0/))
-   CALL Agrif_Set_bc(trn_sponge_id,(/-nn_sponge_len*Agrif_irhox(),0/))
+   CALL Agrif_Set_bc(trn_sponge_id,(/-nn_sponge_len*Agrif_irhox()-1,0/))
 
    ! 5. Update type

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