Changeset 8003 for branches/CNRS/dev_r6270_PISCES_QUOTA/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90

Timestamp:

2017-05-09T12:14:45+02:00 (7 years ago)

Author:

aumont

Message:

modification in the code to remove unnecessary parts such as kriest and non iomput options

File:

• branches/CNRS/dev_r6270_PISCES_QUOTA/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified) (5 diffs)

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

@@ -38 +38 @@
 #elif defined key_pisces
    !!---------------------------------------------------------------------
-   !!   'key_pisces' & 'key_kriest'                 PISCES bio-model + ???
+   !!   'key_pisces'                                PISCES bio-model + ???
    !!---------------------------------------------------------------------
    LOGICAL, PUBLIC, PARAMETER ::   lk_pisces      = .TRUE.  !: PISCES flag 
    INTEGER, PUBLIC, PARAMETER ::   nn_p4z         =  2      !: p4z flag 
-#  if defined key_kriest
-   LOGICAL, PUBLIC, PARAMETER ::   lk_kriest      = .TRUE.  !: Kriest flag 
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest      =  1 
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest_diag =  7
-#  else
-   LOGICAL, PUBLIC, PARAMETER ::   lk_kriest      = .FALSE.  !: Kriest flag 
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest      =  2 
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest_diag =  0
-#  endif
 #  if defined key_ligand
    LOGICAL, PUBLIC, PARAMETER ::   lk_ligand      = .TRUE.  !: Kriest flag 
@@ -60 +51 @@
    INTEGER, PUBLIC, PARAMETER ::   jp_ligand_diag =  0
 #  endif
-   INTEGER, PUBLIC, PARAMETER ::   jp_pisces      =  22 + jp_kriest + jp_ligand            !: number of passive tracers
+   INTEGER, PUBLIC, PARAMETER ::   jp_pisces      =  24 + jp_ligand            !: number of passive tracers
    INTEGER, PUBLIC, PARAMETER ::   jp_pisces_2d   =  13                                    !: additional 2d output 
-   INTEGER, PUBLIC, PARAMETER ::   jp_pisces_3d   =  13 + jp_kriest_diag + jp_ligand_diag  !: additional 3d output 
+   INTEGER, PUBLIC, PARAMETER ::   jp_pisces_3d   =  13 + jp_ligand_diag  !: additional 3d output 
    INTEGER, PUBLIC, PARAMETER ::   jp_pisces_trd  =   1                                    !: number of sms trends for PISCES
 
@@ -90 +81 @@
    INTEGER, PUBLIC, PARAMETER ::   jpno3 = 21    !: Nitrates Concentration
    INTEGER, PUBLIC, PARAMETER ::   jpnh4 = 22    !: Ammonium Concentration
-#  if defined key_kriest
-   INTEGER, PUBLIC, PARAMETER ::   jpnum = 23    !: Number of particles in the aggregates
-#  else
    INTEGER, PUBLIC, PARAMETER ::   jpgoc = 23    !: Big OM particles Concentration
    INTEGER, PUBLIC, PARAMETER ::   jpbfe = 24    !: Big iron particles Concentration
-#  endif
 #  if defined key_ligand
-   INTEGER, PUBLIC, PARAMETER ::   jplgw = 22 + jp_kriest + 1    !: Weak Ligands
-   INTEGER, PUBLIC, PARAMETER ::   jpfep = 22 + jp_kriest + 2    !: Fe nanoparticle
+   INTEGER, PUBLIC, PARAMETER ::   jplgw = 24 + 1    !: Weak Ligands
+   INTEGER, PUBLIC, PARAMETER ::   jpfep = 24 + 2    !: Fe nanoparticle
 #  endif
 
 #elif defined key_pisces_quota 
    !!---------------------------------------------------------------------
-   !!   'key_pisces' & 'key_kriest'                 PISCES bio-model + ???
+   !!   'key_pisces'                                PISCES bio-model + ???
    !!---------------------------------------------------------------------
    LOGICAL, PUBLIC, PARAMETER ::   lk_pisces     = .TRUE.  !: PISCES flag 
    INTEGER, PUBLIC, PARAMETER ::   nn_p4z        =  3  !: p4z flag 
-#  if defined key_kriest
-   LOGICAL, PUBLIC, PARAMETER ::   lk_kriest     = .TRUE. !: Kriest flag 
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest      =  1
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest_diag =  7
-#  else
-   LOGICAL, PUBLIC, PARAMETER ::   lk_kriest     = .FALSE. !: Kriest flag 
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest      =  4
-   INTEGER, PUBLIC, PARAMETER ::   jp_kriest_diag =  7
-#  endif
 #  if defined key_ligand
    LOGICAL, PUBLIC, PARAMETER ::   lk_ligand      = .TRUE.  !: Kriest flag 
@@ -125 +103 @@
    INTEGER, PUBLIC, PARAMETER ::   jp_ligand_diag =  0
 #  endif
-   INTEGER, PUBLIC, PARAMETER ::   jp_pisces      =  35 + jp_kriest + jp_ligand            !: number of passive tracers
+   INTEGER, PUBLIC, PARAMETER ::   jp_pisces      =  39 + jp_ligand            !: number of passive tracers
    INTEGER, PUBLIC, PARAMETER ::   jp_pisces_2d   =  13     !: additional 2d output 
-   INTEGER, PUBLIC, PARAMETER ::   jp_pisces_3d   =  13 + jp_kriest_diag + jp_ligand_diag  !: additional 3d output 
+   INTEGER, PUBLIC, PARAMETER ::   jp_pisces_3d   =  20 + jp_ligand_diag  !: additional 3d output 
    INTEGER, PUBLIC, PARAMETER ::   jp_pisces_trd  =   1     !: number of sms trends for PISCES
 
@@ -168 +146 @@
    INTEGER, PUBLIC, PARAMETER ::   jppfe = 34    !: small particulate organic phosphorus concentration
    INTEGER, PUBLIC, PARAMETER ::   jppch = 35    !: small particulate organic phosphorus concentration
-#  if defined key_kriest
-   INTEGER, PUBLIC, PARAMETER ::   jpnum = 36    !: Number of particles in the aggregates
-#  else
    INTEGER, PUBLIC, PARAMETER ::   jpgoc = 36    !: Big carbon particles Concentration
    INTEGER, PUBLIC, PARAMETER ::   jpgon = 37    !: Big nitrogen particles Concentration
    INTEGER, PUBLIC, PARAMETER ::   jpgop = 38    !: Big phosphorus particles Concentration
    INTEGER, PUBLIC, PARAMETER ::   jpbfe = 39    !: Big iron particles Concentration
-#  endif
 #  if defined key_ligand
-   INTEGER, PUBLIC, PARAMETER ::   jplgw = 35 + jp_kriest + 1    !: Weak Ligands
-   INTEGER, PUBLIC, PARAMETER ::   jpfep = 35 + jp_kriest + 2    !: Fe nanoparticle
+   INTEGER, PUBLIC, PARAMETER ::   jplgw = 39 + 1    !: Weak Ligands
+   INTEGER, PUBLIC, PARAMETER ::   jpfep = 39 + 2    !: Fe nanoparticle
 #  endif