Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
IPSL
LMD
InTro
RoutingPP
Commits
3a23118c
Commit
3a23118c
authored
Jul 14, 2020
by
Anthony
Browse files
Center of Gravity remains with the takeout basin value.
parent
0c845db5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
F90subroutines/routing_reg.f90
F90subroutines/routing_reg.f90
+5
-4
No files found.
F90subroutines/routing_reg.f90
View file @
3a23118c
...
...
@@ -2924,11 +2924,11 @@ SUBROUTINE routing_reg_killbas(nbpt, ib, tokill, totakeover, nwbas, inflowmax, b
! For the moment only area
!
!
basin_cg
(
ib
,
totakeover
,
1
)
=
(
basin_cg
(
ib
,
totakeover
,
1
)
*
basin_area
(
ib
,
totakeover
)
&
&
+
basin_cg
(
ib
,
tokill
,
1
)
*
basin_area
(
ib
,
tokill
))/(
basin_area
(
ib
,
totakeover
)
+
basin_area
(
ib
,
tokill
))
!
basin_cg(ib, totakeover, 1) = (basin_cg(ib, totakeover, 1)*basin_area(ib, totakeover) &
!
& + basin_cg(ib, tokill, 1)*basin_area(ib, tokill))/(basin_area(ib, totakeover) + basin_area(ib, tokill))
!
basin_cg
(
ib
,
totakeover
,
2
)
=
(
basin_cg
(
ib
,
totakeover
,
2
)
*
basin_area
(
ib
,
totakeover
)&
&
+
basin_cg
(
ib
,
tokill
,
2
)
*
basin_area
(
ib
,
tokill
))/(
basin_area
(
ib
,
totakeover
)
+
basin_area
(
ib
,
tokill
))
!
basin_cg(ib, totakeover, 2) = (basin_cg(ib, totakeover, 2)*basin_area(ib, totakeover)&
!
& + basin_cg(ib, tokill, 2)*basin_area(ib, tokill))/(basin_area(ib, totakeover) + basin_area(ib, tokill))
!
basin_topoind
(
ib
,
totakeover
)
=
(
basin_topoind
(
ib
,
totakeover
)
*
basin_area
(
ib
,
totakeover
)
&
&
+
basin_topoind
(
ib
,
tokill
)
*
basin_area
(
ib
,
tokill
))/(
basin_area
(
ib
,
totakeover
)
+
basin_area
(
ib
,
tokill
))
...
...
@@ -2939,6 +2939,7 @@ SUBROUTINE routing_reg_killbas(nbpt, ib, tokill, totakeover, nwbas, inflowmax, b
!
basin_orog_mean
(
ib
,
totakeover
)
=
(
basin_orog_mean
(
ib
,
totakeover
)
*
basin_area
(
ib
,
totakeover
)
&
&
+
basin_orog_mean
(
ib
,
tokill
)
*
basin_area
(
ib
,
tokill
))/(
basin_area
(
ib
,
totakeover
)
+
basin_area
(
ib
,
tokill
))
!
! If we want to keep the coherence among the upstream / downstream orography
! we should leave the original basin_orog_min
!basin_orog_min(ib, totakeover) =
...
...
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