Changeset 13102 for NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90

Timestamp:

2020-06-12T13:29:50+02:00 (4 years ago)

Author:

dancopsey

Message:

Add test for any zero size river areas. This will crash the model later on so best to catch it now.

File:

• NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90

@@ -57 +57 @@
       INTEGER                                   ::   ios                 ! Local integer output status for namelist read
       INTEGER                                   ::   inum
-      INTEGER                                   ::   ii, jj, rr          !: Loop indices
+      INTEGER                                   ::   ii, jj              !: Loop indices
       INTEGER                                   ::   max_river
       REAL(wp), DIMENSION(jpi,jpj)              ::   river_number        ! 2D array containing the river outflow numbers
@@ -133 +133 @@
       
       ! Convert from complex number to real
-      ! DO rr = 1, nn_cpl_river
-      !    rivers%river_area(rr) = rivers%river_area_c(rr)
-      ! END DO
       rivers%river_area(:) = REAL(rivers%river_area_c(:),wp)
       
       IF ( ln_print_river_info .AND. lwp) THEN
         WRITE(numout,*) 'Area of rivers 1 to 10 are ',rivers%river_area(1:10)
+        WRITE(numout,*) 'Maximum river area = ',MAXVAL(rivers%river_area)
+        WRITE(numout,*) 'Minimum river area = ',MINVAL(rivers%river_area)
         CALL flush(numout)
+      END IF
+
+      IF ( MINVAL(rivers%river_area) <= 0 ) THEN
+         CALL oasis_abort ( ncomp_id, 'cpl_rnf_1d_init', 'There is at least one river with a river outflow area of zero. Please check your file_riv_number file that all the allocated river numbers are at ocean points as defined by the bathymetry file.')   ;   RETURN
       END IF