Changeset 14086 for NEMO/trunk/src/NST/agrif_oce.F90

Timestamp:

2020-12-04T12:37:14+01:00 (3 years ago)

Author:

cetlod

Message:

Adding AGRIF branches into the trunk

File:

• NEMO/trunk/src/NST/agrif_oce.F90 (modified) (8 diffs)

NEMO/trunk/src/NST/agrif_oce.F90

@@ -23 +23 @@
    LOGICAL , PUBLIC ::   ln_spc_dyn    = .FALSE.   !: use zeros (.false.) or not (.true.) in
                                                    !: bdys dynamical fields interpolation
-   REAL(wp), PUBLIC ::   rn_sponge_tra = 2800.     !: sponge coeff. for tracers
-   REAL(wp), PUBLIC ::   rn_sponge_dyn = 2800.     !: sponge coeff. for dynamics
+   LOGICAL , PUBLIC ::   ln_vert_remap = .FALSE.   !: use vertical remapping
+   REAL(wp), PUBLIC ::   rn_sponge_tra = 0.002     !: sponge coeff. for tracers
+   REAL(wp), PUBLIC ::   rn_sponge_dyn = 0.002     !: sponge coeff. for dynamics
    REAL(wp), PUBLIC ::   rn_trelax_tra = 0.01      !: time relaxation parameter for tracers
    REAL(wp), PUBLIC ::   rn_trelax_dyn = 0.01      !: time relaxation parameter for momentum
@@ -30 +31 @@
    !
    INTEGER , PUBLIC, PARAMETER ::   nn_sponge_len = 2  !: Sponge width (in number of parent grid points)
+   INTEGER , PUBLIC, PARAMETER ::   nn_shift_bar = 0   !: nb of coarse grid points by which we shift 2d interface
 
    LOGICAL , PUBLIC :: spongedoneT = .FALSE.       !: tracer   sponge layer indicator
@@ -35 +37 @@
    LOGICAL , PUBLIC :: lk_agrif_fstep = .TRUE.     !: if true: first step
    LOGICAL , PUBLIC :: lk_agrif_debug = .FALSE.    !: if true: print debugging info
-
+   LOGICAL , PUBLIC :: lk_tint2d_notinterp = .FALSE. !: if true, no time interp
    LOGICAL , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tabspongedone_tsn
 # if defined key_top
@@ -46 +48 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fspu, fspv !: sponge arrays
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fspt, fspf !:   "      "
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fspu_2d,fspv_2d  !: sponge arrays (2d mode)
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fspt_2d, fspf_2d !:   "       "     "   "
 
    ! Barotropic arrays used to store open boundary data during time-splitting loop:
@@ -51 +55 @@
    INTEGER , PUBLIC,              SAVE                 ::  Kbb_a, Kmm_a, Krhs_a   !: AGRIF module-specific copies of time-level indices
 
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ht0_parent, hu0_parent, hv0_parent
-   INTEGER,  PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: mbkt_parent, mbku_parent, mbkv_parent
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   :: ht0_parent, hu0_parent, hv0_parent
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: e3t0_parent, e3u0_parent, e3v0_parent
+   INTEGER,  PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   :: mbkt_parent, mbku_parent, mbkv_parent
 
-   INTEGER, PUBLIC :: tsn_id                                                  ! AGRIF profile for tracers interpolation and update
+
+   INTEGER, PUBLIC :: ts_interp_id, ts_update_id                              ! AGRIF profile for tracers interpolation and update
    INTEGER, PUBLIC :: un_interp_id, vn_interp_id                              ! AGRIF profiles for interpolations
    INTEGER, PUBLIC :: un_update_id, vn_update_id                              ! AGRIF profiles for udpates
-   INTEGER, PUBLIC :: tsn_sponge_id, un_sponge_id, vn_sponge_id               ! AGRIF profiles for sponge layers
+   INTEGER, PUBLIC :: ts_sponge_id, un_sponge_id, vn_sponge_id                ! AGRIF profiles for sponge layers (3d)
+   INTEGER, PUBLIC :: unb_sponge_id, vnb_sponge_id                            ! AGRIF profiles for sponge layers (2d)
    INTEGER, PUBLIC :: tsini_id, uini_id, vini_id, sshini_id                   ! AGRIF profile for initialization
 # if defined key_top
    INTEGER, PUBLIC :: trn_id, trn_sponge_id
 # endif  
-   INTEGER, PUBLIC :: unb_id, vnb_id, ub2b_interp_id, vb2b_interp_id
-   INTEGER, PUBLIC :: ub2b_update_id, vb2b_update_id
-   INTEGER, PUBLIC :: e3t_id, e1u_id, e2v_id, sshn_id
+   INTEGER, PUBLIC :: unb_interp_id, vnb_interp_id, ub2b_interp_id, vb2b_interp_id
+   INTEGER, PUBLIC :: ub2b_update_id, vb2b_update_id, unb_update_id, vnb_update_id
+   INTEGER, PUBLIC :: ub2b_cor_id, vb2b_cor_id
+   INTEGER, PUBLIC :: e3t_id, sshn_id
    INTEGER, PUBLIC :: scales_t_id
    INTEGER, PUBLIC :: avt_id, avm_id, en_id                ! TKE related identificators
-   INTEGER, PUBLIC :: mbkt_id, ht0_id
+   INTEGER, PUBLIC :: mbkt_id, ht0_id, e3t0_interp_id
    INTEGER, PUBLIC :: glamt_id, gphit_id
+   INTEGER, PUBLIC :: batupd_id
    INTEGER, PUBLIC :: kindic_agr
 
@@ -74 +83 @@
 !$AGRIF_DO_NOT_TREAT
    LOGICAL, PUBLIC :: use_sign_north
-   REAL, PUBLIC :: sign_north
+   REAL, PUBLIC    :: sign_north
    LOGICAL, PUBLIC :: l_ini_child = .FALSE.
-# if defined key_vertical
-   LOGICAL, PUBLIC :: l_vremap    = .TRUE.
-# else
    LOGICAL, PUBLIC :: l_vremap    = .FALSE.
-# endif
 !$AGRIF_END_DO_NOT_TREAT
    
@@ -100 +105 @@
       ALLOCATE( fspu(jpi,jpj), fspv(jpi,jpj),          &
          &      fspt(jpi,jpj), fspf(jpi,jpj),               &
+         &      fspu_2d(jpi,jpj), fspv_2d(jpi,jpj),         &
+         &      fspt_2d(jpi,jpj), fspf_2d(jpi,jpj),         &
          &      tabspongedone_tsn(jpi,jpj),                 &
          &      utint_stage(jpi,jpj), vtint_stage(jpi,jpj), &
@@ -116 +123 @@
       !
    END FUNCTION agrif_oce_alloc
-
 #endif
    !!======================================================================