Changeset 10156 for branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/trc.F90

Timestamp:

2018-09-25T13:10:14+02:00 (6 years ago)

Author:

dford

Message:

Apply patch fabm_patch_e3284ca_889163b.diff from Jim Clark.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) (5 diffs)

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

@@ -14 +14 @@
    USE par_oce
    USE par_trc
+#if defined key_bdy
+   USE bdy_oce, only: nb_bdy, OBC_DATA
+#endif
    
    IMPLICIT NONE
@@ -80 +83 @@
    END TYPE
 
-   REAL(wp), DIMENSION(jptra), PUBLIC         :: trc_ice_ratio, & ! ice-ocean tracer ratio
+   ! --->>> FABM 
+   !REAL(wp), DIMENSION(jptra), PUBLIC         :: trc_ice_ratio, & ! ice-ocean tracer ratio
+   !                                              trc_ice_prescr   ! prescribed ice trc cc
+   !CHARACTER(len=2), DIMENSION(jptra), PUBLIC :: cn_trc_o ! choice of ocean tracer cc
+   ! FABM <<<---
+   ! +++>>> FABM 
+   REAL(wp), DIMENSION(jpmaxtrc), PUBLIC         :: trc_ice_ratio, & ! ice-ocean tracer ratio
                                                  trc_ice_prescr   ! prescribed ice trc cc
-   CHARACTER(len=2), DIMENSION(jptra), PUBLIC :: cn_trc_o ! choice of ocean tracer cc
+   CHARACTER(len=2), DIMENSION(jpmaxtrc), PUBLIC :: cn_trc_o ! choice of ocean tracer cc
+   ! FABM <<<+++
 
    !! information for outputs
@@ -90 +100 @@
        CHARACTER(len = 80)  :: cllname  !: long name
        CHARACTER(len = 20)  :: clunit   !: unit
-       LOGICAL              :: llinit   !: read in a file or not
-       LOGICAL              :: llsave   !: save the tracer or not
+! --->>> FABM
+!       LOGICAL              :: llinit   !: read in a file or not
+!!#if defined  key_my_trc
+!       LOGICAL              :: llsbc   !: read in a file or not
+!       LOGICAL              :: llcbc   !: read in a file or not
+!       LOGICAL              :: llobc   !: read in a file or not
+!#endif
+!       LOGICAL              :: llsave   !: save the tracer or not
+! FABM <<<---
+! +++ FABM
+       LOGICAL              :: llinit=.FALSE.   !: read in a file or not
+#if defined  key_fabm
+       LOGICAL              :: llsbc=.FALSE.   !: read in a file or not
+       LOGICAL              :: llcbc=.FALSE.   !: read in a file or not
+       LOGICAL              :: llobc=.FALSE.   !: read in a file or not
+#endif
+       LOGICAL              :: llsave=.FALSE.   !: save the tracer or not
+! FABM <<<+++
    END TYPE PTRACER
    CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:)    ::  ctrcnm         !: tracer name 
@@ -191 +217 @@
 # endif
    !
+#if defined key_bdy
+   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
+   ! 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)
+#endif
 
    !!----------------------------------------------------------------------
@@ -213 +246 @@
          &      cvol(jpi,jpj,jpk)     , rdttrc(jpk)           , trai(jptra)           ,       &
          &      ctrcnm(jptra)         , ctrcln(jptra)         , ctrcun(jptra)         ,       & 
+! --->>> FABM
+!!#if defined key_my_trc
+! FABM <<<---
+! +++>>> FABM
+#if defined key_fabm
+! FABM <<<+++
+         &      ln_trc_sbc(jptra)     , ln_trc_cbc(jptra)     , ln_trc_obc(jptra)     ,       &
+#endif
+#if defined key_bdy
+         &      cn_trc_dflt(nb_bdy)   , cn_trc(nb_bdy)        , nn_trcdmp_bdy(nb_bdy) ,       &
+         &      trcdta_bdy(jptra,nb_bdy)                                              ,       &
+#endif
          &      ln_trc_ini(jptra)     , ln_trc_wri(jptra)     , qsr_mean(jpi,jpj)     ,  STAT = trc_alloc  )