Changeset 8010 for branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

Timestamp:

2017-05-09T17:36:25+02:00 (7 years ago)

Author:

jchanut

Message:

AGRIF vvl add on

File:

• branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) (8 diffs)

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

@@ +1 @@
+#undef UPD_HIGH   /* MIX HIGH UPDATE */
 #if defined key_agrif
 !!----------------------------------------------------------------------
@@ -90 +91 @@
 # if defined key_top
    CALL Agrif_InitValues_cont_top
-# endif      
+# endif 
+
+   nbcline     = 0
+#if defined key_top
+   nbcline_trc = 0
+#endif
+
+   IF ( Agrif_Level().EQ.Agrif_MaxLevel() ) CALL agrif_Update_ini()
+
+   Agrif_UseSpecialValueInUpdate = .FALSE.
+     
 END SUBROUTINE Agrif_initvalues
 
@@ -150 +161 @@
    ! 5. Update type
    !--------------- 
+# if defined UPD_HIGH
+   CALL Agrif_Set_Updatetype(e1u_id,update1 = Agrif_Update_Average, update2=Agrif_Update_Full_Weighting)
+   CALL Agrif_Set_Updatetype(e2v_id,update1 = Agrif_Update_Full_Weighting, update2=Agrif_Update_Average)
+#else
    CALL Agrif_Set_Updatetype(e1u_id,update1 = Agrif_Update_Copy, update2=Agrif_Update_Average)
    CALL Agrif_Set_Updatetype(e2v_id,update1 = Agrif_Update_Average, update2=Agrif_Update_Copy)
-
-! High order updates
-!   CALL Agrif_Set_Updatetype(e1u_id,update1 = Agrif_Update_Average,            update2=Agrif_Update_Full_Weighting)
-!   CALL Agrif_Set_Updatetype(e2v_id,update1 = Agrif_Update_Full_Weighting,     update2=Agrif_Update_Average)
+#endif
     !
 END SUBROUTINE agrif_declare_var_dom
@@ -302 +314 @@
       !
    ENDIF
-   ! 
-   ! 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  
-   nbcline = 0                 
-   IF ( Agrif_Level().EQ.Agrif_MaxLevel() ) THEN       
-      ! NB: Order matters below: 
-      IF ( lk_vvl ) CALL Agrif_Update_vvl() 
-      CALL Agrif_Update_tra()
-      CALL Agrif_Update_dyn()
-   ENDIF
-   !
+
+END SUBROUTINE Agrif_InitValues_cont
+
+RECURSIVE SUBROUTINE Agrif_Update_ini( )
+   !
+   USE dom_oce
+   USE agrif_opa_update
+#if defined key_top
+   USE agrif_top_update
+#endif
+   !
+   IMPLICIT NONE
+   !
+   IF (Agrif_Root()) RETURN
+   !
+   IF ( lk_vvl ) CALL Agrif_Update_vvl()
+   CALL Agrif_Update_tra()
+#if defined key_top
+   CALL Agrif_Update_Trc()
+#endif
+   CALL Agrif_Update_dyn()
 # if defined key_zdftke
 !   CALL Agrif_Update_tke(0)
 # endif
-   !
-   Agrif_UseSpecialValueInUpdate = .FALSE.
-   lk_agrif_doupd = .FALSE.
-   !
-END SUBROUTINE Agrif_InitValues_cont
-
+
+   CALL Agrif_ChildGrid_To_ParentGrid()
+   CALL Agrif_Update_ini()
+   CALL Agrif_ParentGrid_To_ChildGrid()
+
+END SUBROUTINE agrif_update_ini
 
 SUBROUTINE agrif_declare_var
@@ -431 +448 @@
    ! 5. Update type
    !--------------- 
+   CALL Agrif_Set_Updatetype(scales_t_id, update = AGRIF_Update_Average)
+
+# if defined UPD_HIGH
+   CALL Agrif_Set_Updatetype(tsn_id, update = Agrif_Update_Full_Weighting)
+   CALL Agrif_Set_Updatetype(un_update_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Full_Weighting)
+   CALL Agrif_Set_Updatetype(vn_update_id,update1 = Agrif_Update_Full_Weighting, update2 = Agrif_Update_Average)
+
+   CALL Agrif_Set_Updatetype(ub2b_update_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Full_Weighting)
+   CALL Agrif_Set_Updatetype(vb2b_update_id,update1 = Agrif_Update_Full_Weighting, update2 = Agrif_Update_Average)
+   CALL Agrif_Set_Updatetype(sshn_id, update = Agrif_Update_Full_Weighting)
+   CALL Agrif_Set_Updatetype(e3t_id, update = Agrif_Update_Full_Weighting)
+
+# if defined key_zdftke || defined key_zdfgls
+   CALL Agrif_Set_Updatetype( en_id, update = AGRIF_Update_Full_Weighting)
+   CALL Agrif_Set_Updatetype(avt_id, update = AGRIF_Update_Full_Weighting)
+   CALL Agrif_Set_Updatetype(avm_id, update = AGRIF_Update_Full_Weighting)
+# endif
+
+#else
    CALL Agrif_Set_Updatetype(tsn_id, update = AGRIF_Update_Average)
-
-   CALL Agrif_Set_Updatetype(scales_t_id, update = AGRIF_Update_Average)
-
    CALL Agrif_Set_Updatetype(un_update_id,update1 = Agrif_Update_Copy, update2 = Agrif_Update_Average)
    CALL Agrif_Set_Updatetype(vn_update_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Copy)
 
-   CALL Agrif_Set_Updatetype(sshn_id, update = AGRIF_Update_Average)
-
    CALL Agrif_Set_Updatetype(ub2b_update_id,update1 = Agrif_Update_Copy, update2 = Agrif_Update_Average)
    CALL Agrif_Set_Updatetype(vb2b_update_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Copy)
+   CALL Agrif_Set_Updatetype(sshn_id, update = AGRIF_Update_Average)
+   CALL Agrif_Set_Updatetype(e3t_id, update = AGRIF_Update_Average)
 
 # if defined key_zdftke || defined key_zdfgls
@@ -449 +482 @@
 # endif
 
-   CALL Agrif_Set_Updatetype(e3t_id, update = AGRIF_Update_Average)
-
-! High order updates
-!   CALL Agrif_Set_Updatetype(tsn_id, update = Agrif_Update_Full_Weighting)
-!   CALL Agrif_Set_Updatetype(un_update_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Full_Weighting)
-!   CALL Agrif_Set_Updatetype(vn_update_id,update1 = Agrif_Update_Full_Weighting, update2 = Agrif_Update_Average)
-!
-!   CALL Agrif_Set_Updatetype(ub2b_update_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Full_Weighting)
-!   CALL Agrif_Set_Updatetype(vb2b_update_id,update1 = Agrif_Update_Full_Weighting, update2 = Agrif_Update_Average)
-!   CALL Agrif_Set_Updatetype(sshn_id, update = Agrif_Update_Full_Weighting)
-
-!   CALL Agrif_Set_Updatetype(e3t_id, update = Agrif_Update_Full_Weighting)
+#endif
    !
 END SUBROUTINE agrif_declare_var
@@ -660 +682 @@
       ENDIF
    ENDIF
-   nbcline_trc = 0
-   CALL Agrif_Update_trc(0)
-   !
-   Agrif_UseSpecialValueInUpdate = .FALSE.
    !
 END SUBROUTINE Agrif_InitValues_cont_top
@@ -699 +717 @@
    ! 5. Update type
    !--------------- 
+# if defined UPD_HIGH
+   CALL Agrif_Set_Updatetype(trn_id, update = Agrif_Update_Full_Weighting)
+#else
    CALL Agrif_Set_Updatetype(trn_id, update = AGRIF_Update_Average)
-
-!   Higher order update
-!   CALL Agrif_Set_Updatetype(tsn_id, update = Agrif_Update_Full_Weighting)
-
+#endif
    !
 END SUBROUTINE agrif_declare_var_top