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
Admin message
Gitlab has been updated. More info
here
and
there
.
Show more breadcrumbs
IPSL
LMD
InTro
RoutingPP
Commits
42204ab9
Commit
42204ab9
authored
5 years ago
by
POLCHER Jan
Browse files
Options
Downloads
Patches
Plain Diff
Add some diagnostics for the region of the souther IP.
parent
0cadc749
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
F90subroutines/routing_interface.f90
+1
-1
1 addition, 1 deletion
F90subroutines/routing_interface.f90
F90subroutines/routing_reg.f90
+5
-4
5 additions, 4 deletions
F90subroutines/routing_reg.f90
with
6 additions
and
5 deletions
F90subroutines/routing_interface.f90
+
1
−
1
View file @
42204ab9
...
@@ -154,7 +154,7 @@ SUBROUTINE findbasins(nbpt, nbvmax_in, nbxmax_in, nbi, nbj, trip_bx, basin_bx, f
...
@@ -154,7 +154,7 @@ SUBROUTINE findbasins(nbpt, nbvmax_in, nbxmax_in, nbi, nbj, trip_bx, basin_bx, f
!
!
INTEGER
::
ib
INTEGER
::
ib
!
!
diaglalo
(
1
,:)
=
(/
45.125
,
29.1
25
/)
diaglalo
(
1
,:)
=
(/
38.25
,
-7.
25
/)
!
!
IF
(
nbvmax_in
.NE.
nbvmax
.OR.
nbxmax_in
.NE.
nbxmax
)
THEN
IF
(
nbvmax_in
.NE.
nbvmax
.OR.
nbxmax_in
.NE.
nbxmax
)
THEN
WRITE
(
*
,
*
)
"nbvmax or nbxmax have changed !!"
WRITE
(
*
,
*
)
"nbvmax or nbxmax have changed !!"
...
...
This diff is collapsed.
Click to expand it.
F90subroutines/routing_reg.f90
+
5
−
4
View file @
42204ab9
...
@@ -390,7 +390,7 @@ CONTAINS
...
@@ -390,7 +390,7 @@ CONTAINS
INTEGER
(
i_std
),
INTENT
(
out
)
::
coast_pts
(
nbvmax
)
!! The coastal flow points (unitless)
INTEGER
(
i_std
),
INTENT
(
out
)
::
coast_pts
(
nbvmax
)
!! The coastal flow points (unitless)
!
!
!! LOCAL VARIABLES
!! LOCAL VARIABLES
LOGICAL
,
PARAMETER
::
debug
=
.
TRU
E.
LOGICAL
,
PARAMETER
::
debug
=
.
FALS
E.
CHARACTER
(
LEN
=
7
)
::
fmt
!!
CHARACTER
(
LEN
=
7
)
::
fmt
!!
CHARACTER
(
LEN
=
9
)
::
fmtr
!!
CHARACTER
(
LEN
=
9
)
::
fmtr
!!
!
!
...
@@ -1986,12 +1986,12 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
...
@@ -1986,12 +1986,12 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
!
!
!
!
!! PARAMETERS
!! PARAMETERS
LOGICAL
,
PARAMETER
::
debug
=
.
FALS
E.
!! (true/false)
LOGICAL
,
PARAMETER
::
debug
=
.
TRU
E.
!! (true/false)
!
!
!_ ================================================================================================================================
!_ ================================================================================================================================
!
!
!
!
testbasinid
=
-93063
testbasinid
=
195
!
!
IF
(
debug
)
WRITE
(
numout
,
*
)
'SIZE inflow_grid:'
,
SIZE
(
inflow_grid
,
1
),
SIZE
(
inflow_grid
,
2
),
SIZE
(
inflow_grid
,
3
)
IF
(
debug
)
WRITE
(
numout
,
*
)
'SIZE inflow_grid:'
,
SIZE
(
inflow_grid
,
1
),
SIZE
(
inflow_grid
,
2
),
SIZE
(
inflow_grid
,
3
)
IF
(
debug
)
WRITE
(
numout
,
*
)
'SIZE inflow_basin:'
,
SIZE
(
inflow_basin
,
1
),
SIZE
(
inflow_basin
,
2
),
SIZE
(
inflow_basin
,
3
)
IF
(
debug
)
WRITE
(
numout
,
*
)
'SIZE inflow_basin:'
,
SIZE
(
inflow_basin
,
1
),
SIZE
(
inflow_basin
,
2
),
SIZE
(
inflow_basin
,
3
)
...
@@ -2093,6 +2093,7 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
...
@@ -2093,6 +2093,7 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
WRITE
(
numout
,
*
)
"Linkup 1.0 - Hierarchy ="
,
basin_hierarchy
(
sp
,
sb
)
WRITE
(
numout
,
*
)
"Linkup 1.0 - Hierarchy ="
,
basin_hierarchy
(
sp
,
sb
)
WRITE
(
numout
,
*
)
"Linkup 1.0 - Basin % of grid ="
,
basin_area
(
sp
,
sb
)/
area_g
(
sp
)
*
100
WRITE
(
numout
,
*
)
"Linkup 1.0 - Basin % of grid ="
,
basin_area
(
sp
,
sb
)/
area_g
(
sp
)
*
100
WRITE
(
numout
,
*
)
"Linkup 1.0 - outflow_grid ="
,
outflow_grid
(
sp
,
sb
)
WRITE
(
numout
,
*
)
"Linkup 1.0 - outflow_grid ="
,
outflow_grid
(
sp
,
sb
)
WRITE
(
numout
,
*
)
"Linkup 1.0 - ID = "
,
basin_id
(
sp
,
sb
)
IF
(
outflow_grid
(
sp
,
sb
)
>
0
)
THEN
IF
(
outflow_grid
(
sp
,
sb
)
>
0
)
THEN
WRITE
(
numout
,
*
)
"Linkup 1.0 - Coords outflow: "
,
lalo_g
(
outflow_grid
(
sp
,
sb
),
2
),
lalo_g
(
outflow_grid
(
sp
,
sb
),
1
)
WRITE
(
numout
,
*
)
"Linkup 1.0 - Coords outflow: "
,
lalo_g
(
outflow_grid
(
sp
,
sb
),
2
),
lalo_g
(
outflow_grid
(
sp
,
sb
),
1
)
ENDIF
ENDIF
...
@@ -2577,7 +2578,7 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
...
@@ -2577,7 +2578,7 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
IF
(
debug
.AND.
testbasinid
>
0
)
THEN
IF
(
debug
.AND.
testbasinid
>
0
)
THEN
DO
sp
=
1
,
nbpt
DO
sp
=
1
,
nbpt
DO
sb
=
1
,
basin_count
(
sp
)
DO
sb
=
1
,
basin_count
(
sp
)
IF
(
basin_id
(
sp
,
sb
)
==
testbasinid
)
THEN
IF
(
basin_id
(
sp
,
sb
)
==
testbasinid
.AND.
routing_diagbox_g
(
sp
,
diaglalo
)
)
THEN
WRITE
(
numout
,
*
)
"Linkup TEST : "
,
basin_id
(
sp
,
sb
),
"@"
,
sp
,
sb
WRITE
(
numout
,
*
)
"Linkup TEST : "
,
basin_id
(
sp
,
sb
),
"@"
,
sp
,
sb
WRITE
(
numout
,
*
)
"Linkup TEST H= "
,
basin_hierarchy
(
sp
,
sb
)
WRITE
(
numout
,
*
)
"Linkup TEST H= "
,
basin_hierarchy
(
sp
,
sb
)
WRITE
(
numout
,
*
)
"Linkup TEST FAC= "
,
basin_fac
(
sp
,
sb
)
WRITE
(
numout
,
*
)
"Linkup TEST FAC= "
,
basin_fac
(
sp
,
sb
)
...
...
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