Changeset 9485

Timestamp:

2018-04-14T13:18:45+02:00 (6 years ago)

Author:

clem

Message:

make sure that the double zoom configuration agrif_nordic is restartable. One must have moved the call to sea ice update at the end of step (after integrate_childgrids)

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO

Files:

• LIM_SRC_3/icestp.F90 (modified) (2 diffs)
• OPA_SRC/step.F90 (modified) (1 diff)
• OPA_SRC/step_oce.F90 (modified) (1 diff)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

@@ -50 +50 @@
 # if defined key_agrif
    USE agrif_ice
-   USE agrif_lim3_update
    USE agrif_lim3_interp
 # endif
@@ -173 +172 @@
          IF( ln_icethd )                CALL ice_cor( kt , 2 )        ! -- Corrections
          !
-         !                          !==  AGRIF Child to Parent  ==!
-# if defined key_agrif
-                                        CALL agrif_update_lim3( kt )
-# endif
                                         CALL ice_var_glo2eqv          ! necessary calls (at least for coupling)
                                         CALL ice_var_agg( 2 )         ! necessary calls (at least for coupling)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -292 +292 @@
       ! AGRIF
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<      
-                         CALL Agrif_Integrate_ChildGrids( stp )  
-
-      IF( Agrif_NbStepint() == 0 ) THEN               ! AGRIF Update 
+                         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
-                              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_lim3
+                              CALL Agrif_Update_lim3( 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
+                              CALL Agrif_Update_Trc()          ! Update passive tracers
 # endif
       ENDIF

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -105 +105 @@
    USE agrif_opa_sponge ! Momemtum and tracers sponges
    USE agrif_opa_update ! Update (2-way nesting)
+#if defined key_lim3
+   USE agrif_lim3_update
+#endif
 #if defined key_top
    USE agrif_top_update ! passive tracers update (2-way nesting)