Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/TOP/PISCES/SED/par_sed.F90

Timestamp:

2021-11-28T18:59:49+01:00 (3 years ago)

Author:

gsamson

Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

Files:

• . (modified) (1 prop)
• src/TOP/PISCES/SED/par_sed.F90 (modified) (2 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/TOP/PISCES/SED/par_sed.F90

@@ -14 +14 @@
       jpi      =>   jpi   ,  & !: first  dimension of grid --> i
       jpj      =>   jpj   ,  & !: second dimension of grid --> j
-      jpim1    =>   jpim1 ,  & !: jpi - 1
-      jpjm1    =>   jpjm1 ,  & !: jpj - 1
       jpij     =>   jpij  ,  & !: jpi x jpj
       jp_tem   =>   jp_tem,  & !: indice of temperature
       jp_sal   =>   jp_sal     !: indice of salintity
 
-   INTEGER, PUBLIC, PARAMETER :: jpdta = 17
+   INTEGER, PARAMETER :: jpdta = 18
 
    ! Vertical sediment geometry
-   INTEGER, PUBLIC  :: jpksed  = 11 
-   INTEGER, PUBLIC  :: jpksedm1 
+   INTEGER, PUBLIC   ::      &
+      jpksed   = 11 ,        &
+      jpksedm1 = 10
 
    ! sediment tracer species
-   INTEGER, PUBLIC, PARAMETER ::    &
+   INTEGER, PARAMETER ::    &
       jpsol =  8,           &  !: number of solid component
-      jpwat = 10,           &   !: number of pore water component
+      jpwat = 11,           &   !: number of pore water component
+      jpads = 2 ,           &   !! number adsorbed species
       jpwatp1 = jpwat +1,   &
       jpsol1 = jpsol - 1
@@ -35 +35 @@
    
    ! pore water components       
-   INTEGER, PUBLIC, PARAMETER :: &
-      jwsil  = 1,        & !: silic acid
-      jwoxy  = 2,        & !: oxygen
-      jwdic  = 3,        & !: dissolved inorganic carbon
-      jwno3  = 4,        & !: nitrate
-      jwpo4  = 5,        & !: phosphate
-      jwalk  = 6,        & !: alkalinity
-      jwnh4  = 7,        & !: Ammonium
-      jwh2s  = 8,        & !: Sulfate
-      jwso4  = 9,        & !: H2S
-      jwfe2  = 10          !: Fe2+
+   INTEGER, PARAMETER :: &
+      jwoxy  = 1,        & !: oxygen
+      jwno3  = 2,        & !: nitrate
+      jwpo4  = 3,        & !: phosphate
+      jwnh4  = 4,        & !: Ammonium
+      jwh2s  = 5,        & !: Sulfate
+      jwso4  = 6,        & !: H2S
+      jwfe2  = 7,        & !: Fe2+
+      jwalk  = 8,        & !: Alkalinity
+      jwlgw  = 9,        & !: Alkalinity
+      jwdic  = 10,       & !: DIC
+      jwsil  = 11          !: Silicate
 
    ! solid components       
-   INTEGER, PUBLIC, PARAMETER ::  &
-      jsopal  = 1,        & !: opal sediment
-      jsclay  = 2,        & !: clay
+   INTEGER, PARAMETER ::  &
+      jsfeo   = 1,        & !: iron hydroxides
+      jsfes   = 2,        & !: FeS
       jspoc   = 3,        & !: organic carbon
-      jscal   = 4,        & !: calcite
-      jspos   = 5,        & !: semi-ref POC
-      jspor   = 6,        & !: refractory POC
-      jsfeo   = 7,        & !: iron hydroxides
-      jsfes   = 8           !: FeS
+      jspos   = 4,        & !: semi-ref POC
+      jspor   = 5,        & !: refractory POC
+      jscal   = 6,        & !: Calcite
+      jsopal  = 7,        & !: Opal
+      jsclay  = 8           !: clay
 
-   INTEGER, PUBLIC, PARAMETER ::  &
+   INTEGER, PARAMETER ::  &
       jptrased   = jpsol + jpwat , &
-      jpdia3dsed = 2             , &
-      jpdia2dsed = 12
+      jpvode     = jptrased - 11  , &
+      jpdia3dsed = 3             , &
+      jpdia2dsed = 22 
 
 END MODULE par_sed

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+