Changeset 9780 for NEMO/trunk/src/NST

Timestamp:

2018-06-12T14:12:51+02:00 (6 years ago)

Author:

jchanut

Message:

Reorganize Agrif update in a single subroutine ; use adjoint stepping for initial state update

Location:

NEMO/trunk/src/NST

Files:

• agrif_all_update.F90 (added)
• agrif_ice_update.F90 (modified) (2 diffs)
• agrif_oce_update.F90 (modified) (2 diffs)
• agrif_user.F90 (modified) (2 diffs)

NEMO/trunk/src/NST/agrif_ice_update.F90

@@ -42 +42 @@
 CONTAINS
 
-   SUBROUTINE agrif_update_ice( kt )
+   SUBROUTINE agrif_update_ice( )
       !!----------------------------------------------------------------------
       !!                     *** ROUTINE agrif_update_ice ***
@@ -49 +49 @@
       !! ** Action : - Update (u_ice,v_ice) and ice tracers
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) :: kt
-      !!----------------------------------------------------------------------
       !
       IF( Agrif_Root() .OR. nn_ice == 0 ) RETURN   ! do not update if inside Parent Grid or if child domain does not have ice
       !
-      IF( ( MOD( (kt-nit000)/nn_fsbc + 1, Agrif_irhot() * Agrif_Parent(nn_fsbc)/nn_fsbc ) /=0 ) .AND. (kt /= 0) ) RETURN   ! update only at the parent ice time step
+      IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update sea ice from grid Number',Agrif_Fixed()
+      !
+!      IF( ( MOD( (kt-nit000)/nn_fsbc + 1, Agrif_irhot() * Agrif_Parent(nn_fsbc)/nn_fsbc ) /=0 ) .AND. (kt /= 0) ) RETURN   ! update only at the parent ice time step
       !
       Agrif_SpecialValueFineGrid    = -9999.

NEMO/trunk/src/NST/agrif_oce_update.F90

@@ -144 +144 @@
       Agrif_UseSpecialValueInUpdate = .FALSE.
       !
-#  if defined DECAL_FEEDBACK && defined VOL_REFLUX
+#  if defined VOL_REFLUX
       IF ( ln_dynspg_ts.AND.ln_bt_fw ) THEN
          ! Refluxing on ssh:
+#  if defined DECAL_FEEDBACK
          CALL Agrif_Update_Variable(ub2b_update_id,locupdate1=(/0, 0/),locupdate2=(/1, 1/),procname = reflux_sshu)
          CALL Agrif_Update_Variable(vb2b_update_id,locupdate1=(/1, 1/),locupdate2=(/0, 0/),procname = reflux_sshv)
+#  else
+         CALL Agrif_Update_Variable(ub2b_update_id,locupdate1=(/-1,-1/),locupdate2=(/ 0, 0/),procname = reflux_sshu)
+         CALL Agrif_Update_Variable(vb2b_update_id,locupdate1=(/ 0, 0/),locupdate2=(/-1,-1/),procname = reflux_sshv)
+#  endif
       END IF
 #  endif
@@ -157 +162 @@
 
 
-   SUBROUTINE Agrif_Update_Tke( kt )
+   SUBROUTINE Agrif_Update_Tke( )
       !!---------------------------------------------
       !!   *** ROUTINE Agrif_Update_Tke ***
       !!---------------------------------------------
       !!
-      INTEGER, INTENT(in) :: kt 
       ! 
       IF (Agrif_Root()) RETURN
       !       
-      IF( ( Agrif_NbStepint() .NE. 0 ) .AND. (kt /= 0) ) RETURN
 #  if defined TWO_WAY
 

NEMO/trunk/src/NST/agrif_user.F90

@@ -64 +64 @@
    CALL Agrif_InitValues_cont_ice
 # endif
-   !
-   IF ( Agrif_Level().EQ.Agrif_MaxLevel() ) CALL agrif_Update_ini()
-
-   Agrif_UseSpecialValueInUpdate = .FALSE.     
-
+   !    
 END SUBROUTINE Agrif_initvalues
 
@@ -296 +292 @@
 END SUBROUTINE Agrif_InitValues_cont
 
-RECURSIVE SUBROUTINE Agrif_Update_ini( )
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE agrif_Update_ini ***
-   !!
-   !! ** Purpose :: Recursive update done at initialization
-   !!----------------------------------------------------------------------
-   USE dom_oce
-   USE agrif_oce_update
-#if defined key_top
-   USE agrif_top_update
-#endif
-#if defined key_si3
-   USE agrif_ice_update
-#endif
-   !
-   IMPLICIT NONE
-   !!----------------------------------------------------------------------
-   !
-   IF (Agrif_Root()) RETURN
-   !
-   CALL Agrif_Update_ssh()
-   IF (.NOT.ln_linssh) CALL Agrif_Update_vvl()
-   CALL Agrif_Update_tra()
-#if defined key_top
-   CALL Agrif_Update_Trc()
-#endif
-   CALL Agrif_Update_dyn()
-! JC remove update because this precludes from perfect restartability
-!!   CALL Agrif_Update_tke(0)
-
-#if defined key_si3
-   CALL agrif_update_ice(0)
-#endif
-   
-   CALL Agrif_ChildGrid_To_ParentGrid()
-   CALL Agrif_Update_ini()
-   CALL Agrif_ParentGrid_To_ChildGrid()
-
-END SUBROUTINE agrif_update_ini
-
 SUBROUTINE agrif_declare_var
    !!----------------------------------------------------------------------