Changeset 6453 for branches/CNRS/dev_r6270_PISCES_QUOTA/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90

Timestamp:

2016-04-08T10:10:11+02:00 (8 years ago)

Author:

aumont

Message:

New developments of PISCES (QUOTA, ligands, lability, ...)

File:

• branches/CNRS/dev_r6270_PISCES_QUOTA/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) (3 diffs)

branches/CNRS/dev_r6270_PISCES_QUOTA/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90

@@ -8 +8 @@
    !!             1.0  !  2003-08 (C. Ethe)  module F90
    !!             2.0  !  2007-12  (C. Ethe, G. Madec) from trcnam.pisces.h90
+   !!             3.6  !  2015-05  (O. Aumont) PISCES quota
    !!----------------------------------------------------------------------
-#if defined key_pisces || defined key_pisces_reduced
+#if defined key_pisces || defined key_pisces_reduced || defined key_pisces_quota
    !!----------------------------------------------------------------------
-   !!   'key_pisces'   :                                   PISCES bio-model
+   !!   'key_pisces*'  :                                   PISCES bio-model
    !!----------------------------------------------------------------------
    !! trc_nam_pisces       : PISCES model namelist read
@@ -66 +67 @@
 #if defined key_pisces
       IF(lwp) WRITE(numout,*) ' trc_nam_pisces : read PISCES namelist'
+#elif defined key_pisces_quota
+      IF(lwp) WRITE(numout,*) ' trc_nam_pisces : read PISCES-QUOTA namelist'
 #else
       IF(lwp) WRITE(numout,*) ' trc_nam_pisces : read LOBSTER namelist'
@@ -123 +126 @@
 #if defined key_pisces_reduced
 
-      IF( ( .NOT.lk_iomput .AND. ln_diabio ) .OR. lk_trdmxl_trc ) THEN
+      IF( ( .NOT.lk_iomput .AND. ln_diabio ) .OR. lk_trdmld_trc ) THEN
          !
          ! Namelist nampisdbi