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

Timestamp:

2017-04-28T17:39:22+02:00 (8 years ago)

Author:

jchanut

Message:

Add AGRIF proper AGRIF bcs to GLS and TKE + vvl update

File:

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

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

@@ -198 +198 @@
    CALL Agrif_Bc_variable(tsn_sponge_id,calledweight=1.,procname=interptsn_sponge)
    ! reset tsa to zero
-   tsa(:,:,:,:) = 0.
+   tsa(:,:,:,:) = 0. !? JC: ??
 
    Agrif_UseSpecialValue = ln_spc_dyn
@@ -212 +212 @@
    Agrif_UseSpecialValue = .TRUE.
    CALL Agrif_Bc_variable(sshn_id,calledweight=1., procname=interpsshn )
+   hbdy_w(:) = 0.e0 ; hbdy_e(:) = 0.e0 ; hbdy_n(:) = 0.e0 ; hbdy_s(:) = 0.e0
+   ssha(:,:) = 0.e0
 
 #if defined key_dynspg_ts
@@ -219 +221 @@
    CALL Agrif_Bc_variable(ub2b_interp_id,calledweight=1.,procname=interpub2b)
    CALL Agrif_Bc_variable(vb2b_interp_id,calledweight=1.,procname=interpvb2b)
-   ubdy_w(:) = 0.e0 ; vbdy_w(:) = 0.e0 ; hbdy_w(:) =0.e0
-   ubdy_e(:) = 0.e0 ; vbdy_e(:) = 0.e0 ; hbdy_e(:) =0.e0 
-   ubdy_n(:) = 0.e0 ; vbdy_n(:) = 0.e0 ; hbdy_n(:) =0.e0 
-   ubdy_s(:) = 0.e0 ; vbdy_s(:) = 0.e0 ; hbdy_s(:) =0.e0
+   ubdy_w(:) = 0.e0 ; vbdy_w(:) = 0.e0 
+   ubdy_e(:) = 0.e0 ; vbdy_e(:) = 0.e0 
+   ubdy_n(:) = 0.e0 ; vbdy_n(:) = 0.e0 
+   ubdy_s(:) = 0.e0 ; vbdy_s(:) = 0.e0 
 #endif
 
@@ -307 +309 @@
    ! 
 ! 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 
+!     or the absolute maximum nesting level...TBC  
+   nbcline = 0                 
+   IF ( Agrif_Level().EQ.Agrif_MaxLevel() ) THEN       
       ! NB: Order matters below: 
-      CALL Agrif_Update_vvl() 
+      IF ( lk_vvl ) CALL Agrif_Update_vvl() 
       CALL Agrif_Update_tra()
       CALL Agrif_Update_dyn()
@@ -320 +323 @@
    !
    Agrif_UseSpecialValueInUpdate = .FALSE.
-   nbcline = 0
    lk_agrif_doupd = .FALSE.
    !
@@ -366 +368 @@
    CALL agrif_declare_variable((/2,2/),(/3,3/),(/'x','y'/),(/1,1/),(/nlci,nlcj/),sshn_id)
 
-# if defined key_zdftke
-   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/), en_id)
-   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avt_id)
-   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avm_id)
+# if defined key_zdftke || defined key_zdfgls
+   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpk/), en_id)
+   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpk/),avt_id)
+   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpk/),avm_id)
 # endif
 
@@ -395 +397 @@
    CALL Agrif_Set_bcinterp(vmsk_id,interp=AGRIF_constant)
 
-# if defined key_zdftke
+# if defined key_zdftke || defined key_zdfgls
    CALL Agrif_Set_bcinterp(avm_id ,interp=AGRIF_linear)
 # endif
@@ -423 +425 @@
    CALL Agrif_Set_bc(vmsk_id,(/0,0/))
 
-# if defined key_zdftke
+# if defined key_zdftke || defined key_zdfgls
    CALL Agrif_Set_bc(avm_id ,(/0,1/))
 # endif
@@ -441 +443 @@
    CALL Agrif_Set_Updatetype(vb2b_update_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Copy)
 
-# if defined key_zdftke
+# if defined key_zdftke || defined key_zdfgls
    CALL Agrif_Set_Updatetype( en_id, update = AGRIF_Update_Average)
    CALL Agrif_Set_Updatetype(avt_id, update = AGRIF_Update_Average)
@@ -457 +459 @@
 !   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)
    !
 END SUBROUTINE agrif_declare_var
@@ -657 +660 @@
       ENDIF
    ENDIF
-
+   nbcline_trc = 0
    CALL Agrif_Update_trc(0)
    !
    Agrif_UseSpecialValueInUpdate = .FALSE.
-   nbcline_trc = 0
    !
 END SUBROUTINE Agrif_InitValues_cont_top
@@ -766 +768 @@
    IF (lk_mpp) iminspon = MIN(iminspon,FLOOR(REAL(jpi-2)/REAL(Agrif_irhox())), FLOOR(REAL(jpj-2)/REAL(Agrif_irhox())) )
    IF (nn_sponge_len > iminspon)  CALL ctl_stop('agrif sponge length is too large')
+   IF (MOD((nitend-nit000+1), nbclineupdate).NE.0 ) CALL ctl_stop('number of time steps should be a multiple of nn_cln_update')
    !
    IF( agrif_oce_alloc()  > 0 )   CALL ctl_warn('agrif agrif_oce_alloc: allocation of arrays failed')