Changeset 4789 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90

Timestamp:

2014-09-25T18:26:34+02:00 (10 years ago)

Author:

rblod

Message:

dev_r4765_CNRS_agrif: First update of AGRIF for dynamic only (_flt and _ts), see ticket #1380 and associated wiki page

File:

• branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) (5 diffs)

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90

@@ -12 +12 @@
    USE par_oce      ! ocean parameters
    USE dom_oce      ! domain parameters
-   
+
    IMPLICIT NONE
    PRIVATE 
@@ -23 +23 @@
    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_chk_bathy  = .FALSE.   !: check of parent bathymetry 
+   LOGICAL , PUBLIC ::   ln_agrif_tke  = .FALSE.   !: interp/extrap for TKE
 
    !                                              !!! OLD namelist names
@@ -34 +36 @@
    LOGICAL , PUBLIC :: lk_agrif_fstep = .TRUE. !: if true: first step
 
-   LOGICAL , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tabspongedone
+   LOGICAL , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tabspongedone_tsn
+# if defined key_top
+   LOGICAL , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tabspongedone_trn
+# endif
    LOGICAL , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tabspongedone_u
    LOGICAL , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tabspongedone_v
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE,  DIMENSION(:,:) ::   spe1ur , spe2vr , spbtr2   !: ???
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE,  DIMENSION(:,:) ::   spe1ur2, spe2vr2, spbtr3   !: ???
-# if defined key_dynspg_ts
    ! Barotropic arrays used to store open boundary data during
    ! time-splitting loop:
@@ -46 +50 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:) ::  ubdy_n, vbdy_n, hbdy_n
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:) ::  ubdy_s, vbdy_s, hbdy_s
-# endif  
- 
+
    INTEGER :: tsn_id                                                  ! AGRIF profile for tracers interpolation and update
    INTEGER :: un_interp_id, vn_interp_id                              ! AGRIF profiles for interpolations
    INTEGER :: un_update_id, vn_update_id                              ! AGRIF profiles for udpates
    INTEGER :: tsn_sponge_id, un_sponge_id, vn_sponge_id               ! AGRIF profiles for sponge layers
-   INTEGER :: trn_id
+# if defined key_top
+   INTEGER :: trn_id, trn_sponge_id
+# endif  
    INTEGER :: unb_id, vnb_id, ub2b_interp_id, vb2b_interp_id
    INTEGER :: ub2b_update_id, vb2b_update_id
    INTEGER :: e3t_id, e1u_id, e2v_id, sshn_id
    INTEGER :: scales_t_id
+   INTEGER :: avt_id, avm_id, avmu_id, avmv_id
 
    !!----------------------------------------------------------------------
@@ -73 +79 @@
       ierr(:) = 0
       !
-      ALLOCATE( spe1ur         (jpi,jpj), spe2vr         (jpi,jpj),   &
-         &      spbtr2         (jpi,jpj), spe1ur2        (jpi,jpj),   &
-         &      spe2vr2        (jpi,jpj), spbtr3         (jpi,jpj),   &
-         &      tabspongedone  (jpi,jpj), tabspongedone_u(jpi,jpj),   &
-         &      tabspongedone_v(jpi,jpj), STAT = ierr(1) )
+      ALLOCATE( spe1ur (jpi,jpj), spe2vr (jpi,jpj),   &
+         &      spbtr2 (jpi,jpj), spe1ur2(jpi,jpj),   &
+         &      spe2vr2(jpi,jpj), spbtr3(jpi,jpj),    &
+         &      tabspongedone_tsn(jpi,jpj),           &
+# if defined key_top         
+         &      tabspongedone_trn(jpi,jpj),           &
+# endif         
+         &      tabspongedone_u  (jpi,jpj),           &
+         &      tabspongedone_v  (jpi,jpj), STAT = ierr(1) )
 
-# if defined key_dynspg_ts
       ALLOCATE( ubdy_w(jpj), vbdy_w(jpj), hbdy_w(jpj),   &
          &      ubdy_e(jpj), vbdy_e(jpj), hbdy_e(jpj),   & 
          &      ubdy_n(jpi), vbdy_n(jpi), hbdy_n(jpi),   & 
          &      ubdy_s(jpi), vbdy_s(jpi), hbdy_s(jpi), STAT = ierr(2) )
-# endif
+
       agrif_oce_alloc = MAXVAL(ierr)
       !