Changeset 9314

Timestamp:

2018-02-09T12:03:12+01:00 (7 years ago)

Author:

dancopsey

Message:

Added logical to turn on extra diagnostic printing.

File:

• branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_rnf_1d.F90 (modified) (9 diffs)

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_rnf_1d.F90

@@ -38 +38 @@
    INTEGER, PUBLIC            :: nn_cpl_river   ! Maximum number of rivers being passed through the coupler
    INTEGER, PUBLIC            :: runoff_id      ! OASIS coupling id used in oasis_get command
+   LOGICAL                    :: ln_print_river_info  ! Diagnostic prints of river coupling information
    
 CONTAINS
@@ -59 +60 @@
       REAL(wp), POINTER, DIMENSION(:,:)         ::   river_number        ! 2D array containing the river outflow numbers
       
-      NAMELIST/nam_cpl_rnf_1d/file_riv_number, nn_cpl_river
+      NAMELIST/nam_cpl_rnf_1d/file_riv_number, nn_cpl_river, ln_print_river_info
       !!----------------------------------------------------------------------
 
@@ -81 +82 @@
       IF(lwp) WRITE(numout,*) '          Namelist nam_cpl_rnf_1d : Coupled runoff using 1D array'
       IF(lwp) WRITE(numout,*) '             Input file that contains river numbers = ',file_riv_number
+      IF(lwp) WRITE(numout,*) '             Maximum number of rivers to couple = ',nn_cpl_river
+      IF(lwp) WRITE(numout,*) '             Print river information = ',ln_print_river_info
       IF(lwp) WRITE(numout,*) ' '
       
@@ -97 +100 @@
         DO jj = 1, jpj
           rivers%river_number(ii,jj) = INT(river_number(ii,jj))
-          
           IF ( rivers%river_number(ii,jj) > max_river ) THEN
             max_river = rivers%river_number(ii,jj)
-          END IF
-          
-          IF ( ii == 59 .AND. jj == 29 ) THEN
-            WRITE(numout,*) 'Amazon grid point river number (float) = ',river_number(ii,jj)
-            WRITE(numout,*) 'Amazon grid point river number (int) = ',INT(river_number(ii,jj))
-            WRITE(numout,*) 'Amazon grid point river number (store) = ',rivers%river_number(ii,jj)
-            WRITE(numout,*) 'max_river at this stage = ',max_river
-            WRITE(numout,*) 'Amazon grid box area = ',e1e2t(ii,jj)
           END IF
         END DO
@@ -113 +107 @@
       
       ! Print out the largest river number
-      WRITE(numout,*) 'Maximum river number = ',max_river
+      WRITE(numout,*) 'Maximum river number in input file = ',max_river
       
       ! Get the area of each river outflow
@@ -128 +122 @@
       ! Use mpp_sum to add together river areas on other processors
       CALL mpp_sum( rivers%river_area, nn_cpl_river )
-      WRITE(numout,*) 'Area of river number 1 is ',rivers%river_area(1)
-      WRITE(numout,*) 'Area of river number 10 is ',rivers%river_area(10)
-      
+      IF ( ln_print_river_info ) THEN
+        WRITE(numout,*) 'Area of rivers 1 to 10 are ',rivers%river_area(1:10)
+      END IF
       
    END SUBROUTINE cpl_rnf_1d_init
@@ -153 +147 @@
       LOGICAL  ::   llaction               ! Has the get worked?
       
-      IF ( ln_ctl ) THEN
+      IF ( ln_print_river_info ) THEN
          WRITE(numout,*)' Getting data from 1D river runoff coupling '
       ENDIF
@@ -163 +157 @@
                   
       ! Output coupling info
-      IF ( ln_ctl ) THEN
+      IF ( ln_print_river_info ) THEN
          WRITE(numout,*)' narea = ', narea
          WRITE(numout,*)' kstep = ', kstep
@@ -193 +187 @@
       END IF
       
-      IF ( ln_ctl ) WRITE(numout,*)' River runoff flux of AMAZON (pe 351) is ', rnf(59,29)         
+      IF ( ln_print_river_info ) WRITE(numout,*)' River runoff flux of AMAZON (pe 351) is ', rnf(59,29)         
    
    END SUBROUTINE cpl_rnf_1d_rcv