From 42204ab9939fce89f0bd5e3ba9b68bc8b421c9d3 Mon Sep 17 00:00:00 2001
From: Jan Polcher <jan.polcher@lmd.jussieu.fr>
Date: Wed, 19 Jun 2019 09:27:26 +0200
Subject: [PATCH] Add some diagnostics for the region of the souther IP.
---
F90subroutines/routing_interface.f90 | 2 +-
F90subroutines/routing_reg.f90 | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/F90subroutines/routing_interface.f90 b/F90subroutines/routing_interface.f90
index 591d6d2..f7bba7d 100644
--- a/F90subroutines/routing_interface.f90
+++ b/F90subroutines/routing_interface.f90
@@ -154,7 +154,7 @@ SUBROUTINE findbasins(nbpt, nbvmax_in, nbxmax_in, nbi, nbj, trip_bx, basin_bx, f
!
INTEGER :: ib
!
- diaglalo(1,:) = (/ 45.125, 29.125 /)
+ diaglalo(1,:) = (/ 38.25, -7.25 /)
!
IF ( nbvmax_in .NE. nbvmax .OR. nbxmax_in .NE. nbxmax ) THEN
WRITE(*,*) "nbvmax or nbxmax have changed !!"
diff --git a/F90subroutines/routing_reg.f90 b/F90subroutines/routing_reg.f90
index 039c19c..81a97d1 100644
--- a/F90subroutines/routing_reg.f90
+++ b/F90subroutines/routing_reg.f90
@@ -390,7 +390,7 @@ CONTAINS
INTEGER(i_std), INTENT(out) :: coast_pts(nbvmax) !! The coastal flow points (unitless)
!
!! LOCAL VARIABLES
- LOGICAL, PARAMETER :: debug=.TRUE.
+ LOGICAL, PARAMETER :: debug=.FALSE.
CHARACTER(LEN=7) :: fmt !!
CHARACTER(LEN=9) :: fmtr !!
!
@@ -1986,12 +1986,12 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
!
!
!! PARAMETERS
- LOGICAL, PARAMETER :: debug = .FALSE. !! (true/false)
+ LOGICAL, PARAMETER :: debug = .TRUE. !! (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_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,
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 - outflow_grid =", outflow_grid(sp,sb)
+ WRITE(numout,*) "Linkup 1.0 - ID = ", basin_id(sp,sb)
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)
ENDIF
@@ -2577,7 +2578,7 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
IF ( debug .AND. testbasinid > 0 ) THEN
DO sp=1,nbpt
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 H= ", basin_hierarchy(sp,sb)
WRITE(numout,*) "Linkup TEST FAC= ", basin_fac(sp,sb)
--
GitLab