Changeset 8359 for branches/UKMO

Timestamp:

2017-07-21T17:56:15+02:00 (7 years ago)

Author:

dford

Message:

Changes for running with a variable number of passive tracers.

Location:

branches/UKMO/dev_r5518_passive_tracers_foam/NEMOGCM

Files:

• CONFIG/SHARED/field_def_ptracer.xml (added)
• NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_passive_tracers_foam/NEMOGCM/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90

@@ -27 +27 @@
    IMPLICIT NONE
 
+#if defined key_medusa
+   INTEGER, PARAMETER ::   jp_lm      =  jp_pisces     + jp_cfc     + jp_c14b     + jp_medusa     !: 
+   INTEGER, PARAMETER ::   jp_lm_2d   =  jp_pisces_2d  + jp_cfc_2d  + jp_c14b_2d  + jp_medusa_2d  !:
+   INTEGER, PARAMETER ::   jp_lm_3d   =  jp_pisces_3d  + jp_cfc_3d  + jp_c14b_3d  + jp_medusa_3d  !:
+   INTEGER, PARAMETER ::   jp_lm_trd  =  jp_pisces_trd + jp_cfc_trd + jp_c14b_trd + jp_medusa_trd !:
+#else
    INTEGER, PARAMETER ::   jp_lm      =  jp_pisces     + jp_cfc     + jp_c14b     !: 
    INTEGER, PARAMETER ::   jp_lm_2d   =  jp_pisces_2d  + jp_cfc_2d  + jp_c14b_2d  !:
    INTEGER, PARAMETER ::   jp_lm_3d   =  jp_pisces_3d  + jp_cfc_3d  + jp_c14b_3d  !:
    INTEGER, PARAMETER ::   jp_lm_trd  =  jp_pisces_trd + jp_cfc_trd + jp_c14b_trd !:
+#endif
 
 #if defined key_my_trc
@@ -37 +44 @@
    !!---------------------------------------------------------------------
    LOGICAL, PUBLIC, PARAMETER ::   lk_my_trc     = .TRUE.   !: PTS flag 
+#if defined NUM_PTRACERS
+   INTEGER, PUBLIC, PARAMETER ::   jp_my_trc     =  NUM_PTRACERS       !: number of PTS tracers
+#else
    INTEGER, PUBLIC, PARAMETER ::   jp_my_trc     =  1       !: number of PTS tracers
+#endif
    INTEGER, PUBLIC, PARAMETER ::   jp_my_trc_2d  =  0       !: additional 2d output arrays ('key_trc_diaadd')
    INTEGER, PUBLIC, PARAMETER ::   jp_my_trc_3d  =  0       !: additional 3d output arrays ('key_trc_diaadd')