Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
RoutingPP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IPSL
LMD
InTro
RoutingPP
Commits
cf495ee0
Commit
cf495ee0
authored
5 years ago
by
POLCHER Jan
Browse files
Options
Downloads
Patches
Plain Diff
Some clean-up in F90Subroutines to ensure that we get less warnings from f2py.
parent
516c926a
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
F90subroutines/.f2py_f2cmap
+1
-0
1 addition, 0 deletions
F90subroutines/.f2py_f2cmap
F90subroutines/routing_interface.f90
+8
-2
8 additions, 2 deletions
F90subroutines/routing_interface.f90
with
9 additions
and
2 deletions
F90subroutines/.f2py_f2cmap
0 → 100644
+
1
−
0
View file @
cf495ee0
dict(real=dict(r_std='float', r_8='double'), integer=dict(i_std='int', i_8='long'))
This diff is collapsed.
Click to expand it.
F90subroutines/routing_interface.f90
+
8
−
2
View file @
cf495ee0
...
...
@@ -385,7 +385,7 @@ SUBROUTINE rivclassification(nbpt, nwbas, nbcore, corepts, basin_count, outflow_
INTEGER
(
i_std
),
DIMENSION
(
nbcore
),
INTENT
(
in
)
::
corepts
INTEGER
(
i_std
),
DIMENSION
(
nbpt
),
INTENT
(
in
)
::
basin_count
!!
INTEGER
(
i_std
),
DIMENSION
(
nbpt
,
nwbas
),
INTENT
(
inout
)
::
outflow_grid
INTEGER
(
i_std
),
DIMENSION
(
nbpt
,
nwbas
),
INTENT
(
in
)
::
outflow_basin
!!
INTEGER
(
i_std
),
DIMENSION
(
nbpt
,
nwbas
),
INTENT
(
in
out
)
::
outflow_basin
!!
REAL
(
r_std
),
DIMENSION
(
nbpt
,
nwbas
),
INTENT
(
in
)
::
fetch_basin
!!
REAL
(
r_std
),
INTENT
(
in
)
::
largest_rivarea
INTEGER
(
i_std
),
INTENT
(
out
)
::
num_largest
...
...
@@ -401,6 +401,9 @@ SUBROUTINE rivclassification(nbpt, nwbas, nbcore, corepts, basin_count, outflow_
!
num_largest
=
0
!
! Just a dummy use to avoid f2py warnings
outflow_basin
(
1
,
1
)
=
outflow_basin
(
1
,
1
)
!
DO
i
=
1
,
nbcore
ig
=
fcorepts
(
i
)
!
...
...
@@ -647,7 +650,7 @@ SUBROUTINE finalrivclass(nbpt, nbasmax, nbcore, corepts, route_togrid, route_tob
INTEGER
(
i_std
),
DIMENSION
(
nbcore
),
INTENT
(
in
)
::
corepts
INTEGER
(
i_std
),
DIMENSION
(
nbpt
,
nbasmax
),
INTENT
(
inout
)
::
route_togrid
!! Grid into which the basin flows (unitless)
INTEGER
(
i_std
),
DIMENSION
(
nbpt
,
nbasmax
),
INTENT
(
inout
)
::
route_tobasin
!! Basin in to which the water goes (unitless)
REAL
(
r_std
),
DIMENSION
(
nbpt
,
nbasmax
),
INTENT
(
in
)
::
routing_fetch
!! Upstream are flowing into HTU (m^2)
REAL
(
r_std
),
DIMENSION
(
nbpt
,
nbasmax
),
INTENT
(
in
out
)
::
routing_fetch
!! Upstream are flowing into HTU (m^2)
REAL
(
r_std
),
INTENT
(
in
)
::
largest_rivarea
INTEGER
(
i_std
),
INTENT
(
out
)
::
num_largest
!
...
...
@@ -660,6 +663,9 @@ SUBROUTINE finalrivclass(nbpt, nbasmax, nbcore, corepts, route_togrid, route_tob
fcorepts
(
i
)
=
corepts
(
i
)
+1
ENDDO
!
! Just a dummy use to avoid f2py warnings
route_togrid
(
1
,
1
)
=
route_togrid
(
1
,
1
)
!
! Redo the the distinction between river outflow and coastal flow. We can not
! take into account the return flow points.
!
...
...
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