Changeset 9780 for NEMO/trunk/src/OCE

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/OCE

Files:

• nemogcm.F90 (modified) (2 diffs)
• step.F90 (modified) (1 diff)
• step_oce.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/nemogcm.F90

@@ -89 +89 @@
    USE xios           ! xIOserver
 #endif
+#if defined key_agrif
+   USE agrif_all_update   ! Master Agrif update
+#endif
 
    IMPLICIT NONE
@@ -160 +163 @@
       !                                               !==  AGRIF time-stepping  ==!
       CALL Agrif_Regrid()
+      !
+      ! Recursive update from highest nested level to lowest:
+      CALL Agrif_step_child_adj(Agrif_Update_All)
       !
       DO WHILE( istp <= nitend .AND. nstop == 0 )

NEMO/trunk/src/OCE/step.F90

@@ -294 +294 @@
                          CALL Agrif_Integrate_ChildGrids( stp )  ! allows to finish all the Child Grids before updating
 
-      IF( Agrif_NbStepint() == 0 ) THEN               ! AGRIF Update from zoom N to zoom 1 then to Parent 
-!!jc in fact update is useless at last time step, but do it for global diagnostics
-#if defined key_si3
-                              CALL Agrif_Update_ice( kstp )   ! update sea-ice
-#endif
-                              CALL Agrif_Update_ssh()          ! Update ssh
-         IF(.NOT.ln_linssh)   CALL Agrif_Update_vvl()          ! Update vertical scale factors  
-                              CALL Agrif_Update_Tra()          ! Update active tracers
-                              CALL Agrif_Update_Dyn()          ! Update momentum
-# if defined key_top
-                              CALL Agrif_Update_Trc()          ! Update passive tracers
-# endif
-      ENDIF
+                         IF( Agrif_NbStepint() == 0 ) CALL Agrif_update_all( ) ! Update all components
 #endif
       IF( ln_diaobs  )   CALL dia_obs      ( kstp )      ! obs-minus-model (assimilation) diagnostics (call after dynamics update)

NEMO/trunk/src/OCE/step_oce.F90

@@ -104 +104 @@
 #if defined key_agrif
    USE agrif_oce_sponge ! Momemtum and tracers sponges
-   USE agrif_oce_update ! Update (2-way nesting)
-#if defined key_si3
-   USE agrif_ice_update
-#endif
-#if defined key_top
-   USE agrif_top_update ! passive tracers update (2-way nesting)
-#endif
+   USE agrif_all_update ! Main update driver
 #endif
 #if defined key_top