Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gotm_ismer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Dany Dumont
gotm_ismer
Commits
4bbaec20
Commit
4bbaec20
authored
Mar 04, 2011
by
dumoda01
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correction d''un bogue qui empechait de rouler sans la biologie
parent
9538a482
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
2 deletions
+25
-2
src/gotm/gotm.F90
src/gotm/gotm.F90
+10
-0
src/meanflow/ammonium.F90
src/meanflow/ammonium.F90
+3
-1
src/meanflow/nitrate.F90
src/meanflow/nitrate.F90
+3
-1
src/observations/observations.F90
src/observations/observations.F90
+9
-0
No files found.
src/gotm/gotm.F90
View file @
4bbaec20
...
...
@@ -365,7 +365,9 @@
! (see \sect{sec:extra}).
!
! !USES:
#ifdef BIO
use
bio_var
,
only
:
numcc
,
cc
!CHG3
#endif
IMPLICIT
NONE
!
...
...
@@ -431,12 +433,20 @@
! update nitrate !CHG3
if
(
n_prof_method
.ne.
0
)
then
#ifdef BIO
call
nitrate
(
nlev
,
dt
,
cnpar
,
nus
,
gams
,
cc
)
#else
call
nitrate
(
nlev
,
dt
,
cnpar
,
nus
,
gams
)
#endif
endif
! update ammonium !CHG5
if
(
a_prof_method
.ne.
0
)
then
#ifdef BIO
call
ammonium
(
nlev
,
dt
,
cnpar
,
nus
,
gams
,
cc
)
#else
call
ammonium
(
nlev
,
dt
,
cnpar
,
nus
,
gams
)
#endif
endif
! update shear and stratification
...
...
src/meanflow/ammonium.F90
View file @
4bbaec20
...
...
@@ -94,7 +94,7 @@
REALTYPE
,
intent
(
in
)
::
gams
(
0
:
nlev
)
! nitrate concentration after bio loop
REALTYPE
,
intent
(
in
)
::
cc
(
1
:
7
,
0
:
nlev
)
!CHG3
REALTYPE
,
intent
(
in
)
,
optional
::
cc
(
1
:
7
,
0
:
nlev
)
!CHG3
!
! !REVISION HISTORY:
! Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
...
...
@@ -154,9 +154,11 @@
end
if
! redefinir amm apres un cyle bio
#ifdef BIO
do
i
=
1
,
nlev
!CHG5
amm
(
i
)
=
cc
(
6
,
i
)
end
do
#endif
! do advection step
if
(
w_adv_method
.ne.
0
)
then
...
...
src/meanflow/nitrate.F90
View file @
4bbaec20
...
...
@@ -94,7 +94,7 @@
REALTYPE
,
intent
(
in
)
::
gams
(
0
:
nlev
)
! nitrate concentration after bio loop
REALTYPE
,
intent
(
in
)
::
cc
(
1
:
7
,
0
:
nlev
)
!CHG3
REALTYPE
,
intent
(
in
)
,
optional
::
cc
(
1
:
7
,
0
:
nlev
)
!CHG3
!
! !REVISION HISTORY:
! Original author(s): Dany Dumont (dany_dumont@ete.inrs.ca)
...
...
@@ -154,9 +154,11 @@
end
if
! redefinir nit apres un cyle bio
#ifdef BIO
do
i
=
1
,
nlev
!CHG3
nit
(
i
)
=
cc
(
5
,
i
)
end
do
#endif
! do advection step
if
(
w_adv_method
.ne.
0
)
then
...
...
src/observations/observations.F90
View file @
4bbaec20
...
...
@@ -648,6 +648,15 @@
nprof
=
n_1
case
(
TWO_LAYERS
)
call
analytical_profile
(
nlev
,
z
,
z_n1
,
n_1
,
z_n2
,
n_2
,
nprof
)
LEVEL2
'Nitrate two-layer profile'
write
(
*
,
900
)
' n_1 = '
,
n_1
write
(
*
,
900
)
' z_n1 = '
,
z_n1
write
(
*
,
900
)
' n_2 = '
,
n_2
write
(
*
,
900
)
' z_n2 = '
,
z_n2
900
format
(
A
,
F8.5
)
case
default
end
select
case
(
FROMFILE
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment