Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
GOSI9esm
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Consortium Members
UKMO
GOSI
GOSI9esm
Commits
bbe9e41d
You need to sign in or sign up before continuing.
Commit
bbe9e41d
authored
2 years ago
by
Renaud Person
Committed by
Sebastien Masson
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "Bug fix for 2-way exchange between sediment and biogeochemical fields in PISCES"
parent
6a23eec1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/TOP/PISCES/P4Z/p4zsed.F90
+10
-10
10 additions, 10 deletions
src/TOP/PISCES/P4Z/p4zsed.F90
src/TOP/PISCES/SED/sedsfc.F90
+4
-3
4 additions, 3 deletions
src/TOP/PISCES/SED/sedsfc.F90
with
14 additions
and
13 deletions
src/TOP/PISCES/P4Z/p4zsed.F90
+
10
−
10
View file @
bbe9e41d
...
...
@@ -90,16 +90,16 @@ CONTAINS
zsedcal
(:,:)
=
0.e0
zsedc
(:,:)
=
0.e0
IF
(
.NOT.
lk_sed
)
THEN
! OA: Warning, the following part is necessary to avoid CFL problems above the sediments
! --------------------------------------------------------------------
DO_2D
(
nn_hls
,
nn_hls
,
nn_hls
,
nn_hls
)
ikt
=
mbkt
(
ji
,
jj
)
zdep
=
e3t
(
ji
,
jj
,
ikt
,
Kmm
)
/
xstep
zwsbio4
(
ji
,
jj
)
=
MIN
(
0.99
*
zdep
,
wsbio4
(
ji
,
jj
,
ikt
)
)
zwsbio3
(
ji
,
jj
)
=
MIN
(
0.99
*
zdep
,
wsbio3
(
ji
,
jj
,
ikt
)
)
END_2D
! OA: Warning, the following part is necessary to avoid CFL problems above the sediments
! --------------------------------------------------------------------
DO_2D
(
nn_hls
,
nn_hls
,
nn_hls
,
nn_hls
)
ikt
=
mbkt
(
ji
,
jj
)
zdep
=
e3t
(
ji
,
jj
,
ikt
,
Kmm
)
/
xstep
zwsbio4
(
ji
,
jj
)
=
MIN
(
0.99
*
zdep
,
wsbio4
(
ji
,
jj
,
ikt
)
)
zwsbio3
(
ji
,
jj
)
=
MIN
(
0.99
*
zdep
,
wsbio3
(
ji
,
jj
,
ikt
)
)
END_2D
IF
(
.NOT.
lk_sed
)
THEN
! Computation of the sediment denitrification proportion: The metamodel from midlleburg (2006) is being used
! Computation of the fraction of organic matter that is permanently buried from Dunne's model
! -------------------------------------------------------
...
...
@@ -226,7 +226,7 @@ CONTAINS
DO_3D
(
nn_hls
,
nn_hls
,
nn_hls
,
nn_hls
,
1
,
jpkm1
)
! ! Potential nitrogen fixation dependant on temperature and iron
ztemp
=
ts
(
ji
,
jj
,
jk
,
jp_tem
,
Kmm
)
zmudia
=
MAX
(
0.
,
-0.001096
*
ztemp
**
2
+
0.057
*
ztemp
-0.637
)
*
7.625
zmudia
=
MAX
(
0.
,
-0.001096
*
ztemp
**
2
+
0.057
*
ztemp
-0.637
)
/
rno3
! Potential nitrogen fixation dependant on temperature and iron
xdianh4
=
tr
(
ji
,
jj
,
jk
,
jpnh4
,
Kbb
)
/
(
concnnh4
+
tr
(
ji
,
jj
,
jk
,
jpnh4
,
Kbb
)
)
xdiano3
=
tr
(
ji
,
jj
,
jk
,
jpno3
,
Kbb
)
/
(
concnno3
+
tr
(
ji
,
jj
,
jk
,
jpno3
,
Kbb
)
)
*
(
1.
-
xdianh4
)
...
...
This diff is collapsed.
Click to expand it.
src/TOP/PISCES/SED/sedsfc.F90
+
4
−
3
View file @
bbe9e41d
...
...
@@ -5,6 +5,7 @@ MODULE sedsfc
!!=====================================================================
!! * Modules used
USE
sed
! sediment global variable
USE
sedini
USE
sedarr
USE
seddta
...
...
@@ -53,11 +54,11 @@ CONTAINS
IF
(
tmask
(
ji
,
jj
,
ikt
)
==
1
)
THEN
tr
(
ji
,
jj
,
ikt
,
jptal
,
Kbb
)
=
trc_data
(
ji
,
jj
,
1
)
tr
(
ji
,
jj
,
ikt
,
jpdic
,
Kbb
)
=
trc_data
(
ji
,
jj
,
2
)
tr
(
ji
,
jj
,
ikt
,
jpno3
,
Kbb
)
=
trc_data
(
ji
,
jj
,
3
)
*
7.625
tr
(
ji
,
jj
,
ikt
,
jppo4
,
Kbb
)
=
trc_data
(
ji
,
jj
,
4
)
*
122.
tr
(
ji
,
jj
,
ikt
,
jpno3
,
Kbb
)
=
trc_data
(
ji
,
jj
,
3
)
*
redC
/
redNo3
tr
(
ji
,
jj
,
ikt
,
jppo4
,
Kbb
)
=
trc_data
(
ji
,
jj
,
4
)
*
redC
tr
(
ji
,
jj
,
ikt
,
jpoxy
,
Kbb
)
=
trc_data
(
ji
,
jj
,
5
)
tr
(
ji
,
jj
,
ikt
,
jpsil
,
Kbb
)
=
trc_data
(
ji
,
jj
,
6
)
tr
(
ji
,
jj
,
ikt
,
jpnh4
,
Kbb
)
=
trc_data
(
ji
,
jj
,
7
)
*
7.625
tr
(
ji
,
jj
,
ikt
,
jpnh4
,
Kbb
)
=
trc_data
(
ji
,
jj
,
7
)
*
redC
/
redNo3
tr
(
ji
,
jj
,
ikt
,
jpfer
,
Kbb
)
=
trc_data
(
ji
,
jj
,
8
)
ENDIF
END_2D
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment