Changeset 8841 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/TOP_SRC/trc.F90

Timestamp:

2017-11-29T05:08:05+01:00 (6 years ago)

Author:

deazer

Message:

Bring in Trunk Changes at version 8814
This revision wont run as is, requires next revision with merged changes
This revision serves as a reference point to what changes from the trunk at brought in by the merge
in the next revision

File:

• branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) (4 diffs)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/TOP_SRC/trc.F90

@@ -8 +8 @@
    !!   NEMO      1.0  !  2004-03  (C. Ethe)  Free form and module
    !!----------------------------------------------------------------------
-#if defined key_top
-   !!----------------------------------------------------------------------
-   !!   'key_top'                                                TOP models
-   !!----------------------------------------------------------------------
    USE par_oce
    USE par_trc
-   USE bdy_oce, only: ln_bdy, nb_bdy, OBC_DATA
+   USE bdy_oce, only: jp_bdy, ln_bdy, nb_bdy, OBC_DATA
    
    IMPLICIT NONE
@@ -173 +169 @@
 # endif
    !
-   CHARACTER(len=20), PUBLIC, ALLOCATABLE,  SAVE,  DIMENSION(:)   ::  cn_trc_dflt          ! Default OBC condition for all tracers
-   CHARACTER(len=20), PUBLIC, ALLOCATABLE,  SAVE,  DIMENSION(:)   ::  cn_trc               ! Choice of boundary condition for tracers
-   INTEGER,           PUBLIC, ALLOCATABLE,  SAVE,  DIMENSION(:)   ::  nn_trcdmp_bdy        !: =T Tracer damping
+   CHARACTER(len=20), PUBLIC, DIMENSION(jp_bdy) :: cn_trc_dflt   ! Default OBC condition for all tracers
+   CHARACTER(len=20), PUBLIC, DIMENSION(jp_bdy) :: cn_trc        ! Choice of boundary condition for tracers
+   INTEGER,           PUBLIC, DIMENSION(jp_bdy) :: nn_trcdmp_bdy !: =T Tracer damping
+!$AGRIF_DO_NOT_TREAT
    ! External data structure of BDY for TOP. Available elements: cn_obc, ll_trc, trcnow, dmp
    TYPE(OBC_DATA),    PUBLIC, ALLOCATABLE, DIMENSION(:,:), TARGET ::  trcdta_bdy           !: bdy external data (local process)
-   !
-
+!$AGRIF_END_DO_NOT_TREAT
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3.1 , NEMO Consortium (2010)
@@ -210 +206 @@
       !
       IF ( ln_bdy ) THEN
-         ALLOCATE( cn_trc_dflt(nb_bdy)   , cn_trc(nb_bdy)     , nn_trcdmp_bdy(nb_bdy) ,       &
-         &      trcdta_bdy(jptra,nb_bdy)                                              ,       &
-         &      STAT = ierr(2)  )
+         ALLOCATE( trcdta_bdy(jptra, jp_bdy), STAT = ierr(2) )
       ENDIF
       !
@@ -224 +218 @@
    END FUNCTION trc_alloc
 
-#else
-   !!----------------------------------------------------------------------
-   !!  Empty module :                                     No passive tracer
-   !!----------------------------------------------------------------------
-#endif
-
    !!======================================================================
 END MODULE trc