Changeset 8317 for branches/UKMO/dev_r5518_GO6M_StableTo6959/NEMOGCM/CONFIG/SHARED/namelist_pisces_ref

Timestamp:

2017-07-11T14:34:04+02:00 (7 years ago)

Author:

frrh

Message:

Merge in required revisions using command:

svn merge -r 6820:6959 \u200bsvn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/nemo_v3_6_STABLE

followed by running fcm conflicts and resolving a number of issues manually.

File:

• branches/UKMO/dev_r5518_GO6M_StableTo6959/NEMOGCM/CONFIG/SHARED/namelist_pisces_ref (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6M_StableTo6959/NEMOGCM/CONFIG/SHARED/namelist_pisces_ref

@@ -66 +66 @@
    qdfelim    =  7.E-6    ! Optimal quota of diatoms
    caco3r     =  0.3      ! mean rain ratio
+   oxymin    =  1.E-6     ! Half-saturation constant for anoxia
 /
 !'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
@@ -162 +163 @@
    xsiremlab =  0.03      ! fast remineralization rate of Si
    xsilab    =  0.5       ! Fraction of labile biogenic silica
-   oxymin    =  1.E-6     ! Half-saturation constant for anoxia
 /
 !'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''